Browse Source

Merge pull request #781 from Cylindric3D/typofixes_upstream

Various typo fixes #3 - only in comments, no code changes.
ErikZalm 11 years ago
parent
commit
b514d3c87f
3 changed files with 23 additions and 23 deletions
  1. 13
    13
      Marlin/ultralcd.cpp
  2. 4
    4
      Marlin/ultralcd.h
  3. 6
    6
      Marlin/ultralcd_implementation_hitachi_HD44780.h

+ 13
- 13
Marlin/ultralcd.cpp View File

38
 #include "ultralcd_implementation_hitachi_HD44780.h"
38
 #include "ultralcd_implementation_hitachi_HD44780.h"
39
 #endif
39
 #endif
40
 
40
 
41
-/** forward declerations **/
41
+/** forward declarations **/
42
 
42
 
43
 void copy_and_scalePID_i();
43
 void copy_and_scalePID_i();
44
 void copy_and_scalePID_d();
44
 void copy_and_scalePID_d();
62
 static void lcd_control_retract_menu();
62
 static void lcd_control_retract_menu();
63
 static void lcd_sdcard_menu();
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
 static void menu_action_back(menuFunc_t data);
68
 static void menu_action_back(menuFunc_t data);
69
 static void menu_action_submenu(menuFunc_t data);
69
 static void menu_action_submenu(menuFunc_t data);
70
 static void menu_action_gcode(const char* pgcode);
70
 static void menu_action_gcode(const char* pgcode);
145
 #ifndef REPRAPWORLD_KEYPAD
145
 #ifndef REPRAPWORLD_KEYPAD
146
 volatile uint8_t buttons;//Contains the bits of the currently pressed buttons.
146
 volatile uint8_t buttons;//Contains the bits of the currently pressed buttons.
147
 #else
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
 #endif
149
 #endif
150
 #ifdef LCD_HAS_SLOW_BUTTONS
150
 #ifdef LCD_HAS_SLOW_BUTTONS
151
 volatile uint8_t slow_buttons;//Contains the bits of the currently pressed buttons.
151
 volatile uint8_t slow_buttons;//Contains the bits of the currently pressed buttons.
162
 menuFunc_t currentMenu = lcd_status_screen; /* function pointer to the currently active menu */
162
 menuFunc_t currentMenu = lcd_status_screen; /* function pointer to the currently active menu */
163
 uint32_t lcd_next_update_millis;
163
 uint32_t lcd_next_update_millis;
164
 uint8_t lcd_status_update_delay;
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
 //prevMenu and prevEncoderPosition are used to store the previous menu location when editing settings.
167
 //prevMenu and prevEncoderPosition are used to store the previous menu location when editing settings.
168
 menuFunc_t prevMenu = NULL;
168
 menuFunc_t prevMenu = NULL;
173
 int32_t minEditValue, maxEditValue;
173
 int32_t minEditValue, maxEditValue;
174
 menuFunc_t callbackFunc;
174
 menuFunc_t callbackFunc;
175
 
175
 
176
-// placeholders for Ki and Kd edits
176
+// place-holders for Ki and Kd edits
177
 float raw_Ki, raw_Kd;
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
 static void lcd_status_screen()
180
 static void lcd_status_screen()
