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

Merge pull request #8989 from tcm0116/2.0.x_ubl

Browse source 
[2.0.x] Fix UBL compilation warnings
This commit is contained in:
Scott Lahteine 2018-01-02 21:38:45 -06:00 committed by GitHub
parent eca5cc8669 8afc4f8d9d
commit fc67c64b8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 59 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/feature/pause.h
View file

@ -30,7 +30,7 @@
#include "../libs/nozzle.h"
extern bool did_pause_print;
extern uint8_t did_pause_print;
bool pause_print(const float &retract, const point_t &park_point, const float &unload_length=0,
const int8_t max_beep_count=0, const bool show_lcd=false

20
Marlin/src/gcode/queue.cpp
View file

@ -147,9 +147,27 @@ static bool drain_injected_commands_P() {
*/
void enqueue_and_echo_commands_P(const char * const pgcode) {
injected_commands_P = pgcode;
drain_injected_commands_P(); // first command executed asap (when possible)
(void)drain_injected_commands_P(); // first command executed asap (when possible)
}
#if HAS_QUEUE_NOW
/**
* Enqueue and return only when commands are actually enqueued
*/
void enqueue_and_echo_command_now(const char* cmd, bool say_ok/*=false*/) {
while (!enqueue_and_echo_command(cmd, say_ok)) idle();
}
#if HAS_LCD_QUEUE_NOW
/**
* Enqueue from program memory and return only when commands are actually enqueued
*/
void enqueue_and_echo_commands_P_now(const char * const pgcode) {
enqueue_and_echo_commands_P(pgcode);
while (drain_injected_commands_P()) idle();
}
#endif
#endif
/**
* Send an "ok" message to the host, indicating
* that a command was successfully processed.

16
Marlin/src/gcode/queue.h
View file

@ -90,6 +90,22 @@ void enqueue_and_echo_commands_P(const char * const pgcode);
*/
bool enqueue_and_echo_command(const char* cmd, bool say_ok=false);
#define HAS_LCD_QUEUE_NOW (ENABLED(ULTIPANEL) && (ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(PID_AUTOTUNE_MENU) || ENABLED(ADVANCED_PAUSE_FEATURE)))
#define HAS_QUEUE_NOW (ENABLED(SDSUPPORT) || HAS_LCD_QUEUE_NOW)
#if HAS_QUEUE_NOW
/**
* Enqueue and return only when commands are actually enqueued
*/
void enqueue_and_echo_command_now(const char* cmd, bool say_ok=false);
#if HAS_LCD_QUEUE_NOW
/**
* Enqueue from program memory and return only when commands are actually enqueued
*/
void enqueue_and_echo_commands_P_now(const char * const cmd);
#endif
#endif
/**
* Add to the circular command queue the next command from:
* - The command-injection queue (injected_commands_P)

32
Marlin/src/lcd/ultralcd.cpp
View file

@ -1748,9 +1748,15 @@ void kill_screen(const char* lcd_msg) {
* If the queue is full, the command will fail, so we have to loop
* with idle() to make sure the command has been enqueued.
*/
void lcd_enqueue_command_sram(char * const cmd) {
void lcd_enqueue_command(char * const cmd) {
no_reentry = true;
while (enqueue_and_echo_command(cmd)) idle();
enqueue_and_echo_command_now(cmd);
no_reentry = false;
}
void lcd_enqueue_commands_P(const char * const cmd) {
no_reentry = true;
enqueue_and_echo_commands_P_now(cmd);
no_reentry = false;
}
@ -2079,10 +2085,10 @@ void kill_screen(const char* lcd_msg) {
enqueue_and_echo_commands_P(PSTR("G28"));
#if HAS_TEMP_BED
sprintf_P(UBL_LCD_GCODE, PSTR("M190 S%i"), custom_bed_temp);
lcd_enqueue_command_sram(UBL_LCD_GCODE);
lcd_enqueue_command(UBL_LCD_GCODE);
#endif
sprintf_P(UBL_LCD_GCODE, PSTR("M109 S%i"), custom_hotend_temp);
lcd_enqueue_command_sram(UBL_LCD_GCODE);
lcd_enqueue_command(UBL_LCD_GCODE);
enqueue_and_echo_commands_P(PSTR("G29 P1"));
}
@ -2113,7 +2119,7 @@ void kill_screen(const char* lcd_msg) {
const int ind = ubl_height_amount > 0 ? 9 : 10;
strcpy_P(UBL_LCD_GCODE, PSTR("G29 P6 C -"));
sprintf_P(&UBL_LCD_GCODE[ind], PSTR(".%i"), abs(ubl_height_amount));
lcd_enqueue_command_sram(UBL_LCD_GCODE);
lcd_enqueue_command(UBL_LCD_GCODE);
}
/**
@ -2164,8 +2170,8 @@ void kill_screen(const char* lcd_msg) {
#endif
;
sprintf_P(UBL_LCD_GCODE, PSTR("G26 C B%i H%i P"), temp, custom_hotend_temp);
lcd_enqueue_command_sram("G28");
lcd_enqueue_command_sram(UBL_LCD_GCODE);
lcd_enqueue_commands_P(PSTR("G28"));
lcd_enqueue_command(UBL_LCD_GCODE);
}
/**
@ -2198,7 +2204,7 @@ void kill_screen(const char* lcd_msg) {
void _lcd_ubl_grid_level_cmd() {
char UBL_LCD_GCODE[10];
sprintf_P(UBL_LCD_GCODE, PSTR("G29 J%i"), side_points);
lcd_enqueue_command_sram(UBL_LCD_GCODE);
lcd_enqueue_command(UBL_LCD_GCODE);
}
/**
@ -2239,7 +2245,7 @@ void kill_screen(const char* lcd_msg) {
void _lcd_ubl_fillin_amount_cmd() {
char UBL_LCD_GCODE[16];
sprintf_P(UBL_LCD_GCODE, PSTR("G29 P3 R C.%i"), ubl_fillin_amount);
lcd_enqueue_command_sram(UBL_LCD_GCODE);
lcd_enqueue_command(UBL_LCD_GCODE);
}
/**
@ -2331,7 +2337,7 @@ void kill_screen(const char* lcd_msg) {
void _lcd_ubl_load_mesh_cmd() {
char UBL_LCD_GCODE[10];
sprintf_P(UBL_LCD_GCODE, PSTR("G29 L%i"), ubl_storage_slot);
lcd_enqueue_command_sram(UBL_LCD_GCODE);
lcd_enqueue_command(UBL_LCD_GCODE);
enqueue_and_echo_commands_P(PSTR("M117 " MSG_MESH_LOADED "."));
}
@ -2341,7 +2347,7 @@ void kill_screen(const char* lcd_msg) {
void _lcd_ubl_save_mesh_cmd() {
char UBL_LCD_GCODE[10];
sprintf_P(UBL_LCD_GCODE, PSTR("G29 S%i"), ubl_storage_slot);
lcd_enqueue_command_sram(UBL_LCD_GCODE);
lcd_enqueue_command(UBL_LCD_GCODE);
enqueue_and_echo_commands_P(PSTR("M117 " MSG_MESH_SAVED "."));
}
@ -2392,7 +2398,7 @@ void kill_screen(const char* lcd_msg) {
dtostrf(pgm_read_float(&ubl._mesh_index_to_xpos[x_plot]), 0, 2, str);
dtostrf(pgm_read_float(&ubl._mesh_index_to_ypos[y_plot]), 0, 2, str2);
snprintf_P(UBL_LCD_GCODE, sizeof(UBL_LCD_GCODE), PSTR("G29 P4 X%s Y%s R%i"), str, str2, n_edit_pts);
lcd_enqueue_command_sram(UBL_LCD_GCODE);
lcd_enqueue_command(UBL_LCD_GCODE);
}
/**
@ -3287,7 +3293,7 @@ void kill_screen(const char* lcd_msg) {
autotune_temp[e]
#endif
);
lcd_enqueue_command_sram(cmd);
lcd_enqueue_command(cmd);
}
#endif // PID_AUTOTUNE_MENU

2
Marlin/src/module/configuration_store.cpp
View file

@ -759,7 +759,9 @@ void MarlinSettings::postprocess() {
}
else {
float dummy = 0;
#if DISABLED(AUTO_BED_LEVELING_UBL) || DISABLED(FWRETRACT)
bool dummyb;
#endif
working_crc = 0; // Init to 0. Accumulated by EEPROM_READ

2
Marlin/src/sd/cardreader.cpp
View file

@ -287,7 +287,7 @@ void CardReader::openAndPrintFile(const char *name) {
char cmd[4 + strlen(name) + 1]; // Room for "M23 ", filename, and null
sprintf_P(cmd, PSTR("M23 %s"), name);
for (char *c = &cmd[4]; *c; c++) *c = tolower(*c);
enqueue_and_echo_command(cmd);
enqueue_and_echo_command_now(cmd);
enqueue_and_echo_commands_P(PSTR("M24"));
}