SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update ExtUI, add test under DUE (#15298)

Browse source
This commit is contained in:
Scott Lahteine 2019-09-17 23:41:34 -05:00 committed by GitHub
parent b39ab3db37
commit b73744f9e7
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Marlin/src/lcd/extensible_ui/ui_api.cpp
View file

@ -819,6 +819,9 @@ namespace ExtUI {
#endif #endif
} }
} }
void onMeshUpdate(const uint8_t xpos, const uint8_t ypos, const float zval) {
UNUSED(xpos); UNUSED(ypos); UNUSED(zval);
}
#endif #endif
#endif #endif

4
Marlin/src/lcd/extensible_ui/ui_api.h
View file

@ -96,7 +96,7 @@ namespace ExtUI {
void setAxisCurrent_mA(const float, const axis_t); void setAxisCurrent_mA(const float, const axis_t);
void setAxisCurrent_mA(const float, const extruder_t); void setAxisCurrent_mA(const float, const extruder_t);
int getTMCBumpSensitivity(const axis_t); int getTMCBumpSensitivity(const axis_t);
void setTMCBumpSensitivity(const float, const axis_t); void setTMCBumpSensitivity(const float, const axis_t);
#endif #endif
@ -272,7 +272,7 @@ namespace ExtUI {
void changeDir(const char * const dirname); void changeDir(const char * const dirname);
void upDir(); void upDir();
bool isAtRootDir(); bool isAtRootDir();
uint16_t count(); uint16_t count();
}; };
/** /**

2
Marlin/src/lcd/extui_dgus_lcd.cpp
View file

@ -57,7 +57,7 @@ namespace ExtUI {
void onPrintTimerStarted() {} void onPrintTimerStarted() {}
void onPrintTimerPaused() {} void onPrintTimerPaused() {}
void onPrintTimerStopped() {} void onPrintTimerStopped() {}
void onFilamentRunout() {} void onFilamentRunout(const extruder_t extruder) {}
void onUserConfirmRequired(const char *msg) { void onUserConfirmRequired(const char *msg) {
if (msg) { if (msg) {

2
Marlin/src/lcd/extui_malyan_lcd.cpp
View file

@ -447,7 +447,7 @@ namespace ExtUI {
void onPrintTimerStarted() {} void onPrintTimerStarted() {}
void onPrintTimerPaused() {} void onPrintTimerPaused() {}
void onPrintTimerStopped() {} void onPrintTimerStopped() {}
void onFilamentRunout() {} void onFilamentRunout(const extruder_t extruder) {}
void onUserConfirmRequired(const char * const msg) { UNUSED(msg); } void onUserConfirmRequired(const char * const msg) { UNUSED(msg); }
void onFactoryReset() {} void onFactoryReset() {}
void onStoreSettings(char *buff) { UNUSED(buff); } void onStoreSettings(char *buff) { UNUSED(buff); }

28
buildroot/share/tests/DUE-tests
View file

@ -6,14 +6,34 @@
# exit on first failure # exit on first failure
set -e set -e
backup_ramps backup_ramps # pins_set is used below...
restore_configs restore_configs
opt_set MOTHERBOARD BOARD_RAMPS4DUE_EFB EXTENSIBLE_UI EXTUI_EXAMPLE opt_set MOTHERBOARD BOARD_RAMPS4DUE_EFB
opt_enable S_CURVE_ACCELERATION EEPROM_SETTINGS GCODE_MACROS opt_set TEMP_SENSOR_0 -2
opt_set TEMP_SENSOR_BED 2
opt_set GRID_MAX_POINTS_X 16
opt_set FANMUX0_PIN 53
opt_enable S_CURVE_ACCELERATION EEPROM_SETTINGS GCODE_MACROS \
PIDTEMPBED FIX_MOUNTED_PROBE Z_SAFE_HOMING CODEPENDENT_XY_HOMING \
EEPROM_SETTINGS SDSUPPORT BINARY_FILE_TRANSFER \
BLINKM PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \
NEOPIXEL_LED CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CASE_LIGHT_MENU \
NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE FILAMENT_RUNOUT_DISTANCE_MM FILAMENT_RUNOUT_SENSOR \
AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE \
BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \
FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
PSU_CONTROL AUTO_POWER_CONTROL \
SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER \
PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL \
EXTENSIBLE_UI
opt_add EXTUI_EXAMPLE
opt_set E0_AUTO_FAN_PIN 8 opt_set E0_AUTO_FAN_PIN 8
opt_set EXTRUDER_AUTO_FAN_SPEED 100 opt_set EXTRUDER_AUTO_FAN_SPEED 100
exec_test $1 $2 "RAMPS4DUE_EFB with S_CURVE_ACCELERATION, EEPROM_SETTINGS, GCODE_MACROS" opt_set TEMP_SENSOR_CHAMBER 3
opt_set HEATER_CHAMBER_PIN 45
exec_test $1 $2 "RAMPS4DUE_EFB with EXTENSIBLE_UI, S-Curve, many options."
restore_configs restore_configs
opt_set MOTHERBOARD BOARD_RADDS opt_set MOTHERBOARD BOARD_RADDS