MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fix a compile warning, etc. (#12955)

Browse Source
This commit is contained in:
Ludy 2019-01-20 01:47:29 +01:00 committed by Scott Lahteine
parent 424aa05cc2
commit acf266fe78
6 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/src/gcode/motion/G2_G3.cpp
View File

@ -184,6 +184,7 @@ void plan_arc(
raw[q_axis] = center_Q + r_Q; raw[q_axis] = center_Q + r_Q;
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)
raw[l_axis] = start_L; raw[l_axis] = start_L;
UNUSED(linear_per_segment);
#else #else
raw[l_axis] += linear_per_segment; raw[l_axis] += linear_per_segment;
#endif #endif

6
Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp
View File

@ -179,13 +179,9 @@ void GcodeSuite::M28() {
#if ENABLED(FAST_FILE_TRANSFER) #if ENABLED(FAST_FILE_TRANSFER)
const int16_t port =
#if NUM_SERIAL > 1 #if NUM_SERIAL > 1
command_queue_port[cmd_queue_index_r] const int16_t port = command_queue_port[cmd_queue_index_r];
#else
0
#endif #endif
;
bool binary_mode = false; bool binary_mode = false;
char *p = parser.string_arg; char *p = parser.string_arg;

2
Marlin/src/gcode/temperature/M106_M107.cpp
View File

@ -48,7 +48,7 @@ void GcodeSuite::M106() {
if (p < MIN(EXTRUDERS, FAN_COUNT)) { if (p < MIN(EXTRUDERS, FAN_COUNT)) {
#if ENABLED(EXTRA_FAN_SPEED) #if ENABLED(EXTRA_FAN_SPEED)
const int16_t t = parser.intval('T'); const uint16_t t = parser.intval('T');
if (t > 0) return thermalManager.set_temp_fan_speed(p, t); if (t > 0) return thermalManager.set_temp_fan_speed(p, t);
#endif #endif

4
Marlin/src/lcd/menu/menu_bed_leveling.cpp
View File

@ -210,8 +210,8 @@
static uint8_t xind, yind; // =0 static uint8_t xind, yind; // =0
START_MENU(); START_MENU();
MENU_BACK(MSG_BED_LEVELING); MENU_BACK(MSG_BED_LEVELING);
MENU_ITEM_EDIT(int8, MSG_MESH_X, &xind, 0, GRID_MAX_POINTS_X - 1); MENU_ITEM_EDIT(uint8, MSG_MESH_X, &xind, 0, GRID_MAX_POINTS_X - 1);
MENU_ITEM_EDIT(int8, MSG_MESH_Y, &yind, 0, GRID_MAX_POINTS_Y - 1); MENU_ITEM_EDIT(uint8, MSG_MESH_Y, &yind, 0, GRID_MAX_POINTS_Y - 1);
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_MESH_EDIT_Z, &Z_VALUES(xind, yind), -(LCD_PROBE_Z_RANGE) * 0.5, (LCD_PROBE_Z_RANGE) * 0.5, refresh_planner); MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_MESH_EDIT_Z, &Z_VALUES(xind, yind), -(LCD_PROBE_Z_RANGE) * 0.5, (LCD_PROBE_Z_RANGE) * 0.5, refresh_planner);
END_MENU(); END_MENU();
} }

2
Marlin/src/module/temperature.cpp
View File

@ -111,7 +111,7 @@ int16_t Temperature::current_temperature_raw[HOTENDS], // = { 0 }
#if ENABLED(EXTRA_FAN_SPEED) #if ENABLED(EXTRA_FAN_SPEED)
uint8_t Temperature::old_fan_speed[FAN_COUNT], Temperature::new_fan_speed[FAN_COUNT]; uint8_t Temperature::old_fan_speed[FAN_COUNT], Temperature::new_fan_speed[FAN_COUNT];
void Temperature::set_temp_fan_speed(const uint8_t fan, const int16_t tmp_temp) { void Temperature::set_temp_fan_speed(const uint8_t fan, const uint16_t tmp_temp) {
switch (tmp_temp) { switch (tmp_temp) {
case 1: case 1:
set_fan_speed(fan, old_fan_speed[fan]); set_fan_speed(fan, old_fan_speed[fan]);

2
Marlin/src/module/temperature.h
View File

@ -346,7 +346,7 @@ class Temperature {
#if ENABLED(EXTRA_FAN_SPEED) #if ENABLED(EXTRA_FAN_SPEED)
static uint8_t old_fan_speed[FAN_COUNT], new_fan_speed[FAN_COUNT]; static uint8_t old_fan_speed[FAN_COUNT], new_fan_speed[FAN_COUNT];
static void set_temp_fan_speed(const uint8_t fan, const int16_t tmp_temp); static void set_temp_fan_speed(const uint8_t fan, const uint16_t tmp_temp);
#endif #endif
#if HAS_LCD_MENU #if HAS_LCD_MENU