Minor fixes

blynkkk · Jul 12, 2021 · 47a84c5 · 47a84c5
1 parent 2265396
commit 47a84c5
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 26 deletions.
diff --git a/examples/Blynk.Edgent/Edgent_ESP32/Console.h b/examples/Blynk.Edgent/Edgent_ESP32/Console.h
@@ -48,5 +48,6 @@ void console_init()
 }
 
 BLYNK_WRITE(InternalPinDBG) {
-  edgentConsole.runCommand((char*)param.asStr());
+  String cmd = String(param.asStr()) + "\n";
+  edgentConsole.runCommand((char*)cmd.c_str());
 }
diff --git a/examples/Blynk.Edgent/Edgent_ESP32/Indicator.h b/examples/Blynk.Edgent/Edgent_ESP32/Indicator.h
@@ -85,42 +85,42 @@ class Indicator {
 #elif defined(BOARD_LED_PIN_R)     // Normal RGB LED (common anode or common cathode)
 
   void initLED() {
-    ledcAttachPin(BOARD_LED_PIN_R, LEDC_CHANNEL_1);
-    ledcAttachPin(BOARD_LED_PIN_G, LEDC_CHANNEL_2);
-    ledcAttachPin(BOARD_LED_PIN_B, LEDC_CHANNEL_3);
+    ledcAttachPin(BOARD_LED_PIN_R, BOARD_LEDC_CHANNEL_1);
+    ledcAttachPin(BOARD_LED_PIN_G, BOARD_LEDC_CHANNEL_2);
+    ledcAttachPin(BOARD_LED_PIN_B, BOARD_LEDC_CHANNEL_3);
 
-    ledcSetup(LEDC_CHANNEL_1, LEDC_BASE_FREQ, LEDC_TIMER_BITS);
-    ledcSetup(LEDC_CHANNEL_2, LEDC_BASE_FREQ, LEDC_TIMER_BITS);
-    ledcSetup(LEDC_CHANNEL_3, LEDC_BASE_FREQ, LEDC_TIMER_BITS);
+    ledcSetup(BOARD_LEDC_CHANNEL_1, BOARD_LEDC_BASE_FREQ, BOARD_LEDC_TIMER_BITS);
+    ledcSetup(BOARD_LEDC_CHANNEL_2, BOARD_LEDC_BASE_FREQ, BOARD_LEDC_TIMER_BITS);
+    ledcSetup(BOARD_LEDC_CHANNEL_3, BOARD_LEDC_BASE_FREQ, BOARD_LEDC_TIMER_BITS);
   }
 
   void setRGB(uint32_t color) {
     uint8_t r = (color & 0xFF0000) >> 16;
     uint8_t g = (color & 0x00FF00) >> 8;
     uint8_t b = (color & 0x0000FF);
     #if BOARD_LED_INVERSE
-    ledcWrite(LEDC_CHANNEL_1, TO_PWM(255 - r));
-    ledcWrite(LEDC_CHANNEL_2, TO_PWM(255 - g));
-    ledcWrite(LEDC_CHANNEL_3, TO_PWM(255 - b));
+    ledcWrite(BOARD_LEDC_CHANNEL_1, TO_PWM(255 - r));
+    ledcWrite(BOARD_LEDC_CHANNEL_2, TO_PWM(255 - g));
+    ledcWrite(BOARD_LEDC_CHANNEL_3, TO_PWM(255 - b));
     #else
-    ledcWrite(LEDC_CHANNEL_1, TO_PWM(r));
-    ledcWrite(LEDC_CHANNEL_2, TO_PWM(g));
-    ledcWrite(LEDC_CHANNEL_3, TO_PWM(b));
+    ledcWrite(BOARD_LEDC_CHANNEL_1, TO_PWM(r));
+    ledcWrite(BOARD_LEDC_CHANNEL_2, TO_PWM(g));
+    ledcWrite(BOARD_LEDC_CHANNEL_3, TO_PWM(b));
     #endif
   }
 
 #elif defined(BOARD_LED_PIN)       // Single color LED
 
   void initLED() {
-    ledcSetup(LEDC_CHANNEL_1, LEDC_BASE_FREQ, LEDC_TIMER_BITS);
-    ledcAttachPin(BOARD_LED_PIN, LEDC_CHANNEL_1);
+    ledcSetup(BOARD_LEDC_CHANNEL_1, BOARD_LEDC_BASE_FREQ, BOARD_LEDC_TIMER_BITS);
+    ledcAttachPin(BOARD_LED_PIN, BOARD_LEDC_CHANNEL_1);
   }
 
   void setLED(uint32_t color) {
     #if BOARD_LED_INVERSE
-    ledcWrite(LEDC_CHANNEL_1, TO_PWM(255 - color));
+    ledcWrite(BOARD_LEDC_CHANNEL_1, TO_PWM(255 - color));
     #else
-    ledcWrite(LEDC_CHANNEL_1, TO_PWM(color));
+    ledcWrite(BOARD_LEDC_CHANNEL_1, TO_PWM(color));
     #endif
   }
 

diff --git a/examples/Blynk.Edgent/Edgent_ESP32/Settings.h b/examples/Blynk.Edgent/Edgent_ESP32/Settings.h
@@ -52,11 +52,11 @@
 
 #define BOARD_PWM_MAX                 1023
 
-#define LEDC_CHANNEL_1     1
-#define LEDC_CHANNEL_2     2
-#define LEDC_CHANNEL_3     3
-#define LEDC_TIMER_BITS    10
-#define LEDC_BASE_FREQ     12000
+#define BOARD_LEDC_CHANNEL_1     1
+#define BOARD_LEDC_CHANNEL_2     2
+#define BOARD_LEDC_CHANNEL_3     3
+#define BOARD_LEDC_TIMER_BITS    10
+#define BOARD_LEDC_BASE_FREQ     12000
 
 #define CONFIG_AP_URL                 "blynk.setup"
 #define CONFIG_DEFAULT_SERVER         "blynk.cloud"

diff --git a/examples/Blynk.Edgent/Edgent_ESP8266/Console.h b/examples/Blynk.Edgent/Edgent_ESP8266/Console.h
@@ -48,5 +48,6 @@ void console_init()
 }
 
 BLYNK_WRITE(InternalPinDBG) {
-  edgentConsole.runCommand((char*)param.asStr());
+  String cmd = String(param.asStr()) + "\n";
+  edgentConsole.runCommand((char*)cmd.c_str());
 }
