NetworkClient debugging

examples/Basic_Inkplate_Functionality/Inkplate-basic_custom_font/platformio.ini

@@ -3,21 +3,37 @@
 default_envs = inkplate-6
 
 [env:inkplate-6]
+build_type = release
 build_flags =
   -D INKPLATE_6
   -D DEBUGGING=0
 
 [env:inkplate-6-debug]
+build_type = debug
 build_flags =
   -D INKPLATE_6
   -D DEBUGGING=1
 
+[env:inkplate-6plus]
+build_type = release
+build_flags =
+  -D INKPLATE_6PLUS
+  -D DEBUGGING=0
+
+[env:inkplate-6plus-debug]
+build_type = debug
+build_flags =
+  -D INKPLATE_6PLUS
+  -D DEBUGGING=1
+
 [env:inkplate-10]
+build_type = release
 build_flags =
   -D INKPLATE_10
   -D DEBUGGING=0
 
 [env:inkplate-10-debug]
+build_type = debug
 build_flags =
   -D INKPLATE_10
   -D DEBUGGING=1

examples/Basic_Inkplate_Functionality/Inkplate-basic_custom_font/src/main.cpp

@@ -54,6 +54,8 @@ void mainTask(void * param)
     
     #if defined(INKPLATE_6)
       display.print("InkPlate 6");
+    #elif defined(INKPLATE_6PLUS)
+      display.print("InkPlate 6PLUS");
     #else
       display.print("InkPlate 10");
     #endif

examples/Basic_Inkplate_Functionality/Inkplate-basic_partial_update/platformio.ini

@@ -3,21 +3,37 @@
 default_envs = inkplate-6
 
 [env:inkplate-6]
+build_type = release
 build_flags =
   -D INKPLATE_6
   -D DEBUGGING=0
 
 [env:inkplate-6-debug]
+build_type = debug
 build_flags =
   -D INKPLATE_6
   -D DEBUGGING=1
 
+[env:inkplate-6plus]
+build_type = release
+build_flags =
+  -D INKPLATE_6PLUS
+  -D DEBUGGING=0
+
+[env:inkplate-6plus-debug]
+build_type = debug
+build_flags =
+  -D INKPLATE_6PLUS
+  -D DEBUGGING=1
+
 [env:inkplate-10]
+build_type = release
 build_flags =
   -D INKPLATE_10
   -D DEBUGGING=0
 
 [env:inkplate-10-debug]
+build_type = debug
 build_flags =
   -D INKPLATE_10
   -D DEBUGGING=1

examples/Basic_Inkplate_Functionality/Inkplate-basic_partial_update/src/main.cpp

@@ -28,6 +28,9 @@ static const char * TAG = "Main";
 #if defined(INKPLATE_6)
   const char text[] = "This is partial update on Inkplate 6 e-paper display! :)";
   int max = 9;
+#elif defined(INKPLATE_6PLUS)
+  const char text[] = "This is partial update on Inkplate 6PLUS e-paper display! :)";
+  int max = 30;
 #else
   const char text[] = "This is partial update on Inkplate 10 e-paper display! :)";
   int max = 50;

examples/Basic_Inkplate_Functionality/Inkplate_basic_BW/platformio.ini

@@ -3,21 +3,37 @@
 default_envs = inkplate-6
 
 [env:inkplate-6]
+build_type = release
 build_flags =
   -D INKPLATE_6
   -D DEBUGGING=0
 
 [env:inkplate-6-debug]
+build_type = debug
 build_flags =
   -D INKPLATE_6
   -D DEBUGGING=1
 
+[env:inkplate-6plus]
+build_type = release
+build_flags =
+  -D INKPLATE_6PLUS
+  -D DEBUGGING=0
+
+[env:inkplate-6plus-debug]
+build_type = debug
+build_flags =
+  -D INKPLATE_6PLUS
+  -D DEBUGGING=1
+
 [env:inkplate-10]
+build_type = release
 build_flags =
   -D INKPLATE_10
   -D DEBUGGING=0
 
 [env:inkplate-10-debug]
+build_type = debug
 build_flags =
   -D INKPLATE_10
   -D DEBUGGING=1

