zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix up tests, warnings

Browse source
This commit is contained in:
Scott Lahteine 2020-09-22 19:58:06 -05:00
parent fd8cd31504
commit 5f5f76956f
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/gcode/calibrate/M48.cpp
View file

@ -192,8 +192,8 @@ void GcodeSuite::M48() {
// Choose the next position as an offset to chosen test position // Choose the next position as an offset to chosen test position
const xy_pos_t noz_pos = test_position - probe.offset_xy; const xy_pos_t noz_pos = test_position - probe.offset_xy;
xy_pos_t next_pos = { xy_pos_t next_pos = {
noz_pos.x + cos(RADIANS(angle)) * radius, noz_pos.x + float(cos(RADIANS(angle))) * radius,
noz_pos.y + sin(RADIANS(angle)) * radius noz_pos.y + float(sin(RADIANS(angle))) * radius
}; };
#if ENABLED(DELTA) #if ENABLED(DELTA)

2
Marlin/src/lcd/extui/ui_api.cpp
View file

@ -705,7 +705,7 @@ namespace ExtUI {
#if ENABLED(BABYSTEP_ZPROBE_OFFSET) #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
// Make it so babystepping in Z adjusts the Z probe 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; probe.offset.z += mm;
#endif #endif

13
buildroot/tests/teensy41-tests
View file

@ -19,14 +19,15 @@ opt_set EXTRUDERS 2
opt_set TEMP_SENSOR_0 1 opt_set TEMP_SENSOR_0 1
opt_set TEMP_SENSOR_1 5 opt_set TEMP_SENSOR_1 5
opt_set TEMP_SENSOR_BED 1 opt_set TEMP_SENSOR_BED 1
opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LCD_INFO_MENU SDSUPPORT SDCARD_SORT_ALPHA \ opt_enable EXTENSIBLE_UI LCD_INFO_MENU SDSUPPORT SDCARD_SORT_ALPHA \
FILAMENT_WIDTH_SENSOR FILAMENT_LCD_DISPLAY CALIBRATION_GCODE BAUD_RATE_GCODE \ 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 \ 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 \ 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 M100_FREE_MEMORY_WATCHER \ 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 \ 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 \ PHOTO_GCODE PHOTO_POSITION PHOTO_SWITCH_POSITION PHOTO_SWITCH_MS PHOTO_DELAY_MS PHOTO_RETRACT_MM \
HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT
opt_add EXTUI_EXAMPLE
opt_set I2C_SLAVE_ADDRESS 63 opt_set I2C_SLAVE_ADDRESS 63
opt_set GRID_MAX_POINTS_X 16 opt_set GRID_MAX_POINTS_X 16
exec_test $1 $2 "Teensy4.1 with many features" exec_test $1 $2 "Teensy4.1 with many features"
@ -62,7 +63,7 @@ restore_configs
opt_set MOTHERBOARD BOARD_TEENSY41 opt_set MOTHERBOARD BOARD_TEENSY41
opt_set EXTRUDERS 2 opt_set EXTRUDERS 2
opt_set TEMP_SENSOR_1 1 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" exec_test $1 $2 "MAGNETIC_PARKING_EXTRUDER with LCD"
# #
@ -70,7 +71,7 @@ exec_test $1 $2 "MAGNETIC_PARKING_EXTRUDER with LCD"
# #
restore_configs restore_configs
opt_set MOTHERBOARD BOARD_TEENSY41 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 opt_set MIXING_STEPPERS 2
exec_test $1 $2 "Mixing Extruder" exec_test $1 $2 "Mixing Extruder"

2
platformio.ini
View file

@ -207,7 +207,7 @@ HAS_L64XX = Arduino-L6470@0.8.0
NEOPIXEL_LED = Adafruit NeoPixel@1.5.0 NEOPIXEL_LED = Adafruit NeoPixel@1.5.0
src_filter=+<src/feature/leds/neopixel.cpp> src_filter=+<src/feature/leds/neopixel.cpp>
MAX6675_IS_MAX31865 = Adafruit MAX31865 library@~1.1.0 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> src_filter=+<src/lcd/dogm>
USES_LIQUIDCRYSTAL = LiquidCrystal@1.5.0 USES_LIQUIDCRYSTAL = LiquidCrystal@1.5.0
USES_LIQUIDTWI2 = LiquidTWI2@1.2.7 USES_LIQUIDTWI2 = LiquidTWI2@1.2.7