diff --git a/examples/Blynk.Edgent/Edgent_MKR1000/Console.h b/examples/Blynk.Edgent/Edgent_MKR1000/Console.h
@@ -48,5 +48,6 @@ void console_init()
 }
 
 BLYNK_WRITE(InternalPinDBG) {
-  edgentConsole.runCommand((char*)param.asStr());
+  String cmd = String(param.asStr()) + "\n";
+  edgentConsole.runCommand((char*)cmd.c_str());
 }
diff --git a/examples/Blynk.Edgent/Edgent_MKR1010/Console.h b/examples/Blynk.Edgent/Edgent_MKR1010/Console.h
@@ -48,5 +48,6 @@ void console_init()
 }
 
 BLYNK_WRITE(InternalPinDBG) {
-  edgentConsole.runCommand((char*)param.asStr());
+  String cmd = String(param.asStr()) + "\n";
+  edgentConsole.runCommand((char*)cmd.c_str());
 }
diff --git a/examples/Blynk.Edgent/Edgent_Wio_Terminal/Console.h b/examples/Blynk.Edgent/Edgent_Wio_Terminal/Console.h
@@ -48,5 +48,6 @@ void console_init()
 }
 
 BLYNK_WRITE(InternalPinDBG) {
-  edgentConsole.runCommand((char*)param.asStr());
+  String cmd = String(param.asStr()) + "\n";
+  edgentConsole.runCommand((char*)cmd.c_str());
 }