examples/Basic_Inkplate_Functionality/Inkplate_basic_BW/src/main.cpp

@@ -76,6 +76,8 @@ void mainTask(void * params)
 
   #if defined(INKPLATE_6)
     display.print("Welcome to Inkplate 6!");
+  #elif defined(INKPLATE_6PLUS)
+    display.print("Welcome to Inkplate 6PLUS!");
   #else
     display.print("Welcome to Inkplate 10!");
   #endif
@@ -351,6 +353,8 @@ void mainTask(void * params)
                                              // place you want to write someting next
         #if defined(INKPLATE_6)
           display.print("INKPLATE 6!");        // The actual text you want to show on e-paper as String
+        #elif defined(INKPLATE_6PLUS)
+          display.print("INKPLATE 6PLUS!");        // The actual text you want to show on e-paper as String
         #else
           display.print("INKPLATE 10!");        // The actual text you want to show on e-paper as String
         #endif
@@ -371,6 +375,8 @@ void mainTask(void * params)
         display.setCursor(200, 300 + (i * i * 8));
         #if defined(INKPLATE_6)
           display.print("INKPLATE 6!");
+        #elif defined(INKPLATE_6PLUS)
+          display.print("INKPLATE 6PLUS!");        // The actual text you want to show on e-paper as String
         #else
           display.print("INKPLATE 10!");
         #endif
@@ -447,7 +453,13 @@ void mainTask(void * params)
       display.clearDisplay();
       display.setRotation(
           r); // Set rotation will sent rotation for the entire display, so you can use it sideways or upside-down
-      display.print("INKPLATE6");
+      #if defined(INKPLATE_6)
+        display.print("INKPLATE 6");
+      #elif defined(INKPLATE_6PLUS)
+        display.print("INKPLATE 6PLUS");        // The actual text you want to show on e-paper as String
+      #else
+        display.print("INKPLATE 10");
+      #endif
       display.display();
       delay(5000);
     }

examples/Basic_Inkplate_Functionality/Inkplate_basic_gray/platformio.ini

@@ -3,21 +3,37 @@
 default_envs = inkplate-6
 
 [env:inkplate-6]
+build_type = release
 build_flags =
   -D INKPLATE_6
   -D DEBUGGING=0
 
 [env:inkplate-6-debug]
+build_type = debug
 build_flags =
   -D INKPLATE_6
   -D DEBUGGING=1
 
+[env:inkplate-6plus]
+build_type = release
+build_flags =
+  -D INKPLATE_6PLUS
+  -D DEBUGGING=0
+
+[env:inkplate-6plus-debug]
+build_type = debug
+build_flags =
+  -D INKPLATE_6PLUS
+  -D DEBUGGING=1
+
 [env:inkplate-10]
+build_type = release
 build_flags =
   -D INKPLATE_10
   -D DEBUGGING=0
 
 [env:inkplate-10-debug]
+build_type = debug
 build_flags =
   -D INKPLATE_10
   -D DEBUGGING=1

examples/Basic_Inkplate_Functionality/Inkplate_basic_gray/src/main.cpp

@@ -78,6 +78,8 @@ void mainTask(void * params)
   display.setTextSize(4);
   #if defined(INKPLATE_6)
     display.print("Welcome to Inkplate 6!");
+  #elif defined(INKPLATE_6PLUS)
+    display.print("Welcome to Inkplate 6PLUS!");
   #else
     display.print("Welcome to Inkplate 10!");
   #endif
@@ -318,6 +320,8 @@ void mainTask(void * params)
                                              // place you want to write someting next
         #if defined(INKPLATE_6)
           display.print("INKPLATE 6!");
+        #elif defined(INKPLATE_6PLUS)
+          display.print("INKPLATE 6PLUS!");        // The actual text you want to show on e-paper as String
         #else
           display.print("INKPLATE 10!");
         #endif
@@ -335,6 +339,8 @@ void mainTask(void * params)
         display.setCursor(200, 300 + (i * i * 8));
         #if defined(INKPLATE_6)
           display.print("INKPLATE 6!");
