瀏覽代碼

Fix up tests, warnings

Scott Lahteine 4 年之前
父節點
當前提交
5f5f76956f
共有 4 個檔案被更改,包括 11 行新增10 行删除
  1. 2
    2
      Marlin/src/gcode/calibrate/M48.cpp
  2. 1
    1
      Marlin/src/lcd/extui/ui_api.cpp
  3. 7
    6
      buildroot/tests/teensy41-tests
  4. 1
    1
      platformio.ini

+ 2
- 2
Marlin/src/gcode/calibrate/M48.cpp 查看文件

@@ -192,8 +192,8 @@ void GcodeSuite::M48() {
192 192
           // Choose the next position as an offset to chosen test position
193 193
           const xy_pos_t noz_pos = test_position - probe.offset_xy;
194 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 199
           #if ENABLED(DELTA)

+ 1
- 1
Marlin/src/lcd/extui/ui_api.cpp 查看文件

@@ -705,7 +705,7 @@ namespace ExtUI {
705 705
 
706 706
       #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
707 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 709
           probe.offset.z += mm;
710 710
       #endif
711 711
 

+ 7
- 6
buildroot/tests/teensy41-tests 查看文件

@@ -19,14 +19,15 @@ opt_set EXTRUDERS 2
19 19
 opt_set TEMP_SENSOR_0 1
20 20
 opt_set TEMP_SENSOR_1 5
21 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 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 27
            ADVANCED_PAUSE_FEATURE ARC_SUPPORT BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES PARK_HEAD_ON_PAUSE \
28 28
            PHOTO_GCODE PHOTO_POSITION PHOTO_SWITCH_POSITION PHOTO_SWITCH_MS PHOTO_DELAY_MS PHOTO_RETRACT_MM \
29 29
            HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT
30
+opt_add EXTUI_EXAMPLE
30 31
 opt_set I2C_SLAVE_ADDRESS 63
31 32
 opt_set GRID_MAX_POINTS_X 16
32 33
 exec_test $1 $2 "Teensy4.1 with many features"
@@ -62,7 +63,7 @@ restore_configs
62 63
 opt_set MOTHERBOARD BOARD_TEENSY41
63 64
 opt_set EXTRUDERS 2
64 65
 opt_set TEMP_SENSOR_1 1
65
-opt_enable MAGNETIC_PARKING_EXTRUDER ULTIMAKERCONTROLLER
66
+opt_enable MAGNETIC_PARKING_EXTRUDER
66 67
 exec_test $1 $2 "MAGNETIC_PARKING_EXTRUDER with LCD"
67 68
 
68 69
 #
@@ -70,7 +71,7 @@ exec_test $1 $2 "MAGNETIC_PARKING_EXTRUDER with LCD"
70 71
 #
71 72
 restore_configs
72 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 75
 opt_set MIXING_STEPPERS 2
75 76
 exec_test $1 $2 "Mixing Extruder"
76 77
 

+ 1
- 1
platformio.ini 查看文件

@@ -207,7 +207,7 @@ HAS_L64XX               = Arduino-L6470@0.8.0
207 207
 NEOPIXEL_LED            = Adafruit NeoPixel@1.5.0
208 208
                           src_filter=+<src/feature/leds/neopixel.cpp>
209 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 211
                           src_filter=+<src/lcd/dogm>
212 212
 USES_LIQUIDCRYSTAL      = LiquidCrystal@1.5.0
213 213
 USES_LIQUIDTWI2         = LiquidTWI2@1.2.7

Loading…
取消
儲存