Browse Source

Fix up tests, warnings

Scott Lahteine 4 years ago
parent
commit
5f5f76956f

+ 2
- 2
Marlin/src/gcode/calibrate/M48.cpp View File

192
           // Choose the next position as an offset to chosen test position
192
           // Choose the next position as an offset to chosen test position
193
           const xy_pos_t noz_pos = test_position - probe.offset_xy;
193
           const xy_pos_t noz_pos = test_position - probe.offset_xy;
194
           xy_pos_t next_pos = {
194
           xy_pos_t next_pos = {
195
-            noz_pos.x + cos(RADIANS(angle)) * radius,
196
-            noz_pos.y + sin(RADIANS(angle)) * radius
195
+            noz_pos.x + float(cos(RADIANS(angle))) * radius,
196
+            noz_pos.y + float(sin(RADIANS(angle))) * radius
197
           };
197
           };
198
 
198
 
199
           #if ENABLED(DELTA)
199
           #if ENABLED(DELTA)

+ 1
- 1
Marlin/src/lcd/extui/ui_api.cpp View File

705
 
705
 
706
       #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
706
       #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
707
         // Make it so babystepping in Z adjusts the Z probe offset.
707
         // Make it so babystepping in Z adjusts the Z probe offset.
708
-        if (axis == Z && TERN1(HAS_MULTI_EXTRUDER, linked_nozzles || active_extruder == 0))
708
+        if (axis == Z && TERN1(HAS_MULTI_EXTRUDER, (linked_nozzles || active_extruder == 0)))
709
           probe.offset.z += mm;
709
           probe.offset.z += mm;
710
       #endif
710
       #endif
711
 
711
 

+ 7
- 6
buildroot/tests/teensy41-tests View File

19
 opt_set TEMP_SENSOR_0 1
19
 opt_set TEMP_SENSOR_0 1
20
 opt_set TEMP_SENSOR_1 5
20
 opt_set TEMP_SENSOR_1 5
21
 opt_set TEMP_SENSOR_BED 1
21
 opt_set TEMP_SENSOR_BED 1
22
-opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LCD_INFO_MENU SDSUPPORT SDCARD_SORT_ALPHA \
23
-           FILAMENT_WIDTH_SENSOR FILAMENT_LCD_DISPLAY CALIBRATION_GCODE BAUD_RATE_GCODE \
22
+opt_enable EXTENSIBLE_UI LCD_INFO_MENU SDSUPPORT SDCARD_SORT_ALPHA \
23
+           FILAMENT_LCD_DISPLAY CALIBRATION_GCODE BAUD_RATE_GCODE \
24
            FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
24
            FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
25
-           BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET BABYSTEP_ZPROBE_GFX_OVERLAY \
26
-           PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT M100_FREE_MEMORY_WATCHER \
25
+           BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET \
26
+           PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT \
27
            ADVANCED_PAUSE_FEATURE ARC_SUPPORT BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES PARK_HEAD_ON_PAUSE \
27
            ADVANCED_PAUSE_FEATURE ARC_SUPPORT BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES PARK_HEAD_ON_PAUSE \
28
            PHOTO_GCODE PHOTO_POSITION PHOTO_SWITCH_POSITION PHOTO_SWITCH_MS PHOTO_DELAY_MS PHOTO_RETRACT_MM \
28
            PHOTO_GCODE PHOTO_POSITION PHOTO_SWITCH_POSITION PHOTO_SWITCH_MS PHOTO_DELAY_MS PHOTO_RETRACT_MM \
29
            HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT
29
            HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT
30
+opt_add EXTUI_EXAMPLE
30
 opt_set I2C_SLAVE_ADDRESS 63
31
 opt_set I2C_SLAVE_ADDRESS 63
31
 opt_set GRID_MAX_POINTS_X 16
32
 opt_set GRID_MAX_POINTS_X 16
32
 exec_test $1 $2 "Teensy4.1 with many features"
33
 exec_test $1 $2 "Teensy4.1 with many features"
62
 opt_set MOTHERBOARD BOARD_TEENSY41
63
 opt_set MOTHERBOARD BOARD_TEENSY41
63
 opt_set EXTRUDERS 2
64
 opt_set EXTRUDERS 2
64
 opt_set TEMP_SENSOR_1 1
65
 opt_set TEMP_SENSOR_1 1
65
-opt_enable MAGNETIC_PARKING_EXTRUDER ULTIMAKERCONTROLLER
66
+opt_enable MAGNETIC_PARKING_EXTRUDER
66
 exec_test $1 $2 "MAGNETIC_PARKING_EXTRUDER with LCD"
67
 exec_test $1 $2 "MAGNETIC_PARKING_EXTRUDER with LCD"
67
 
68
 
68
 #
69
 #
70
 #
71
 #
71
 restore_configs
72
 restore_configs
72
 opt_set MOTHERBOARD BOARD_TEENSY41
73
 opt_set MOTHERBOARD BOARD_TEENSY41
73
-opt_enable MIXING_EXTRUDER DIRECT_MIXING_IN_G1 GRADIENT_MIX GRADIENT_VTOOL REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
74
+opt_enable MIXING_EXTRUDER DIRECT_MIXING_IN_G1 GRADIENT_MIX GRADIENT_VTOOL
74
 opt_set MIXING_STEPPERS 2
75
 opt_set MIXING_STEPPERS 2
75
 exec_test $1 $2 "Mixing Extruder"
76
 exec_test $1 $2 "Mixing Extruder"
76
 
77
 

+ 1
- 1
platformio.ini View File

207
 NEOPIXEL_LED            = Adafruit NeoPixel@1.5.0
207
 NEOPIXEL_LED            = Adafruit NeoPixel@1.5.0
208
                           src_filter=+<src/feature/leds/neopixel.cpp>
208
                           src_filter=+<src/feature/leds/neopixel.cpp>
209
 MAX6675_IS_MAX31865     = Adafruit MAX31865 library@~1.1.0
209
 MAX6675_IS_MAX31865     = Adafruit MAX31865 library@~1.1.0
210
-HAS_GRAPHICAL_LCD       = U8glib-HAL@0.4.1
210
+HAS_GRAPHICAL_LCD       = U8glib-HAL@~0.4.1
211
                           src_filter=+<src/lcd/dogm>
211
                           src_filter=+<src/lcd/dogm>
212
 USES_LIQUIDCRYSTAL      = LiquidCrystal@1.5.0
212
 USES_LIQUIDCRYSTAL      = LiquidCrystal@1.5.0
213
 USES_LIQUIDTWI2         = LiquidTWI2@1.2.7
213
 USES_LIQUIDTWI2         = LiquidTWI2@1.2.7

Loading…
Cancel
Save