+        #elif defined(INKPLATE_6PLUS)
+          display.print("INKPLATE 6PLUS!");        // The actual text you want to show on e-paper as String
         #else
           display.print("INKPLATE 10!");
         #endif
@@ -406,9 +412,11 @@ void mainTask(void * params)
         display.setRotation(
             r); // Set rotation will sent rotation for the entire display, so you can use it sideways or upside-down
         #if defined(INKPLATE_6)
-          display.print("INKPLATE 6!");
+          display.print("INKPLATE 6");
+        #elif defined(INKPLATE_6PLUS)
+          display.print("INKPLATE 6PLUS");        // The actual text you want to show on e-paper as String
         #else
-          display.print("INKPLATE 10!");
+          display.print("INKPLATE 10");
         #endif
         display.display();
         delay(5000);

examples/Others/Inkplate_Mandelbrot_set/platformio.ini

@@ -3,21 +3,37 @@
 default_envs = inkplate-6
 
 [env:inkplate-6]
+build_type = release
 build_flags =
   -D INKPLATE_6
   -D DEBUGGING=0
 
 [env:inkplate-6-debug]
+build_type = debug
 build_flags =
   -D INKPLATE_6
   -D DEBUGGING=1
 
+[env:inkplate-6plus]
+build_type = release
+build_flags =
+  -D INKPLATE_6PLUS
+  -D DEBUGGING=0
+
+[env:inkplate-6plus-debug]
+build_type = debug
+build_flags =
+  -D INKPLATE_6PLUS
+  -D DEBUGGING=1
+
 [env:inkplate-10]
+build_type = release
 build_flags =
   -D INKPLATE_10
   -D DEBUGGING=0
 
 [env:inkplate-10-debug]
+build_type = debug
 build_flags =
   -D INKPLATE_10
   -D DEBUGGING=1

examples/Others/Inkplate_Maze_Generator/platformio.ini

@@ -3,21 +3,37 @@
 default_envs = inkplate-6
 
 [env:inkplate-6]
+build_type = release
 build_flags =
   -D INKPLATE_6
   -D DEBUGGING=0
 
 [env:inkplate-6-debug]
+build_type = debug
 build_flags =
   -D INKPLATE_6
   -D DEBUGGING=1
 
+[env:inkplate-6plus]
+build_type = release
+build_flags =
+  -D INKPLATE_6PLUS
+  -D DEBUGGING=0
+
+[env:inkplate-6plus-debug]
+build_type = debug
+build_flags =
+  -D INKPLATE_6PLUS
+  -D DEBUGGING=1
+
 [env:inkplate-10]
+build_type = release
 build_flags =
   -D INKPLATE_10
   -D DEBUGGING=0
 
 [env:inkplate-10-debug]
+build_type = debug
 build_flags =
   -D INKPLATE_10
   -D DEBUGGING=1

examples/Others/Inkplate_Peripheral_Mode/platformio.ini

@@ -3,21 +3,37 @@
 default_envs = inkplate-6
 
 [env:inkplate-6]
+build_type = release
 build_flags =
   -D INKPLATE_6
   -D DEBUGGING=0
 
 [env:inkplate-6-debug]
+build_type = debug
 build_flags =
   -D INKPLATE_6
   -D DEBUGGING=1
 
+[env:inkplate-6plus]
+build_type = release
+build_flags =
+  -D INKPLATE_6PLUS
+  -D DEBUGGING=0
+
+[env:inkplate-6plus-debug]
+build_type = debug
+build_flags =
+  -D INKPLATE_6PLUS
+  -D DEBUGGING=1
+
 [env:inkplate-10]
+build_type = release
 build_flags =
   -D INKPLATE_10
   -D DEBUGGING=0
 
 [env:inkplate-10-debug]
+build_type = debug
 build_flags =
   -D INKPLATE_10
   -D DEBUGGING=1

examples/Others/Inkplate_Peripheral_Mode/src/main.cpp

