Preliminary BTT Octopus Support

Little fixes
akhilya · Jan 13, 2023 · 68791f2 · 68791f2
1 parent c208664
commit 68791f2
Show file tree

Hide file tree

Showing 51 changed files with 1,014 additions and 435 deletions.
diff --git a/Marlin/lib/proui/gd32f10/libproui_abl.a b/Marlin/lib/proui/gd32f10/libproui_abl.a
diff --git a/Marlin/lib/proui/gd32f10/libproui_mbl.a b/Marlin/lib/proui/gd32f10/libproui_mbl.a
diff --git a/Marlin/lib/proui/gd32f10/libproui_ubl.a b/Marlin/lib/proui/gd32f10/libproui_ubl.a
diff --git a/Marlin/lib/proui/stm32f1/libproui_abl.a b/Marlin/lib/proui/stm32f1/libproui_abl.a
diff --git a/Marlin/lib/proui/stm32f1/libproui_mbl.a b/Marlin/lib/proui/stm32f1/libproui_mbl.a
diff --git a/Marlin/lib/proui/stm32f1/libproui_ubl.a b/Marlin/lib/proui/stm32f1/libproui_ubl.a
diff --git a/Marlin/lib/proui/stm32f4/libproui_abl.a b/Marlin/lib/proui/stm32f4/libproui_abl.a
diff --git a/Marlin/lib/proui/stm32f4/libproui_mbl.a b/Marlin/lib/proui/stm32f4/libproui_mbl.a
diff --git a/Marlin/lib/proui/stm32f4/libproui_ubl.a b/Marlin/lib/proui/stm32f4/libproui_ubl.a
diff --git a/Marlin/lib/proui/stm32g0/libproui_abl.a b/Marlin/lib/proui/stm32g0/libproui_abl.a
diff --git a/Marlin/lib/proui/stm32g0/libproui_mbl.a b/Marlin/lib/proui/stm32g0/libproui_mbl.a
diff --git a/Marlin/lib/proui/stm32g0/libproui_ubl.a b/Marlin/lib/proui/stm32g0/libproui_ubl.a
diff --git a/Marlin/src/HAL/SAMD21/timers.cpp b/Marlin/src/HAL/SAMD21/timers.cpp
@@ -135,7 +135,7 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
 
   }
   else if (timer_config[timer_num].type==TimerType::tcc) {
-    
+
     Tcc * const tc = timer_config[timer_num].pTcc;
 
     PM->APBCMASK.reg |= PM_APBCMASK_TCC0;

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
@@ -1195,8 +1195,8 @@ void setup() {
     #if FREEZE_STATE
       SET_INPUT_PULLDOWN(FREEZE_PIN);
     #else
-    SET_INPUT_PULLUP(FREEZE_PIN);
-  #endif
+      SET_INPUT_PULLUP(FREEZE_PIN);
+    #endif
   #endif
 
   #if HAS_SUICIDE

diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
@@ -742,3 +742,13 @@
 #define _HAS_E_TEMP(N) || TEMP_SENSOR(N)
 #define HAS_E_TEMP_SENSOR (0 REPEAT(EXTRUDERS, _HAS_E_TEMP))
 #define TEMP_SENSOR_IS_MAX_TC(T) (TEMP_SENSOR(T) == -5 || TEMP_SENSOR(T) == -3 || TEMP_SENSOR(T) == -2)
+
+#define _UI_NONE          0
+#define _UI_ORIGIN      101
+#define _UI_FYSETC      102
+#define _UI_HIPRECY     103
+#define _UI_MKS         104
+#define _UI_RELOADED    105
+#define _UI_IA_CREALITY 106
+#define _DGUS_UI_IS(N) || (CAT(_UI_, DGUS_LCD_UI) == CAT(_UI_, N))
+#define DGUS_UI_IS(V...) (0 MAP(_DGUS_UI_IS, V))
diff --git a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
@@ -115,7 +115,7 @@ class mesh_bed_leveling {
   static float get_z_correction(const xy_pos_t &pos) {
     const xy_int8_t ind = cell_indexes(pos);
     const float x1 = index_to_xpos[ind.x], x2 = index_to_xpos[ind.x+1],
-                y1 = index_to_xpos[ind.y], y2 = index_to_xpos[ind.y+1],
+                y1 = index_to_ypos[ind.y], y2 = index_to_ypos[ind.y+1],
                 z1 = calc_z0(pos.x, x1, z_values[ind.x][ind.y  ], x2, z_values[ind.x+1][ind.y  ]),
                 z2 = calc_z0(pos.x, x1, z_values[ind.x][ind.y+1], x2, z_values[ind.x+1][ind.y+1]),
                 zf = calc_z0(pos.y, y1, z1, y2, z2);

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.cpp b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
@@ -177,7 +177,6 @@ void unified_bed_leveling::display_map(const uint8_t map_type) {
   IF_DISABLED(ProUIex, constexpr) uint8_t eachsp = 1 + 6 + 1,                           // [-3.567]
                     twixt = eachsp * (GRID_MAX_POINTS_X) - 9 * 2; // Leading 4sp, Coordinates 9sp each
 
-
   const bool human = !(map_type & 0x3), csv = map_type == 1, lcd = map_type == 2, comp = map_type & 0x4;
 
   SERIAL_ECHOPGM("\nBed Topography Report");

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.h b/Marlin/src/feature/bedlevel/ubl/ubl.h
@@ -293,6 +293,7 @@ class unified_bed_leveling {
     return z0;
   }
   static float get_z_correction(const xy_pos_t &pos) { return get_z_correction(pos.x, pos.y); }
+
   static constexpr float get_z_offset() { return 0.0f; }
 
   #if ProUIex

diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
@@ -673,7 +673,7 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_
   if (resume_position.e < 0) unscaled_e_move(resume_position.e, feedRate_t(PAUSE_PARK_RETRACT_FEEDRATE));
   #ifdef ADVANCED_PAUSE_RESUME_PRIME
     if (ADVANCED_PAUSE_RESUME_PRIME != 0)
-    unscaled_e_move(ADVANCED_PAUSE_RESUME_PRIME, feedRate_t(ADVANCED_PAUSE_PURGE_FEEDRATE));
+      unscaled_e_move(ADVANCED_PAUSE_RESUME_PRIME, feedRate_t(ADVANCED_PAUSE_PURGE_FEEDRATE));
   #endif
 
   // Now all extrusion positions are resumed and ready to be confirmed

diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -105,7 +105,7 @@ void GcodeSuite::G29() {
       if (!ui.wait_for_move) {
         queue.inject(parser.seen_test('N') ? F("G28" TERN(CAN_SET_LEVELING_AFTER_G28, "L0", "") "\nG29S2") : F("G29S2"));
         TERN_(EXTENSIBLE_UI, ExtUI::onLevelingStart());
-        TERN_(DWIN_LCD_PROUI, DWIN_LevelingStart());       
+        TERN_(DWIN_LCD_PROUI, DWIN_LevelingStart());
 
         // Position bed horizontally and Z probe vertically.
         #if    defined(SAFE_BED_LEVELING_START_X) || defined(SAFE_BED_LEVELING_START_Y) || defined(SAFE_BED_LEVELING_START_Z) \

diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
@@ -1117,7 +1117,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
       case 'S': case 'P': case 'R': break;                        // Invalid S, P, R commands already filtered
     #endif
 
-    #if ENABLED(DWIN_LCD_PROUI)
+    #if BOTH(DWIN_LCD_PROUI, HAS_CGCODE)
       case 'C' : DWIN_Gcode(parser.codenum); break;               // ProUIex Cn: Custom Gcodes
     #endif
 

diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
@@ -257,20 +257,20 @@ class GCodeParser {
   // Float removes 'E' to prevent scientific notation interpretation
   static float value_float() {
     if (!value_ptr) return 0;
-      char *e = value_ptr;
-      for (;;) {
-        const char c = *e;
-        if (c == '\0' || c == ' ') break;
-        if (c == 'E' || c == 'e' || c == 'X' || c == 'x') {
-          *e = '\0';
-          const float ret = strtof(value_ptr, nullptr);
-          *e = c;
-          return ret;
-        }
-        ++e;
+    char *e = value_ptr;
+    for (;;) {
+      const char c = *e;
+      if (c == '\0' || c == ' ') break;
+      if (c == 'E' || c == 'e' || c == 'X' || c == 'x') {
+        *e = '\0';
+        const float ret = strtof(value_ptr, nullptr);
+        *e = c;
+        return ret;
       }
-      return strtof(value_ptr, nullptr);
+      ++e;
     }
+    return strtof(value_ptr, nullptr);
+  }
 
   // Code value as a long or ulong
   static int32_t value_long() { return value_ptr ? strtol(value_ptr, nullptr, 10) : 0L; }

diff --git a/Marlin/src/gcode/stats/M75-M78.cpp b/Marlin/src/gcode/stats/M75-M78.cpp
@@ -65,8 +65,8 @@ void GcodeSuite::M77() {
 #if ENABLED(PRINTCOUNTER)
 
   /**
- * M78: Show print statistics
- */
+   * M78: Show print statistics
+   */
   void GcodeSuite::M78() {
     if (parser.intval('S') == 78) {  // "M78 S78" will reset the statistics
       print_job_timer.initStats();

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
@@ -2782,7 +2782,7 @@
 
 // User Interface
 #if ENABLED(FREEZE_FEATURE) && !PIN_EXISTS(FREEZE) && PIN_EXISTS(KILL)
-    #define FREEZE_PIN KILL_PIN
+  #define FREEZE_PIN KILL_PIN
 #elif PIN_EXISTS(KILL) && TERN1(FREEZE_FEATURE, KILL_PIN != FREEZE_PIN)
   #define HAS_KILL 1
 #endif

diff --git a/Marlin/src/lcd/e3v2/common/dwin_font.h b/Marlin/src/lcd/e3v2/common/dwin_font.h
@@ -21,20 +21,20 @@
  */
 #pragma once
 
-typedef uint8_t font_t;
+typedef uint8_t fontid_t;
 
 /**
  * 3-.0：The font size, 0x00-0x09, corresponds to the font size below:
  * 0x00=6*12   0x01=8*16   0x02=10*20  0x03=12*24  0x04=14*28
  * 0x05=16*32  0x06=20*40  0x07=24*48  0x08=28*56  0x09=32*64
  */
-#define font6x12  (font_t)0x00
-#define font8x16  (font_t)0x01
-#define font10x20 (font_t)0x02
-#define font12x24 (font_t)0x03
-#define font14x28 (font_t)0x04
-#define font16x32 (font_t)0x05
-#define font20x40 (font_t)0x06
-#define font24x48 (font_t)0x07
-#define font28x56 (font_t)0x08
-#define font32x64 (font_t)0x09
+#define font6x12  (fontid_t)0x00
+#define font8x16  (fontid_t)0x01
+#define font10x20 (fontid_t)0x02
+#define font12x24 (fontid_t)0x03
+#define font14x28 (fontid_t)0x04
+#define font16x32 (fontid_t)0x05
+#define font20x40 (fontid_t)0x06
+#define font24x48 (fontid_t)0x07
+#define font28x56 (fontid_t)0x08
+#define font32x64 (fontid_t)0x09
diff --git a/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp
@@ -1,8 +1,8 @@
 /**
  * Bed Level Tools for Pro UI
  * Extended by: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 2.0.0
- * Date: 2022/05/23
+ * Version: 2.1.0
+ * Date: 2022/08/27
  * 
  * Based on the original work of: Henri-J-Norden
  * https://github.com/Jyers/Marlin/pull/126
@@ -274,6 +274,6 @@ bool BedLevelToolsClass::meshvalidate() {
     ui.set_status(msg);
     drawing_mesh = false;
   }
-#endif
+#endif // USE_UBL_VIEWER
 
-#endif // DWIN_LCD_PROUI
+#endif // DWIN_LCD_PROUI && HAS_LEVELING
diff --git a/Marlin/src/lcd/e3v2/proui/bedlevel_tools.h b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.h
@@ -1,8 +1,8 @@
 /**
  * Bed Level Tools for Pro UI
  * Extended by: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 2.0.0
- * Date: 2022/05/23
+ * Version: 2.1.0
+ * Date: 2022/08/27
  * 
  * Based on the original work of: Henri-J-Norden
  * https://github.com/Jyers/Marlin/pull/126

diff --git a/Marlin/src/lcd/e3v2/proui/custom_gcodes.cpp b/Marlin/src/lcd/e3v2/proui/custom_gcodes.cpp
@@ -21,7 +21,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if ENABLED(DWIN_LCD_PROUI)
+#if BOTH(DWIN_LCD_PROUI, HAS_CGCODE)
 
 #include "../../../MarlinCore.h" // for wait_for_user
 #include "../../../core/types.h"
@@ -158,4 +158,4 @@ void custom_gcode_report(const bool forReplay/*=true*/) {
   #endif
 }
 
-#endif
+#endif // DWIN_LCD_PROUI && HAS_CGCODE
-Original file line number
+Diff line change
@@ Expand Up @@
       }
       else if (timer_config[timer_num].type==TimerType::tcc) {
         Tcc * const tc = timer_config[timer_num].pTcc;
         PM->APBCMASK.reg |= PM_APBCMASK_TCC0;
@@ Expand Down @@