181
 {
181
 {
182
     if (lcd_status_update_delay)
182
     if (lcd_status_update_delay)
708
 static void lcd_control_motion_menu()
708
 static void lcd_control_motion_menu()
709
 {
709
 {
710
     START_MENU();
710
     START_MENU();
711
-    MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
711
+    MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
712
 #ifdef ENABLE_AUTO_BED_LEVELING
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
 #endif
714
 #endif
715
     MENU_ITEM_EDIT(float5, MSG_ACC, &acceleration, 500, 99000);
715
     MENU_ITEM_EDIT(float5, MSG_ACC, &acceleration, 500, 99000);
716
     MENU_ITEM_EDIT(float3, MSG_VXY_JERK, &max_xy_jerk, 1, 990);
716
     MENU_ITEM_EDIT(float3, MSG_VXY_JERK, &max_xy_jerk, 1, 990);
1008
     WRITE(SHIFT_LD,HIGH);
1008
     WRITE(SHIFT_LD,HIGH);
1009
   #endif
1009
   #endif
1010
 #else  // Not NEWPANEL
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
      pinMode (SR_DATA_PIN, OUTPUT);
1012
      pinMode (SR_DATA_PIN, OUTPUT);
1013
      pinMode (SR_CLK_PIN, OUTPUT);
1013
      pinMode (SR_CLK_PIN, OUTPUT);
1014
   #elif defined(SHIFT_CLK) 
1014
   #elif defined(SHIFT_CLK) 
1055
     {
1055
     {
1056
         lcdDrawUpdate = 2;
1056
         lcdDrawUpdate = 2;
1057
         lcd_oldcardstatus = IS_SD_INSERTED;
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
         if(lcd_oldcardstatus)
1060
         if(lcd_oldcardstatus)
1061
         {
1061
         {
1470
 }
1470
 }
1471
 
1471
 
1472
 // Callback for after editing PID i value
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
 void copy_and_scalePID_i()
1474
 void copy_and_scalePID_i()
1475
 {
1475
 {
1476
 #ifdef PIDTEMP
1476
 #ifdef PIDTEMP
1480
 }
1480
 }
1481
 
1481
 
1482
 // Callback for after editing PID d value
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
 void copy_and_scalePID_d()
1484
 void copy_and_scalePID_d()
1485
 {
1485
 {
1486
 #ifdef PIDTEMP
1486
 #ifdef PIDTEMP

+ 4
- 4
Marlin/ultralcd.h View File

17
   void lcd_setcontrast(uint8_t value);
17
   void lcd_setcontrast(uint8_t value);
18
 #endif
18
 #endif
19
 
19
 
20
-  static unsigned char blink = 0;	// Variable for visualisation of fan rotation in GLCD
20
+  static unsigned char blink = 0;	// Variable for visualization of fan rotation in GLCD
21
 
21
 
22
   #define LCD_MESSAGEPGM(x) lcd_setstatuspgm(PSTR(x))
22
   #define LCD_MESSAGEPGM(x) lcd_setstatuspgm(PSTR(x))
23
   #define LCD_ALERTMESSAGEPGM(x) lcd_setalertstatuspgm(PSTR(x))
23
   #define LCD_ALERTMESSAGEPGM(x) lcd_setalertstatuspgm(PSTR(x))
29
   void lcd_buttons_update();
29
   void lcd_buttons_update();
30
   extern volatile uint8_t buttons;  //the last checked buttons in a bit array.
30
   extern volatile uint8_t buttons;  //the last checked buttons in a bit array.
31
   #ifdef REPRAPWORLD_KEYPAD
31
   #ifdef REPRAPWORLD_KEYPAD
32
-    extern volatile uint8_t buttons_reprapworld_keypad; // to store the keypad shiftregister values
32
+    extern volatile uint8_t buttons_reprapworld_keypad; // to store the keypad shift register values
33
   #endif
33
   #endif
34
   #else
34
   #else
35
   FORCE_INLINE void lcd_buttons_update() {}
35
   FORCE_INLINE void lcd_buttons_update() {}
72
   	  #define REPRAPWORLD_KEYPAD_MOVE_HOME (buttons_reprapworld_keypad&EN_REPRAPWORLD_KEYPAD_MIDDLE)
72
   	  #define REPRAPWORLD_KEYPAD_MOVE_HOME (buttons_reprapworld_keypad&EN_REPRAPWORLD_KEYPAD_MIDDLE)
73
     #endif //REPRAPWORLD_KEYPAD
73
     #endif //REPRAPWORLD_KEYPAD
74
   #else
74
   #else
75
-    //atomatic, do not change
75
+    //atomic, do not change
76
     #define B_LE (1<<BL_LE)
76
     #define B_LE (1<<BL_LE)
77
     #define B_UP (1<<BL_UP)
77
     #define B_UP (1<<BL_UP)
78
     #define B_MI (1<<BL_MI)
78
     #define B_MI (1<<BL_MI)
85
     #define LCD_CLICKED ((buttons&B_MI)||(buttons&B_ST))
85
     #define LCD_CLICKED ((buttons&B_MI)||(buttons&B_ST))
86
   #endif//NEWPANEL
86
   #endif//NEWPANEL
87
 
87
 
88
-#else //no lcd
88
+#else //no LCD
89
   FORCE_INLINE void lcd_update() {}
89
   FORCE_INLINE void lcd_update() {}
90
   FORCE_INLINE void lcd_init() {}
90
   FORCE_INLINE void lcd_init() {}
91
   FORCE_INLINE void lcd_setstatus(const char* message) {}
91
   FORCE_INLINE void lcd_setstatus(const char* message) {}

+ 6
- 6
Marlin/ultralcd_implementation_hitachi_HD44780.h View File

2
 #define ULTRA_LCD_IMPLEMENTATION_HITACHI_HD44780_H
2
 #define ULTRA_LCD_IMPLEMENTATION_HITACHI_HD44780_H
3
 
3
 
4
 /**
4
 /**
5
-* Implementation of the LCD display routines for a hitachi HD44780 display. These are common LCD character displays.
6
-* When selecting the rusian language, a slightly different LCD implementation is used to handle UTF8 characters.
5
+* Implementation of the LCD display routines for a Hitachi HD44780 display. These are common LCD character displays.
6
+* When selecting the Russian language, a slightly different LCD implementation is used to handle UTF8 characters.
7
 **/
7
 **/
8
 
8
 
9
 #ifndef REPRAPWORLD_KEYPAD
9
 #ifndef REPRAPWORLD_KEYPAD
20
 // via a shift/i2c register.
20
 // via a shift/i2c register.
21
 
21
 
22
 #ifdef ULTIPANEL
22
 #ifdef ULTIPANEL
23
-// All Ultipanels might have an encoder - so this is always be mapped onto first two bits
23
+// All UltiPanels might have an encoder - so this is always be mapped onto first two bits
24
 #define BLEN_B 1
24
 #define BLEN_B 1
25
 #define BLEN_A 0
25
 #define BLEN_A 0
26
 
26
 
725
       delayMicroseconds(100);
725
       delayMicroseconds(100);
726
       WRITE(BEEPER,LOW);
726
       WRITE(BEEPER,LOW);
727
       delayMicroseconds(100);
727
       delayMicroseconds(100);
728
-    }
729
-    #else
728
+    }
729
+    #else
730
     for(int8_t i=0;i<(LCD_FEEDBACK_FREQUENCY_DURATION_MS / (1000 / LCD_FEEDBACK_FREQUENCY_HZ));i++)
730
     for(int8_t i=0;i<(LCD_FEEDBACK_FREQUENCY_DURATION_MS / (1000 / LCD_FEEDBACK_FREQUENCY_HZ));i++)
731
     {
731
     {
732
       WRITE(BEEPER,HIGH);
732
       WRITE(BEEPER,HIGH);
733
       delayMicroseconds(1000000 / LCD_FEEDBACK_FREQUENCY_HZ / 2);
733
       delayMicroseconds(1000000 / LCD_FEEDBACK_FREQUENCY_HZ / 2);
734
       WRITE(BEEPER,LOW);
734
       WRITE(BEEPER,LOW);
735
       delayMicroseconds(1000000 / LCD_FEEDBACK_FREQUENCY_HZ / 2);
735
       delayMicroseconds(1000000 / LCD_FEEDBACK_FREQUENCY_HZ / 2);
736
-    }
736
+    }
737
     #endif
737
     #endif
738
 #endif
738
 #endif
739
 }
739
 }

Loading…
Cancel
Save