fix M109/M190 bug (bigtreetech#818)

Co-authored-by: Msq001 <Msq001@gmail.com>

TFT/src/User/API/MachineParameters.c

@@ -163,4 +163,4 @@ void resetEepromSettings(void)
 {
   if(infoMachineSettings.EEPROM == 1)
     mustStoreCmd("M502\nM500\n");
-}
+}

TFT/src/User/API/MachineParameters.h

@@ -57,7 +57,7 @@ float LinAdvance[1];
 
 extern PARAMETERS infoParameters;
 
-char *const axisDisplayID[STEPPER_COUNT];
+extern char *const axisDisplayID[STEPPER_COUNT];
 extern const LABEL accel_disp_ID[];
 extern const LABEL retract_disp_ID[];
 extern const LABEL recover_disp_ID[];
@@ -89,4 +89,4 @@ void restoreEepromSettings(void);
 //reset settings and eeprom to default values
 void resetEepromSettings(void);
 
-#endif
+#endif

TFT/src/User/API/Printing.h

@@ -77,4 +77,4 @@ void loopCheckPrinting(void);
 
 
 
-#endif
+#endif

TFT/src/User/API/Settings.h

@@ -178,4 +178,4 @@ void setupMachine(void);
 
 
 
-#endif
+#endif

TFT/src/User/API/Temperature.c

@@ -237,4 +237,4 @@ void loopCheckHeater(void)
       }
     }
   }
-}
+}

TFT/src/User/API/Temperature.h

@@ -74,4 +74,4 @@ void loopCheckHeater(void);
 
 
 
-#endif
+#endif

TFT/src/User/API/UI/Numpad.c

@@ -251,7 +251,7 @@ int32_t numPadInt(u8* title, int32_t old_val, bool negative)
         setLargeFont(false);
         touchSound = true;
         return old_val;
