|
@@ -38,7 +38,7 @@ char lcd_status_message[LCD_WIDTH+1] = WELCOME_MSG;
|
38
|
38
|
#include "ultralcd_implementation_hitachi_HD44780.h"
|
39
|
39
|
#endif
|
40
|
40
|
|
41
|
|
-/** forward declerations **/
|
|
41
|
+/** forward declarations **/
|
42
|
42
|
|
43
|
43
|
void copy_and_scalePID_i();
|
44
|
44
|
void copy_and_scalePID_d();
|
|
@@ -62,9 +62,9 @@ static void lcd_set_contrast();
|
62
|
62
|
static void lcd_control_retract_menu();
|
63
|
63
|
static void lcd_sdcard_menu();
|
64
|
64
|
|
65
|
|
-static void lcd_quick_feedback();//Cause an LCD refresh, and give the user visual or audiable feedback that something has happend
|
|
65
|
+static void lcd_quick_feedback();//Cause an LCD refresh, and give the user visual or audible feedback that something has happened
|
66
|
66
|
|
67
|
|
-/* Different types of actions that can be used in menuitems. */
|
|
67
|
+/* Different types of actions that can be used in menu items. */
|
68
|
68
|
static void menu_action_back(menuFunc_t data);
|
69
|
69
|
static void menu_action_submenu(menuFunc_t data);
|
70
|
70
|
static void menu_action_gcode(const char* pgcode);
|
|
@@ -145,7 +145,7 @@ static void menu_action_setting_edit_callback_long5(const char* pstr, unsigned l
|
145
|
145
|
#ifndef REPRAPWORLD_KEYPAD
|
146
|
146
|
volatile uint8_t buttons;//Contains the bits of the currently pressed buttons.
|
147
|
147
|
#else
|
148
|
|
-volatile uint8_t buttons_reprapworld_keypad; // to store the reprapworld_keypad shiftregister values
|
|
148
|
+volatile uint8_t buttons_reprapworld_keypad; // to store the reprapworld_keypad shift register values
|
149
|
149
|
#endif
|
150
|
150
|
#ifdef LCD_HAS_SLOW_BUTTONS
|
151
|
151
|
volatile uint8_t slow_buttons;//Contains the bits of the currently pressed buttons.
|
|
@@ -162,7 +162,7 @@ bool lcd_oldcardstatus;
|
162
|
162
|
menuFunc_t currentMenu = lcd_status_screen; /* function pointer to the currently active menu */
|
163
|
163
|
uint32_t lcd_next_update_millis;
|
164
|
164
|
uint8_t lcd_status_update_delay;
|
165
|
|
-uint8_t lcdDrawUpdate = 2; /* Set to none-zero when the LCD needs to draw, decreased after every draw. Set to 2 in LCD routines so the LCD gets atleast 1 full redraw (first redraw is partial) */
|
|
165
|
+uint8_t lcdDrawUpdate = 2; /* Set to none-zero when the LCD needs to draw, decreased after every draw. Set to 2 in LCD routines so the LCD gets at least 1 full redraw (first redraw is partial) */
|
166
|
166
|
|
167
|
167
|
//prevMenu and prevEncoderPosition are used to store the previous menu location when editing settings.
|
168
|
168
|
menuFunc_t prevMenu = NULL;
|
|
@@ -173,10 +173,10 @@ void* editValue;
|
173
|
173
|
int32_t minEditValue, maxEditValue;
|
174
|
174
|
menuFunc_t callbackFunc;
|
175
|
175
|
|
176
|
|
-// placeholders for Ki and Kd edits
|
|
176
|
+// place-holders for Ki and Kd edits
|
177
|
177
|
float raw_Ki, raw_Kd;
|
178
|
178
|
|
179
|
|
-/* Main status screen. It's up to the implementation specific part to show what is needed. As this is very display dependend */
|
|
179
|
+/* Main status screen. It's up to the implementation specific part to show what is needed. As this is very display dependent */
|
180
|
180
|
static void lcd_status_screen()
|
181
|
181
|
{
|
182
|
182
|
if (lcd_status_update_delay)
|
|
@@ -708,9 +708,9 @@ static void lcd_control_temperature_preheat_abs_settings_menu()
|
708
|
708
|
static void lcd_control_motion_menu()
|
709
|
709
|
{
|
710
|
710
|
START_MENU();
|
711
|
|
- MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
|
|
711
|
+ MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
|
712
|
712
|
#ifdef ENABLE_AUTO_BED_LEVELING
|
713
|
|
- MENU_ITEM_EDIT(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, 0.5, 50);
|
|
713
|
+ MENU_ITEM_EDIT(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, 0.5, 50);
|
714
|
714
|
#endif
|
715
|
715
|
MENU_ITEM_EDIT(float5, MSG_ACC, &acceleration, 500, 99000);
|
716
|
716
|
MENU_ITEM_EDIT(float3, MSG_VXY_JERK, &max_xy_jerk, 1, 990);
|
|
@@ -1008,7 +1008,7 @@ void lcd_init()
|
1008
|
1008
|
WRITE(SHIFT_LD,HIGH);
|
1009
|
1009
|
#endif
|
1010
|
1010
|
#else // Not NEWPANEL
|
1011
|
|
- #ifdef SR_LCD_2W_NL // Non latching 2 wire shiftregister
|
|
1011
|
+ #ifdef SR_LCD_2W_NL // Non latching 2 wire shift register
|
1012
|
1012
|
pinMode (SR_DATA_PIN, OUTPUT);
|
1013
|
1013
|
pinMode (SR_CLK_PIN, OUTPUT);
|
1014
|
1014
|
#elif defined(SHIFT_CLK)
|
|
@@ -1055,7 +1055,7 @@ void lcd_update()
|
1055
|
1055
|
{
|
1056
|
1056
|
lcdDrawUpdate = 2;
|
1057
|
1057
|
lcd_oldcardstatus = IS_SD_INSERTED;
|
1058
|
|
- lcd_implementation_init(); // to maybe revive the lcd if static electricty killed it.
|
|
1058
|
+ lcd_implementation_init(); // to maybe revive the LCD if static electricity killed it.
|
1059
|
1059
|
|
1060
|
1060
|
if(lcd_oldcardstatus)
|
1061
|
1061
|
{
|
|
@@ -1470,7 +1470,7 @@ char *ftostr52(const float &x)
|
1470
|
1470
|
}
|
1471
|
1471
|
|
1472
|
1472
|
// Callback for after editing PID i value
|
1473
|
|
-// grab the pid i value out of the temp variable; scale it; then update the PID driver
|
|
1473
|
+// grab the PID i value out of the temp variable; scale it; then update the PID driver
|
1474
|
1474
|
void copy_and_scalePID_i()
|
1475
|
1475
|
{
|
1476
|
1476
|
#ifdef PIDTEMP
|
|
@@ -1480,7 +1480,7 @@ void copy_and_scalePID_i()
|
1480
|
1480
|
}
|
1481
|
1481
|
|
1482
|
1482
|
// Callback for after editing PID d value
|
1483
|
|
-// grab the pid d value out of the temp variable; scale it; then update the PID driver
|
|
1483
|
+// grab the PID d value out of the temp variable; scale it; then update the PID driver
|
1484
|
1484
|
void copy_and_scalePID_d()
|
1485
|
1485
|
{
|
1486
|
1486
|
#ifdef PIDTEMP
|