Browse Source

Various fixes for compiler warnings

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
Brian 7 years ago
parent
commit
4e1448e75a

+ 0
- 0
Marlin/Configuration_adv.h View File


+ 0
- 0
Marlin/G26_Mesh_Validation_Tool.cpp View File


+ 1
- 1
Marlin/Marlin_main.cpp View File

2079
      */
2079
      */
2080
     #if ENABLED(BLTOUCH_HEATERS_OFF)
2080
     #if ENABLED(BLTOUCH_HEATERS_OFF)
2081
 
2081
 
2082
-      bool set_heaters_for_bltouch(const bool deploy) {
2082
+      void set_heaters_for_bltouch(const bool deploy) {
2083
         static bool heaters_were_disabled = false;
2083
         static bool heaters_were_disabled = false;
2084
         static millis_t next_emi_protection;
2084
         static millis_t next_emi_protection;
2085
         static float temps_at_entry[HOTENDS];
2085
         static float temps_at_entry[HOTENDS];

+ 0
- 0
Marlin/configuration_store.cpp View File


+ 0
- 0
Marlin/enum.h View File


+ 6
- 0
Marlin/language_en.h View File

417
 #ifndef MSG_BLTOUCH_RESET
417
 #ifndef MSG_BLTOUCH_RESET
418
   #define MSG_BLTOUCH_RESET                   _UxGT("Reset BLTouch")
418
   #define MSG_BLTOUCH_RESET                   _UxGT("Reset BLTouch")
419
 #endif
419
 #endif
420
+#ifndef MSG_BLTOUCH_DEPLOY
421
+  #define MSG_BLTOUCH_DEPLOY                  _UxGT("Deploy BLTouch")
422
+#endif
423
+#ifndef MSG_BLTOUCH_STOW
424
+  #define MSG_BLTOUCH_STOW                    _UxGT("Stow BLTouch")
425
+#endif
420
 #ifndef MSG_HOME
426
 #ifndef MSG_HOME
421
   #define MSG_HOME                            _UxGT("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
427
   #define MSG_HOME                            _UxGT("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
422
 #endif
428
 #endif

+ 2
- 0
Marlin/language_fr.h View File

161
 #define MSG_ZPROBE_OUT                      _UxGT("Z sonde extè. lit")
161
 #define MSG_ZPROBE_OUT                      _UxGT("Z sonde extè. lit")
162
 #define MSG_BLTOUCH_SELFTEST                _UxGT("Autotest BLTouch")
162
 #define MSG_BLTOUCH_SELFTEST                _UxGT("Autotest BLTouch")
163
 #define MSG_BLTOUCH_RESET                   _UxGT("RaZ BLTouch")
163
 #define MSG_BLTOUCH_RESET                   _UxGT("RaZ BLTouch")
164
+#define MSG_BLTOUCH_DEPLOY                  _UxGT("Déployer BLTouch")
165
+#define MSG_BLTOUCH_STOW                    _UxGT("Ranger BLTouch")
164
 #define MSG_HOME                            _UxGT("Origine")  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
166
 #define MSG_HOME                            _UxGT("Origine")  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
165
 #define MSG_FIRST                           _UxGT("Premier")
167
 #define MSG_FIRST                           _UxGT("Premier")
166
 #define MSG_ZPROBE_ZOFFSET                  _UxGT("Décalage Z")
168
 #define MSG_ZPROBE_ZOFFSET                  _UxGT("Décalage Z")

+ 3
- 1
Marlin/least_squares_fit.cpp View File

41
 
41
 
42
 #include "least_squares_fit.h"
42
 #include "least_squares_fit.h"
43
 
43
 
44
-void incremental_LSF_reset(struct linear_fit_data *lsf) { ZERO(lsf); }
44
+void incremental_LSF_reset(struct linear_fit_data *lsf) {
45
+  memset(lsf, 0, sizeof(linear_fit_data));
46
+}
45
 
47
 
46
 void incremental_LSF(struct linear_fit_data *lsf, float x, float y, float z) {
48
 void incremental_LSF(struct linear_fit_data *lsf, float x, float y, float z) {
47
   lsf->xbar += x;
49
   lsf->xbar += x;

+ 0
- 0
Marlin/pins_RAMBO.h View File


+ 0
- 0
Marlin/platformio.ini View File


+ 0
- 0
Marlin/ubl.cpp View File


+ 0
- 0
Marlin/ubl.h View File


+ 0
- 0
Marlin/ubl_G29.cpp View File


+ 0
- 0
Marlin/ubl_motion.cpp View File


+ 4
- 0
Marlin/ultralcd.cpp View File

39
   #include "duration_t.h"
39
   #include "duration_t.h"
40
 #endif
40
 #endif
41
 
41
 
42
+#if ENABLED(BLTOUCH)
43
+  #include "endstops.h"
44
+#endif
45
+
42
 int lcd_preheat_hotend_temp[2], lcd_preheat_bed_temp[2], lcd_preheat_fan_speed[2];
46
 int lcd_preheat_hotend_temp[2], lcd_preheat_bed_temp[2], lcd_preheat_fan_speed[2];
43
 
47
 
44
 #if ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT)
48
 #if ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT)

Loading…
Cancel
Save