Release v4.2.1

Merge pull request #35 from MMMZZZZ/dev
MMMZZZZ · Nov 21, 2021 · 7a6c0c6 · 7a6c0c6
2 parents cbd87f5 + c6199a2
commit 7a6c0c6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/Syntherrupter_Nextion/Source_as_Text/Program.s.txt b/Syntherrupter_Nextion/Source_as_Text/Program.s.txt
@@ -7,6 +7,19 @@ Program.s
     if(bauds!=115200)
     {
       bauds=115200
+      if(bauds!=115200)
+      {
+        // bauds will always return 9600 in the Nextion Editor/Debugger. Hence we enter this
+        // section only if we are running within the debugger.
+        // The debugger does not send the startup messages that Nextion devices send.
+        // Since the Tiva firmware relies on them, we do it manually here.
+        //
+        // Power Up
+        printh 00 00 00 ff ff ff
+        //
+        // Ready
+        printh 88 ff ff ff
+      }
     }
     //
     // Allow wake up on touch and on serial command (f.ex. reset command) in case it is not already allowed.

diff --git a/Syntherrupter_Nextion/Source_as_Text/Startup.txt b/Syntherrupter_Nextion/Source_as_Text/Startup.txt
@@ -139,7 +139,7 @@ Text tNxtFWVersion
         Scope              : local
         Send Component ID  : disabled
         Associated Keyboard: none
-        Text               : v4.2.0       
+        Text               : v4.2.1       
         Max. Text Size     : 20
 
     Events

diff --git a/Syntherrupter_Nextion/Syntherrupter_Nextion.HMI b/Syntherrupter_Nextion/Syntherrupter_Nextion.HMI
diff --git a/Syntherrupter_Tiva/InterrupterConfig.h b/Syntherrupter_Tiva/InterrupterConfig.h
@@ -9,7 +9,7 @@
 #define INTERRUPTER_CONFIG_H_
 
 
-#define TIVA_FW_VERSION "v4.2.0"
+#define TIVA_FW_VERSION "v4.2.1"
 
 #ifdef COIL_COUNT_1
 #define COIL_COUNT 1