From 5f5f76956f11c7c58278fd449f6ad85e07cd6e10 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 22 Sep 2020 19:58:06 -0500
Subject: [PATCH] Fix up tests, warnings
---
Marlin/src/gcode/calibrate/M48.cpp | 4 ++--
Marlin/src/lcd/extui/ui_api.cpp | 2 +-
buildroot/tests/teensy41-tests | 13 +++++++------
platformio.ini | 2 +-
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/Marlin/src/gcode/calibrate/M48.cpp b/Marlin/src/gcode/calibrate/M48.cpp
index aaf58eed1c7..88273b46e46 100644
--- a/Marlin/src/gcode/calibrate/M48.cpp
+++ b/Marlin/src/gcode/calibrate/M48.cpp
@@ -192,8 +192,8 @@ void GcodeSuite::M48() {
// Choose the next position as an offset to chosen test position
const xy_pos_t noz_pos = test_position - probe.offset_xy;
xy_pos_t next_pos = {
- noz_pos.x + cos(RADIANS(angle)) * radius,
- noz_pos.y + sin(RADIANS(angle)) * radius
+ noz_pos.x + float(cos(RADIANS(angle))) * radius,
+ noz_pos.y + float(sin(RADIANS(angle))) * radius
};
#if ENABLED(DELTA)
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index afc9c6692e0..1270e3d649f 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -705,7 +705,7 @@ namespace ExtUI {
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
// Make it so babystepping in Z adjusts the Z probe offset.
- if (axis == Z && TERN1(HAS_MULTI_EXTRUDER, linked_nozzles || active_extruder == 0))
+ if (axis == Z && TERN1(HAS_MULTI_EXTRUDER, (linked_nozzles || active_extruder == 0)))
probe.offset.z += mm;
#endif
diff --git a/buildroot/tests/teensy41-tests b/buildroot/tests/teensy41-tests
index 04baf029d9c..8d32d131e91 100644
--- a/buildroot/tests/teensy41-tests
+++ b/buildroot/tests/teensy41-tests
@@ -19,14 +19,15 @@ opt_set EXTRUDERS 2
opt_set TEMP_SENSOR_0 1
opt_set TEMP_SENSOR_1 5
opt_set TEMP_SENSOR_BED 1
-opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LCD_INFO_MENU SDSUPPORT SDCARD_SORT_ALPHA \
- FILAMENT_WIDTH_SENSOR FILAMENT_LCD_DISPLAY CALIBRATION_GCODE BAUD_RATE_GCODE \
+opt_enable EXTENSIBLE_UI LCD_INFO_MENU SDSUPPORT SDCARD_SORT_ALPHA \
+ FILAMENT_LCD_DISPLAY CALIBRATION_GCODE BAUD_RATE_GCODE \
FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
- BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET BABYSTEP_ZPROBE_GFX_OVERLAY \
- PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT M100_FREE_MEMORY_WATCHER \
+ BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET \
+ PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT \
ADVANCED_PAUSE_FEATURE ARC_SUPPORT BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES PARK_HEAD_ON_PAUSE \
PHOTO_GCODE PHOTO_POSITION PHOTO_SWITCH_POSITION PHOTO_SWITCH_MS PHOTO_DELAY_MS PHOTO_RETRACT_MM \
HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT
+opt_add EXTUI_EXAMPLE
opt_set I2C_SLAVE_ADDRESS 63
opt_set GRID_MAX_POINTS_X 16
exec_test $1 $2 "Teensy4.1 with many features"
@@ -62,7 +63,7 @@ restore_configs
opt_set MOTHERBOARD BOARD_TEENSY41
opt_set EXTRUDERS 2
opt_set TEMP_SENSOR_1 1
-opt_enable MAGNETIC_PARKING_EXTRUDER ULTIMAKERCONTROLLER
+opt_enable MAGNETIC_PARKING_EXTRUDER
exec_test $1 $2 "MAGNETIC_PARKING_EXTRUDER with LCD"
#
@@ -70,7 +71,7 @@ exec_test $1 $2 "MAGNETIC_PARKING_EXTRUDER with LCD"
#
restore_configs
opt_set MOTHERBOARD BOARD_TEENSY41
-opt_enable MIXING_EXTRUDER DIRECT_MIXING_IN_G1 GRADIENT_MIX GRADIENT_VTOOL REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
+opt_enable MIXING_EXTRUDER DIRECT_MIXING_IN_G1 GRADIENT_MIX GRADIENT_VTOOL
opt_set MIXING_STEPPERS 2
exec_test $1 $2 "Mixing Extruder"
diff --git a/platformio.ini b/platformio.ini
index c1b6f2c24d7..c68daf2c717 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -207,7 +207,7 @@ HAS_L64XX = Arduino-L6470@0.8.0
NEOPIXEL_LED = Adafruit NeoPixel@1.5.0
src_filter=+<src/feature/leds/neopixel.cpp>
MAX6675_IS_MAX31865 = Adafruit MAX31865 library@~1.1.0
-HAS_GRAPHICAL_LCD = U8glib-HAL@0.4.1
+HAS_GRAPHICAL_LCD = U8glib-HAL@~0.4.1
src_filter=+<src/lcd/dogm>
USES_LIQUIDCRYSTAL = LiquidCrystal@1.5.0
USES_LIQUIDTWI2 = LiquidTWI2@1.2.7