Quellcode durchsuchen

Update ExtUI, add test under DUE (#15298)

Scott Lahteine vor 5 Jahren
Ursprung
Commit
b73744f9e7
Es ist kein Account mit der E-Mail-Adresse des Committers verbunden

+ 3
- 0
Marlin/src/lcd/extensible_ui/ui_api.cpp Datei anzeigen

819
           #endif
819
           #endif
820
         }
820
         }
821
       }
821
       }
822
+      void onMeshUpdate(const uint8_t xpos, const uint8_t ypos, const float zval) {
823
+        UNUSED(xpos); UNUSED(ypos); UNUSED(zval);
824
+      }
822
     #endif
825
     #endif
823
   #endif
826
   #endif
824
 
827
 

+ 2
- 2
Marlin/src/lcd/extensible_ui/ui_api.h Datei anzeigen

96
     void  setAxisCurrent_mA(const float, const axis_t);
96
     void  setAxisCurrent_mA(const float, const axis_t);
97
     void  setAxisCurrent_mA(const float, const extruder_t);
97
     void  setAxisCurrent_mA(const float, const extruder_t);
98
 
98
 
99
-    int getTMCBumpSensitivity(const axis_t);
99
+     int getTMCBumpSensitivity(const axis_t);
100
     void setTMCBumpSensitivity(const float, const axis_t);
100
     void setTMCBumpSensitivity(const float, const axis_t);
101
   #endif
101
   #endif
102
 
102
 
272
       void changeDir(const char * const dirname);
272
       void changeDir(const char * const dirname);
273
       void upDir();
273
       void upDir();
274
       bool isAtRootDir();
274
       bool isAtRootDir();
275
-      uint16_t    count();
275
+      uint16_t count();
276
   };
276
   };
277
 
277
 
278
   /**
278
   /**

+ 1
- 1
Marlin/src/lcd/extui_dgus_lcd.cpp Datei anzeigen

57
   void onPrintTimerStarted() {}
57
   void onPrintTimerStarted() {}
58
   void onPrintTimerPaused() {}
58
   void onPrintTimerPaused() {}
59
   void onPrintTimerStopped() {}
59
   void onPrintTimerStopped() {}
60
-  void onFilamentRunout() {}
60
+  void onFilamentRunout(const extruder_t extruder) {}
61
 
61
 
62
   void onUserConfirmRequired(const char *msg) {
62
   void onUserConfirmRequired(const char *msg) {
63
     if (msg) {
63
     if (msg) {

+ 1
- 1
Marlin/src/lcd/extui_malyan_lcd.cpp Datei anzeigen

447
   void onPrintTimerStarted() {}
447
   void onPrintTimerStarted() {}
448
   void onPrintTimerPaused() {}
448
   void onPrintTimerPaused() {}
449
   void onPrintTimerStopped() {}
449
   void onPrintTimerStopped() {}
450
-  void onFilamentRunout() {}
450
+  void onFilamentRunout(const extruder_t extruder) {}
451
   void onUserConfirmRequired(const char * const msg) { UNUSED(msg); }
451
   void onUserConfirmRequired(const char * const msg) { UNUSED(msg); }
452
   void onFactoryReset() {}
452
   void onFactoryReset() {}
453
   void onStoreSettings(char *buff) { UNUSED(buff); }
453
   void onStoreSettings(char *buff) { UNUSED(buff); }

+ 24
- 4
buildroot/share/tests/DUE-tests Datei anzeigen

6
 # exit on first failure
6
 # exit on first failure
7
 set -e
7
 set -e
8
 
8
 
9
-backup_ramps
9
+backup_ramps     # pins_set is used below...
10
 
10
 
11
 restore_configs
11
 restore_configs
12
-opt_set MOTHERBOARD BOARD_RAMPS4DUE_EFB EXTENSIBLE_UI EXTUI_EXAMPLE
13
-opt_enable S_CURVE_ACCELERATION EEPROM_SETTINGS GCODE_MACROS
12
+opt_set MOTHERBOARD BOARD_RAMPS4DUE_EFB
13
+opt_set TEMP_SENSOR_0 -2
14
+opt_set TEMP_SENSOR_BED 2
15
+opt_set GRID_MAX_POINTS_X 16
16
+opt_set FANMUX0_PIN 53
17
+opt_enable S_CURVE_ACCELERATION EEPROM_SETTINGS GCODE_MACROS \
18
+           PIDTEMPBED FIX_MOUNTED_PROBE Z_SAFE_HOMING CODEPENDENT_XY_HOMING \
19
+           EEPROM_SETTINGS SDSUPPORT BINARY_FILE_TRANSFER \
20
+           BLINKM PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \
21
+           NEOPIXEL_LED CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CASE_LIGHT_MENU \
22
+           NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE FILAMENT_RUNOUT_DISTANCE_MM FILAMENT_RUNOUT_SENSOR \
23
+           AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
24
+           SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE \
25
+           BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \
26
+           FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
27
+           PSU_CONTROL AUTO_POWER_CONTROL \
28
+           SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER \
29
+           PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL \
30
+           EXTENSIBLE_UI
31
+opt_add    EXTUI_EXAMPLE
14
 opt_set E0_AUTO_FAN_PIN 8
32
 opt_set E0_AUTO_FAN_PIN 8
15
 opt_set EXTRUDER_AUTO_FAN_SPEED 100
33
 opt_set EXTRUDER_AUTO_FAN_SPEED 100
16
-exec_test $1 $2 "RAMPS4DUE_EFB with S_CURVE_ACCELERATION, EEPROM_SETTINGS, GCODE_MACROS"
34
+opt_set TEMP_SENSOR_CHAMBER 3
35
+opt_set HEATER_CHAMBER_PIN 45
36
+exec_test $1 $2 "RAMPS4DUE_EFB with EXTENSIBLE_UI, S-Curve, many options."
17
 
37
 
18
 restore_configs
38
 restore_configs
19
 opt_set MOTHERBOARD BOARD_RADDS
39
 opt_set MOTHERBOARD BOARD_RADDS

Laden…
Abbrechen
Speichern