@@ -432,6 +432,9 @@ extern "C" {
   {
     TaskHandle_t xHandle = NULL;
 
+    // This will insure that no LOG messages will interfere with the USB exchanges.
+    esp_log_level_set("*", ESP_LOG_NONE);
+
     xTaskCreate(peripheral_task, "mainTask", STACK_SIZE, (void *) 1, tskIDLE_PRIORITY, &xHandle);
     configASSERT(xHandle);
   }

examples/Others/Inkplate_VariPass_Graphs/platformio.ini

@@ -3,21 +3,37 @@
 default_envs = inkplate-6
 
 [env:inkplate-6]
+build_type = release
 build_flags =
   -D INKPLATE_6
   -D DEBUGGING=0
 
 [env:inkplate-6-debug]
+build_type = debug
 build_flags =
   -D INKPLATE_6
   -D DEBUGGING=1
 
+[env:inkplate-6plus]
+build_type = release
+build_flags =
+  -D INKPLATE_6PLUS
+  -D DEBUGGING=0
+
+[env:inkplate-6plus-debug]
+build_type = debug
+build_flags =
+  -D INKPLATE_6PLUS
+  -D DEBUGGING=1
+
 [env:inkplate-10]
+build_type = release
 build_flags =
   -D INKPLATE_10
   -D DEBUGGING=0
 
 [env:inkplate-10-debug]
+build_type = debug
 build_flags =
   -D INKPLATE_10
   -D DEBUGGING=1

src/services/network_client.cpp

@@ -177,15 +177,15 @@ void
 NetworkClient::disconnect()
 {
   if (connected) {
-    esp_wifi_disconnect();
-
-    ESP_ERROR_CHECK(esp_event_loop_delete_default());
+    // ESP_ERROR_CHECK(esp_event_loop_delete_default());
     
     ESP_ERROR_CHECK(esp_event_handler_unregister(IP_EVENT,   ESP_EVENT_ANY_ID,     &sta_event_handler));
     ESP_ERROR_CHECK(esp_event_handler_unregister(WIFI_EVENT, WIFI_EVENT_STA_START, &sta_event_handler));
 
     vEventGroupDelete(wifi_event_group);
 
+    esp_wifi_disconnect();
+
     connected = false;
   }
 }

test/Inkplate_net_test/platformio.ini

@@ -3,21 +3,37 @@
 default_envs = inkplate-6
 
 [env:inkplate-6]
+build_type = release
 build_flags =
   -D INKPLATE_6
   -D DEBUGGING=0
 
 [env:inkplate-6-debug]
+build_type = debug
 build_flags =
   -D INKPLATE_6
   -D DEBUGGING=1
 
+[env:inkplate-6plus]
+build_type = release
+build_flags =
+  -D INKPLATE_6PLUS
+  -D DEBUGGING=0
+
+[env:inkplate-6plus-debug]
+build_type = debug
+build_flags =
+  -D INKPLATE_6PLUS
+  -D DEBUGGING=1
+
 [env:inkplate-10]
+build_type = release
 build_flags =
   -D INKPLATE_10
   -D DEBUGGING=0
 
 [env:inkplate-10-debug]
+build_type = debug
 build_flags =
   -D INKPLATE_10
   -D DEBUGGING=1

test/Inkplate_net_test/src/main.cpp

@@ -36,7 +36,7 @@ int random(int a, int b)
   return (a + (r * b) / RAND_MAX);
 }
 
-void wait_a_bit(int sec = 5) { vTaskDelay((sec * 1000) / portTICK_PERIOD_MS); }
+void delay(int sec = 5) { vTaskDelay((sec * 1000) / portTICK_PERIOD_MS); }
 
 void mainTask(void * params) 
 {
@@ -64,12 +64,14 @@ void mainTask(void * params)
 
   #if defined(INKPLATE_6)
     display.print("Network test for Inkplate 6!");
+  #elif defined(INKPLATE_6PLUS)
+    display.print("Network test for Inkplate 6PLUS!");
   #else
     display.print("Network test for Inkplate 10!");
   #endif
 
   display.display(); // Write hello message
-  wait_a_bit();
+  delay();
 
   if (display.joinAP(YOUR_SSID, YOUR_PASSWORD)) {
     int32_t size;
@@ -78,7 +80,7 @@ void mainTask(void * params)
 
   for (;;) {
     ESP_LOGI(TAG, "Completed...");
-    wait_a_bit(15);
+    delay(15);
   }
 
 }