CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various fixes for compiler warnings

Browse Source 
add BLTouch-related messages in english and (rusty) french;
add missing endstops.h in ultralcd.cpp;
fix misc. compiler warnings;
fix lsf_reset - ZERO macro can't handle a pointer as it would only memset the size of the pointer, not the size of the entire struct
This commit is contained in:
Brian 2017-04-30 21:49:00 -04:00 committed by Scott Lahteine
parent fc9919b749
commit 4e1448e75a
15 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Marlin/Configuration_adv.h Executable file → Normal file
View File

0
Marlin/G26_Mesh_Validation_Tool.cpp Executable file → Normal file
View File

2
Marlin/Marlin_main.cpp Executable file → Normal file
View File

@ -2079,7 +2079,7 @@ static void clean_up_after_endstop_or_probe_move() {
*/ */
#if ENABLED(BLTOUCH_HEATERS_OFF) #if ENABLED(BLTOUCH_HEATERS_OFF)
bool set_heaters_for_bltouch(const bool deploy) { void set_heaters_for_bltouch(const bool deploy) {
static bool heaters_were_disabled = false; static bool heaters_were_disabled = false;
static millis_t next_emi_protection; static millis_t next_emi_protection;
static float temps_at_entry[HOTENDS]; static float temps_at_entry[HOTENDS];

0
Marlin/configuration_store.cpp Executable file → Normal file
View File

0
Marlin/enum.h Executable file → Normal file
View File

6
Marlin/language_en.h
View File

@ -417,6 +417,12 @@
#ifndef MSG_BLTOUCH_RESET #ifndef MSG_BLTOUCH_RESET
#define MSG_BLTOUCH_RESET _UxGT("Reset BLTouch") #define MSG_BLTOUCH_RESET _UxGT("Reset BLTouch")
#endif #endif
#ifndef MSG_BLTOUCH_DEPLOY
#define MSG_BLTOUCH_DEPLOY _UxGT("Deploy BLTouch")
#endif
#ifndef MSG_BLTOUCH_STOW
#define MSG_BLTOUCH_STOW _UxGT("Stow BLTouch")
#endif
#ifndef MSG_HOME #ifndef MSG_HOME
#define MSG_HOME _UxGT("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST #define MSG_HOME _UxGT("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#endif #endif

2
Marlin/language_fr.h
View File

@ -161,6 +161,8 @@
#define MSG_ZPROBE_OUT _UxGT("Z sonde extè. lit") #define MSG_ZPROBE_OUT _UxGT("Z sonde extè. lit")
#define MSG_BLTOUCH_SELFTEST _UxGT("Autotest BLTouch") #define MSG_BLTOUCH_SELFTEST _UxGT("Autotest BLTouch")
#define MSG_BLTOUCH_RESET _UxGT("RaZ BLTouch") #define MSG_BLTOUCH_RESET _UxGT("RaZ BLTouch")
#define MSG_BLTOUCH_DEPLOY _UxGT("Déployer BLTouch")
#define MSG_BLTOUCH_STOW _UxGT("Ranger BLTouch")
#define MSG_HOME _UxGT("Origine") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST #define MSG_HOME _UxGT("Origine") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("Premier") #define MSG_FIRST _UxGT("Premier")
#define MSG_ZPROBE_ZOFFSET _UxGT("Décalage Z") #define MSG_ZPROBE_ZOFFSET _UxGT("Décalage Z")

4
Marlin/least_squares_fit.cpp
View File

@ -41,7 +41,9 @@
#include "least_squares_fit.h" #include "least_squares_fit.h"
void incremental_LSF_reset(struct linear_fit_data *lsf) { ZERO(lsf); } void incremental_LSF_reset(struct linear_fit_data *lsf) {
memset(lsf, 0, sizeof(linear_fit_data));
}
void incremental_LSF(struct linear_fit_data *lsf, float x, float y, float z) { void incremental_LSF(struct linear_fit_data *lsf, float x, float y, float z) {
lsf->xbar += x; lsf->xbar += x;

0
Marlin/pins_RAMBO.h Executable file → Normal file
View File

0
Marlin/platformio.ini Executable file → Normal file
View File

0
Marlin/ubl.cpp Executable file → Normal file
View File

0
Marlin/ubl.h Executable file → Normal file
View File

0
Marlin/ubl_G29.cpp Executable file → Normal file
View File

0
Marlin/ubl_motion.cpp Executable file → Normal file
View File

4
Marlin/ultralcd.cpp Executable file → Normal file
View File

@ -39,6 +39,10 @@
#include "duration_t.h" #include "duration_t.h"
#endif #endif
#if ENABLED(BLTOUCH)
#include "endstops.h"
#endif
int lcd_preheat_hotend_temp[2], lcd_preheat_bed_temp[2], lcd_preheat_fan_speed[2]; int lcd_preheat_hotend_temp[2], lcd_preheat_bed_temp[2], lcd_preheat_fan_speed[2];
#if ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT) #if ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT)