Merge pull request #4326 from thinkyhead/rc_no_static_items_fix
Suppress compiler warnings in ultralcd.cpp
This commit is contained in:
commit
aaa0d298b9
2 changed files with 17 additions and 16 deletions
|
@ -33,19 +33,19 @@
|
||||||
#if ENABLED(DAC_STEPPER_CURRENT)
|
#if ENABLED(DAC_STEPPER_CURRENT)
|
||||||
#include "Wire.h"
|
#include "Wire.h"
|
||||||
|
|
||||||
#define defaultVDD 5000
|
#define defaultVDD 5000
|
||||||
#define BASE_ADDR 0x60
|
#define BASE_ADDR 0x60
|
||||||
#define RESET 0B00000110
|
#define RESET 0B00000110
|
||||||
#define WAKE 0B00001001
|
#define WAKE 0B00001001
|
||||||
#define UPDATE 0B00001000
|
#define UPDATE 0B00001000
|
||||||
#define MULTIWRITE 0B01000000
|
#define MULTIWRITE 0B01000000
|
||||||
#define SINGLEWRITE 0B01011000
|
#define SINGLEWRITE 0B01011000
|
||||||
#define SEQWRITE 0B01010000
|
#define SEQWRITE 0B01010000
|
||||||
#define VREFWRITE 0B10000000
|
#define VREFWRITE 0B10000000
|
||||||
#define GAINWRITE 0B11000000
|
#define GAINWRITE 0B11000000
|
||||||
#define POWERDOWNWRITE 0B10100000
|
#define POWERDOWNWRITE 0B10100000
|
||||||
#define GENERALCALL 0B0000000
|
#define GENERALCALL 0B00000000
|
||||||
#define GAINWRITE 0B11000000
|
#define GAINWRITE 0B11000000
|
||||||
|
|
||||||
// This is taken from the original lib, makes it easy to edit if needed
|
// This is taken from the original lib, makes it easy to edit if needed
|
||||||
// DAC_OR_ADDRESS defined in pins_BOARD.h file
|
// DAC_OR_ADDRESS defined in pins_BOARD.h file
|
||||||
|
|
|
@ -321,7 +321,8 @@ uint8_t lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; // Set when the LCD needs to
|
||||||
if (encoderLine >= encoderTopLine + LCD_HEIGHT) { \
|
if (encoderLine >= encoderTopLine + LCD_HEIGHT) { \
|
||||||
encoderTopLine = encoderLine - (LCD_HEIGHT - 1); \
|
encoderTopLine = encoderLine - (LCD_HEIGHT - 1); \
|
||||||
lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT; \
|
lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT; \
|
||||||
}
|
} \
|
||||||
|
UNUSED(_skipStatic)
|
||||||
|
|
||||||
#if ENABLED(ENCODER_RATE_MULTIPLIER)
|
#if ENABLED(ENCODER_RATE_MULTIPLIER)
|
||||||
|
|
||||||
|
@ -1382,7 +1383,7 @@ void kill_screen(const char* lcd_msg) {
|
||||||
pos_label = PSTR(MSG_MOVE_E);
|
pos_label = PSTR(MSG_MOVE_E);
|
||||||
#else
|
#else
|
||||||
switch (eindex) {
|
switch (eindex) {
|
||||||
case 0: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E1); break;
|
default: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E1); break;
|
||||||
case 1: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E2); break;
|
case 1: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E2); break;
|
||||||
#if EXTRUDERS > 2
|
#if EXTRUDERS > 2
|
||||||
case 2: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E3); break;
|
case 2: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E3); break;
|
||||||
|
@ -1543,14 +1544,14 @@ void kill_screen(const char* lcd_msg) {
|
||||||
// Helpers for editing PID Ki & Kd values
|
// Helpers for editing PID Ki & Kd values
|
||||||
// grab the PID value out of the temp variable; scale it; then update the PID driver
|
// grab the PID value out of the temp variable; scale it; then update the PID driver
|
||||||
void copy_and_scalePID_i(int e) {
|
void copy_and_scalePID_i(int e) {
|
||||||
#if DISABLED(PID_PARAMS_PER_HOTEND)
|
#if DISABLED(PID_PARAMS_PER_HOTEND) || HOTENDS == 1
|
||||||
UNUSED(e);
|
UNUSED(e);
|
||||||
#endif
|
#endif
|
||||||
PID_PARAM(Ki, e) = scalePID_i(raw_Ki);
|
PID_PARAM(Ki, e) = scalePID_i(raw_Ki);
|
||||||
thermalManager.updatePID();
|
thermalManager.updatePID();
|
||||||
}
|
}
|
||||||
void copy_and_scalePID_d(int e) {
|
void copy_and_scalePID_d(int e) {
|
||||||
#if DISABLED(PID_PARAMS_PER_HOTEND)
|
#if DISABLED(PID_PARAMS_PER_HOTEND) || HOTENDS == 1
|
||||||
UNUSED(e);
|
UNUSED(e);
|
||||||
#endif
|
#endif
|
||||||
PID_PARAM(Kd, e) = scalePID_d(raw_Kd);
|
PID_PARAM(Kd, e) = scalePID_d(raw_Kd);
|
||||||
|
|
Reference in a new issue