-        break;
+
       case NUM_KEY_MINUS:
         if (negative)
         {

TFT/src/User/API/interfaceCmd.c

@@ -459,25 +459,6 @@ void sendQueueCmd(void)
           if(cmd_seen('E')) setParameter(P_STEPS_PER_MM, E_AXIS, cmd_float());
           break;
 
-        case 104: //M104
-          if (fromTFT)
-          {
-            TOOL i = heatGetCurrentToolNozzle();
-            if(cmd_seen('T')) i = (TOOL)(cmd_value() + NOZZLE0);
-            if(cmd_seen('S'))
-            {
-              heatSyncTargetTemp(i, cmd_value());
-            }
-            else if (!cmd_seen('\n'))
-            {
-              char buf[12];
-              sprintf(buf, "S%u\n", heatGetTargetTemp(i));
-              strcat(infoCmd.queue[infoCmd.index_r].gcode,(const char*)buf);
-              heatSetSendWaiting(i, false);
-            }
-          }
-          break;
-
         case 105: //M105
           if (fromTFT)
           {
@@ -510,7 +491,7 @@ void sendQueueCmd(void)
           {
             TOOL i = heatGetCurrentToolNozzle();
             if(cmd_seen('T')) i = (TOOL)(cmd_value() + NOZZLE0);
-            infoCmd.queue[infoCmd.index_r].gcode[3]='4';
+            infoCmd.queue[infoCmd.index_r].gcode[3]='4';  // Avoid send M109 to Marlin
             if (cmd_seen('R'))
             {
               infoCmd.queue[infoCmd.index_r].gcode[cmd_index-1] = 'S';
@@ -521,6 +502,24 @@ void sendQueueCmd(void)
               heatSetIsWaiting(i, WAIT_HEATING);
             }
           }
+        // No break here, The data processing of M109 is the same as that of M104 below
+        case 104: //M104
+          if (fromTFT)
+          {
+            TOOL i = heatGetCurrentToolNozzle();
+            if(cmd_seen('T')) i = (TOOL)(cmd_value() + NOZZLE0);
+            if(cmd_seen('S'))
+            {
+              heatSyncTargetTemp(i, cmd_value());
+            }
+            else if (!cmd_seen('\n'))
+            {
+              char buf[12];
+              sprintf(buf, "S%u\n", heatGetTargetTemp(i));
+              strcat(infoCmd.queue[infoCmd.index_r].gcode,(const char*)buf);
+              heatSetSendWaiting(i, false);
+            }
+          }
           break;
 
         case 114: //M114
@@ -554,9 +553,9 @@ void sendQueueCmd(void)
         case 190: //M190
           if (fromTFT)
           {
+            infoCmd.queue[infoCmd.index_r].gcode[2]='4';   // Avoid send M190 to Marlin
             if (cmd_seen('R'))
             {
-              infoCmd.queue[infoCmd.index_r].gcode[2]='4';
               infoCmd.queue[infoCmd.index_r].gcode[cmd_index-1] = 'S';
               heatSetIsWaiting(BED, WAIT_COOLING_HEATING);
             }
@@ -565,7 +564,7 @@ void sendQueueCmd(void)
               heatSetIsWaiting(BED, WAIT_HEATING);
             }
           }
-          break;
+        // No break here, The data processing of M190 is the same as that of M140 below
         case 140: //M140
           if (fromTFT)
           {

TFT/src/User/API/parseACK.c

@@ -183,17 +183,17 @@ void parseACK(void)
       // parse temperature
       if(ack_seen("T:") || ack_seen("T0:"))
       {
-        heatSetCurrentTemp(NOZZLE0, ack_value()+0.5);
+        heatSetCurrentTemp(NOZZLE0, ack_value()+0.5f);
         if(!heatGetSendWaiting(NOZZLE0)) {
-          heatSyncTargetTemp(NOZZLE0, ack_second_value()+0.5);
+          heatSyncTargetTemp(NOZZLE0, ack_second_value()+0.5f);
         }
         for(TOOL i = BED; i < HEATER_COUNT; i++)
         {
           if(ack_seen(toolID[i]))
           {
-            heatSetCurrentTemp(i, ack_value()+0.5);
+            heatSetCurrentTemp(i, ack_value()+0.5f);
             if(!heatGetSendWaiting(i)) {
-              heatSyncTargetTemp(i, ack_second_value()+0.5);
+              heatSyncTargetTemp(i, ack_second_value()+0.5f);
             }
           }
         }

TFT/src/User/API/printf/printf.c

@@ -914,4 +914,4 @@ int fctprintf(void (*out)(char character, void* arg), void* arg, const char* for
   const int ret = _vsnprintf(_out_fct, (char*)(uintptr_t)&out_fct_wrap, MAX_BUFFER_LENGTH, format, va);
   va_end(va);
   return ret;
-}
+}

TFT/src/User/API/printf/printf.h

@@ -60,7 +60,7 @@ extern "C" {
  * \param character Character to output
  */
 void _putchar(char character);
-
+#define _putchar(n)
 
 /**
  * Tiny printf implementation
@@ -137,4 +137,4 @@ int fctprintf(void (*out)(char character, void* arg), void* arg, const char* for
 #endif
 
 
-#endif  // _PRINTF_H_
+#endif  // _PRINTF_H_

TFT/src/User/Menu/FeatureSettings.c

@@ -243,7 +243,6 @@ void updateFeatureSettings(uint8_t key_val)
 
     default:
       return;
-      break;
   }
    featureSettingsItems.items[key_val] = settingPage[item_index];
 }

TFT/src/User/Menu/Popup.c

@@ -137,4 +137,4 @@ void showDialog(DIALOG_TYPE type, u8 * title, u8 * msg, u8 *ok_txt, u8* cancel_t
   }
   if (infoMenu.menu[infoMenu.cur] != menuDialog)
     infoMenu.menu[++infoMenu.cur] = menuDialog;
-}
+}

TFT/src/User/Menu/ScreenSettings.c

@@ -264,15 +264,12 @@ void menuScreenSettings(void)
     {ICON_BACKGROUND,           LABEL_BACKGROUND},
     {ICON_BACK,                 LABEL_BACK},}
   };
-  u8 item_silent_i = 0;
-  #ifdef ST7920_SPI
-    u8 item_marlin_bg_color_i = 0;
-    u8 item_marlin_font_color_i = 0;
-  #endif
+
   KEY_VALUES key_num = KEY_IDLE;
   SETTINGS now = infoSettings;
 
   #ifdef BUZZER_PIN
+    u8 item_silent_i = 0;
     for(u8 i = 0; i < ITEM_SILENT_NUM; i++)
     {
       if(infoSettings.silent == item_silent[i])
@@ -284,6 +281,8 @@ void menuScreenSettings(void)
   #endif
 
   #ifdef ST7920_SPI
+    u8 item_marlin_bg_color_i = 0;
+    u8 item_marlin_font_color_i = 0;
     // LCD12864 background color
     bool inArry = false;
     for(u8 i = 0; i < LCD_COLOR_COUNT; i++)

TFT/src/User/SanityCheck.c

@@ -9,4 +9,4 @@ SIZE_CHECK( sizeof(STRINGS_STORE) > STRINGS_STORE_MAX_SIZE); // check size of st
 SIZE_CHECK( sizeof(CUSTOM_GCODES) > CUSTOM_GCODE_MAX_SIZE); // check size of custom_gcodes is larger tha allocated size in flash.
 SIZE_CHECK( sizeof(PRINT_GCODES) > PRINT_GCODES_MAX_SIZE); // check size of print_gcodes is larger tha allocated size in flash.
 
-}
+}

TFT/src/User/delay.c

@@ -1,13 +1,11 @@
 #include "includes.h"
 
-static u16 fac_ms=0;
 static u8 fac_us=0;
 
 void Delay_init(void)
 {
   SysTick->CTRL&=0xfffffffb;  // bit2 is cleared, select external clock HCLK / 8
   fac_us=mcuClocks.rccClocks.HCLK_Frequency/(8*1000000); // 8 Frequency after frequency division Unit M is 1us times
-  fac_ms=(u16)fac_us * 1000;  // The number of times in 1ms is 1000 times of 1us
 }
 
 void Delay_us(u32 us)					//Delay is less than 1800 * 1000us