Update - remove whitespace, small tweaks

edit bump-date.yml, settings.cpp
classicrocker883 · Nov 28, 2023 · 585fb9d · 585fb9d
1 parent 602bf42
commit 585fb9d
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 35 deletions.
diff --git a/.github/workflows/bump-date.yml b/.github/workflows/bump-date.yml
@@ -26,7 +26,9 @@ jobs:
     - name: Bump Date (2023-November)
       run: |
         if [[ ! "$( git log -1 --pretty=%B )" =~ ^\[cron\] ]]; then
+          shopt -s globstar && \
           DIST=$( date +"%Y-%m-%d" )
+          eval "sed -E -i 's/(\/\/#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' configurations/**/Version.h" && \
           eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/src/inc/Version.h" && \
           eval "sed -E -i 's/(\/\/#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/Version.h" && \
           git config user.name "Andrew" && \

diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -2539,18 +2539,12 @@ void ApplyMove() {
 #endif
 
 #if ENABLED(SOUND_MENU_ITEM)
-  void SetEnableSound() {
-    Toggle_Chkb_Line(ui.sound_on);
-  }
-  void SetEnableTick() {
-    Toggle_Chkb_Line(ui.tick_on);
-  }
+  void SetEnableSound() { Toggle_Chkb_Line(ui.sound_on); }
+  void SetEnableTick() { Toggle_Chkb_Line(ui.tick_on); }
 #endif
 
 #if HAS_MESH && USE_GRID_MESHVIEWER
-  void SetViewMesh() {
-    Toggle_Chkb_Line(bedLevelTools.view_mesh);
-  }
+  void SetViewMesh() { Toggle_Chkb_Line(bedLevelTools.view_mesh); }
 #endif
 
 #if HAS_HOME_OFFSET
@@ -2583,9 +2577,7 @@ void ApplyMove() {
   void ProbeDeploy() { probe.deploy(); }
 
   #if HAS_BLTOUCH_HS_MODE && ENABLED(HS_MENU_ITEM)
-    void SetHSMode() {
-      Toggle_Chkb_Line(bltouch.high_speed_mode);
-    }
+    void SetHSMode() { Toggle_Chkb_Line(bltouch.high_speed_mode); }
   #endif
 
 #endif

diff --git a/Marlin/src/lcd/e3v2/proui/gcode_preview.h b/Marlin/src/lcd/e3v2/proui/gcode_preview.h
@@ -55,7 +55,7 @@ typedef struct {
   maxy;
 
   void setnames(const char * const fn);
-  void clears(); 
+  void clears();
 
 } fileprop_t;
 

diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
@@ -585,16 +585,16 @@ typedef struct SettingsDataStruct {
   #endif
 
   //
-  // 2nd Mesh Viewer
+  // Toggle the meshviwer
   //
-  #if ENABLED(HAS_MESH) && ENABLED(USE_GRID_MESHVIEWER)
+  #if HAS_MESH && USE_GRID_MESHVIEWER
     bool view_mesh;
   #endif
 
   //
   // Bed corner screw position
   //
-  #if BED_SCREW_INSET
+  #ifdef BED_SCREW_INSET
     float ui_screw_pos;
   #endif
 
@@ -634,7 +634,7 @@ typedef struct SettingsDataStruct {
   #endif
 
   //
-  // If LCD has Language > 1
+  // LCD has Language > 1
   //
   #if HAS_MULTI_LANGUAGE
     uint8_t ui_language;                                // M414 S
@@ -1686,7 +1686,7 @@ void MarlinSettings::postprocess() {
     //
     // BED_SCREW_INSET
     //
-    #if BED_SCREW_INSET
+    #ifdef BED_SCREW_INSET
       EEPROM_WRITE(ui.screw_pos);
     #endif
 
@@ -1757,9 +1757,13 @@ void MarlinSettings::postprocess() {
       EEPROM_WRITE(ui.tick_on);
     #endif
 
-    #if ENABLED(HAS_MESH) && ENABLED(USE_GRID_MESHVIEWER)
+    //
+    // Toggle the meshviewer
+    //
+    #if HAS_MESH && USE_GRID_MESHVIEWER
       EEPROM_WRITE(bedLevelTools.view_mesh);
     #endif
+
     //
     // Fan tachometer check
     //
@@ -2783,9 +2787,9 @@ void MarlinSettings::postprocess() {
       #endif
 
       //
-      //BED_SCREW_INSET
+      // BED_SCREW_INSET
       //
-      #if BED_SCREW_INSET
+      #ifdef BED_SCREW_INSET
         _FIELD_TEST(ui_screw_pos);
         EEPROM_READ(ui.screw_pos);
       #endif
@@ -2801,7 +2805,7 @@ void MarlinSettings::postprocess() {
         _FIELD_TEST(ui_mesh_inset_min_y);
         EEPROM_READ(ui.mesh_inset_min_y);
         _FIELD_TEST(ui_mesh_inset_max_y);
-        EEPROM_READ(ui.mesh_inset_max_y); 
+        EEPROM_READ(ui.mesh_inset_max_y);
       #endif
 
       //
@@ -2862,10 +2866,14 @@ void MarlinSettings::postprocess() {
         EEPROM_READ(ui.tick_on);
       #endif
 
-      #if ENABLED(HAS_MESH) && ENABLED(USE_GRID_MESHVIEWER)
+      //
+      // Toggle the meshviewer
+      //
+      #if HAS_MESH && USE_GRID_MESHVIEWER
         _FIELD_TEST(view_mesh);
         EEPROM_READ(bedLevelTools.view_mesh);
       #endif
+
       //
       // Fan tachometer check
       //
@@ -3332,10 +3340,10 @@ void MarlinSettings::reset() {
   #endif
 
   //
-  //BED_SCREW_INSET
+  // BED_SCREW_INSET
   //
-  #if BED_SCREW_INSET
-    ui.screw_pos = BED_SCREW_INSET; 
+  #ifdef BED_SCREW_INSET
+    ui.screw_pos = BED_SCREW_INSET;
   #endif
 
   //
@@ -3374,7 +3382,10 @@ void MarlinSettings::reset() {
     ui.tick_on = ENABLED(TICK_ON_DEFAULT); //added encoder beep bool
   #endif
 
-  #if ENABLED(HAS_MESH) && ENABLED(USE_GRID_MESHVIEWER)
+  //
+  // Toggle the meshviewer
+  //
+  #if HAS_MESH && USE_GRID_MESHVIEWER
     bedLevelTools.view_mesh = false; //added mesh viewer option
   #endif
 

diff --git a/Marlin/src/module/thermistor/thermistor_98.h b/Marlin/src/module/thermistor/thermistor_98.h
@@ -47,18 +47,18 @@ constexpr temp_entry_t temptable_98[] PROGMEM = {
   { OV(  38), 255 },
   { OV(  41), 250 }, //{ OV(  48), 250 },
   { OV(  48), 245 },
-  { OV(  56), 240 }, 
-  { OV(  61), 235 }, 
+  { OV(  56), 240 },
+  { OV(  61), 235 },
   { OV(  66), 230 },
-  { OV(  71), 225 }, 
-  { OV(  78), 220 }, 
-  { OV(  84), 215 }, 
+  { OV(  71), 225 },
+  { OV(  78), 220 },
+  { OV(  84), 215 },
   { OV(  92), 210 },
-  { OV( 100), 205 }, 
+  { OV( 100), 205 },
   { OV( 109), 200 },
-  { OV( 120), 195 }, 
+  { OV( 120), 195 },
   { OV( 131), 190 },
-  { OV( 143), 185 }, 
+  { OV( 143), 185 },
   { OV( 156), 180 },
   { OV( 171), 175 },
   { OV( 187), 170 },