josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compiler warnings

This commit is contained in:
Matthias Urlichs 2020-02-02 17:22:20 +01:00
parent d30960b8e8
commit 54e2b6a829
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Firmware/Marlin_main.cpp
View File

@ -4947,7 +4947,6 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
} }
#endif // SUPPORT_VERBOSITY #endif // SUPPORT_VERBOSITY
int l_feedmultiply = setup_for_endstop_move(false); //save feedrate and feedmultiply, sets feedmultiply to 100 int l_feedmultiply = setup_for_endstop_move(false); //save feedrate and feedmultiply, sets feedmultiply to 100
const char *kill_message = NULL;
while (mesh_point != nMeasPoints * nMeasPoints) { while (mesh_point != nMeasPoints * nMeasPoints) {
// Get coords of a measuring point. // Get coords of a measuring point.
uint8_t ix = mesh_point % nMeasPoints; // from 0 to MESH_NUM_X_POINTS - 1 uint8_t ix = mesh_point % nMeasPoints; // from 0 to MESH_NUM_X_POINTS - 1

2
Firmware/heatbed_pwm.cpp
View File

@ -59,7 +59,7 @@ enum class States : uint8_t {
RISE, ///< 16 fast PWM cycles with increasing duty up to steady ON RISE, ///< 16 fast PWM cycles with increasing duty up to steady ON
RISE_TO_ONE, ///< metastate allowing the timer change its state atomically without artefacts on the output pin RISE_TO_ONE, ///< metastate allowing the timer change its state atomically without artefacts on the output pin
ONE, ///< steady 1 (ON), no change for the whole period ONE, ///< steady 1 (ON), no change for the whole period
ONE_TO_FALL, ///< metastate allowing the timer change its state atomically without artefacts on the output pin // ONE_TO_FALL, ///< metastate allowing the timer change its state atomically without artefacts on the output pin
FALL, ///< 16 fast PWM cycles with decreasing duty down to steady OFF FALL, ///< 16 fast PWM cycles with decreasing duty down to steady OFF
FALL_TO_ZERO ///< metastate allowing the timer change its state atomically without artefacts on the output pin FALL_TO_ZERO ///< metastate allowing the timer change its state atomically without artefacts on the output pin
}; };

17
Firmware/ultralcd.cpp
View File

@ -326,7 +326,7 @@ bool bSettings; // flag (i.e. 'fake parameter'
const char STR_SEPARATOR[] PROGMEM = "------------"; const char STR_SEPARATOR[] PROGMEM = "------------";
static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char* filename, char* longFilename) static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, char* filename, char* longFilename)
{ {
char c; char c;
int enc_dif = lcd_encoder_diff / ENCODER_PULSES_PER_STEP; int enc_dif = lcd_encoder_diff / ENCODER_PULSES_PER_STEP;
@ -455,7 +455,7 @@ static void lcd_implementation_drawmenu_sddirectory(uint8_t row, const char* fil
#define MENU_ITEM_SDFILE(str, str_fn, str_fnl) do { if (menu_item_sdfile(str, str_fn, str_fnl)) return; } while (0) #define MENU_ITEM_SDFILE(str, str_fn, str_fnl) do { if (menu_item_sdfile(str, str_fn, str_fnl)) return; } while (0)
//#define MENU_ITEM_SDFILE(str, str_fn, str_fnl) MENU_ITEM(sdfile, str, str_fn, str_fnl) //#define MENU_ITEM_SDFILE(str, str_fn, str_fnl) MENU_ITEM(sdfile, str, str_fn, str_fnl)
//extern uint8_t menu_item_sdfile(const char* str, const char* str_fn, char* str_fnl); //extern uint8_t menu_item_sdfile(const char* str, char* str_fn, char* str_fnl);
uint8_t menu_item_sddir(const char* str_fn, char* str_fnl) uint8_t menu_item_sddir(const char* str_fn, char* str_fnl)
@ -508,11 +508,8 @@ uint8_t menu_item_sddir(const char* str_fn, char* str_fnl)
#endif //NEW_SD_MENU #endif //NEW_SD_MENU
} }
static uint8_t menu_item_sdfile(const char* static uint8_t menu_item_sdfile(const char* str __attribute__((unused))
#ifdef NEW_SD_MENU ,char* str_fn, char* str_fnl)
str
#endif //NEW_SD_MENU
,const char* str_fn, char* str_fnl)
{ {
#ifdef NEW_SD_MENU #ifdef NEW_SD_MENU
// printf_P(PSTR("menu sdfile\n")); // printf_P(PSTR("menu sdfile\n"));
@ -663,7 +660,7 @@ void lcdui_print_extruder(void)
// Print farm number (5 chars total) // Print farm number (5 chars total)
void lcdui_print_farm(void) void lcdui_print_farm(void)
{ {
int chars = lcd_printf_P(_N(" F0 ")); // int chars = lcd_printf_P(_N(" F0 "));
// lcd_space(5 - chars); // lcd_space(5 - chars);
/* /*
// Farm number display // Farm number display
@ -5578,6 +5575,7 @@ do\
}\ }\
while (0) while (0)
#if 0 // temorarily unused
static void lcd_check_gcode_set(void) static void lcd_check_gcode_set(void)
{ {
switch(oCheckGcode) switch(oCheckGcode)
@ -5596,6 +5594,7 @@ switch(oCheckGcode)
} }
eeprom_update_byte((uint8_t*)EEPROM_CHECK_GCODE,(uint8_t)oCheckGcode); eeprom_update_byte((uint8_t*)EEPROM_CHECK_GCODE,(uint8_t)oCheckGcode);
} }
#endif
#define SETTINGS_GCODE \ #define SETTINGS_GCODE \
do\ do\
@ -7461,7 +7460,6 @@ void lcd_belttest_print(const char* msg, uint16_t X, uint16_t Y)
} }
void lcd_belttest() void lcd_belttest()
{ {
int _progress = 0;
bool _result = true; bool _result = true;
uint16_t X = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X)); uint16_t X = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X));
uint16_t Y = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y)); uint16_t Y = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y));
@ -7498,7 +7496,6 @@ void lcd_belttest()
#if IR_SENSOR_ANALOG #if IR_SENSOR_ANALOG
static bool lcd_selftest_IRsensor() static bool lcd_selftest_IRsensor()
{ {
bool bAction;
bool bPCBrev03b; bool bPCBrev03b;
uint16_t volt_IR_int; uint16_t volt_IR_int;
float volt_IR; float volt_IR;