Browse Source

Translate encoder comments

Scott Lahteine 4 years ago
parent
commit
85089898be
2 changed files with 46 additions and 44 deletions
  1. 23
    20
      Marlin/src/lcd/dwin/e3v2/rotary_encoder.cpp
  2. 23
    24
      Marlin/src/lcd/dwin/e3v2/rotary_encoder.h

+ 23
- 20
Marlin/src/lcd/dwin/e3v2/rotary_encoder.cpp View File

20
  *
20
  *
21
  */
21
  */
22
 
22
 
23
-/**
24
-  ******************************************************************************
25
-  * @file     rotary_encoder.cpp
26
-  * @author   LEO / Creality3D
27
-  * @date     2019/07/06
28
-  * @version  2.0.1
29
-  * @brief    旋转编码器操作函数
30
-  ******************************************************************************
31
-**/
23
+/*****************************************************************************
24
+ * @file     rotary_encoder.cpp
25
+ * @author   LEO / Creality3D
26
+ * @date     2019/07/06
27
+ * @version  2.0.1
28
+ * @brief    Rotary encoder functions
29
+ *****************************************************************************/
32
 
30
 
33
 #include "../../../inc/MarlinConfigPre.h"
31
 #include "../../../inc/MarlinConfigPre.h"
34
 
32
 
47
 
45
 
48
 ENCODER_Rate EncoderRate;
46
 ENCODER_Rate EncoderRate;
49
 
47
 
50
-/*蜂鸣器响*/
48
+// Buzzer
51
 void Encoder_tick(void) {
49
 void Encoder_tick(void) {
52
   WRITE(BEEPER_PIN, 1);
50
   WRITE(BEEPER_PIN, 1);
53
   delay(10);
51
   delay(10);
54
   WRITE(BEEPER_PIN, 0);
52
   WRITE(BEEPER_PIN, 0);
55
 }
53
 }
56
 
54
 
57
-/*编码器初始化 PB12:Encoder_A PB13:Encoder_B PB14:Encoder_C*/
55
+// Encoder initialization
58
 void Encoder_Configuration(void) {
56
 void Encoder_Configuration(void) {
59
   #if BUTTON_EXISTS(EN1)
57
   #if BUTTON_EXISTS(EN1)
60
     SET_INPUT_PULLUP(BTN_EN1);
58
     SET_INPUT_PULLUP(BTN_EN1);
70
   #endif
68
   #endif
71
 }
69
 }
72
 
70
 
73
-millis_t next_click_update_ms;
74
-/*接收数据解析 返回值:ENCODER_DIFF_NO,无状态; ENCODER_DIFF_CW,顺时针旋转; ENCODER_DIFF_CCW,逆时针旋转; ENCODER_DIFF_ENTER,按下*/
71
+// Analyze encoder value and return state
75
 ENCODER_DiffState Encoder_ReceiveAnalyze(void) {
72
 ENCODER_DiffState Encoder_ReceiveAnalyze(void) {
76
   const millis_t now = millis();
73
   const millis_t now = millis();
77
   static unsigned char lastEncoderBits;
74
   static unsigned char lastEncoderBits;
82
   if (BUTTON_PRESSED(EN1)) newbutton |= 0x01;
79
   if (BUTTON_PRESSED(EN1)) newbutton |= 0x01;
83
   if (BUTTON_PRESSED(EN2)) newbutton |= 0x02;
80
   if (BUTTON_PRESSED(EN2)) newbutton |= 0x02;
84
   if (BUTTON_PRESSED(ENC)) {
81
   if (BUTTON_PRESSED(ENC)) {
82
+    static millis_t next_click_update_ms;
85
     if (ELAPSED(now, next_click_update_ms)) {
83
     if (ELAPSED(now, next_click_update_ms)) {
86
       next_click_update_ms = millis() + 300;
84
       next_click_update_ms = millis() + 300;
87
       Encoder_tick();
85
       Encoder_tick();
154
 
152
 
155
 #if PIN_EXISTS(LCD_LED)
153
 #if PIN_EXISTS(LCD_LED)
156
 
154
 
157
-  /*取低24位有效  24Bit: G7 G6 G5 G4 G3 G2 G1 G0 R7 R6 R5 R4 R3 R2 R1 R0 B7 B6 B5 B4 B3 B2 B1 B0*/
155
+  // Take the low 24 valid bits  24Bit: G7 G6 G5 G4 G3 G2 G1 G0 R7 R6 R5 R4 R3 R2 R1 R0 B7 B6 B5 B4 B3 B2 B1 B0
158
   unsigned int LED_DataArray[LED_NUM];
156
   unsigned int LED_DataArray[LED_NUM];
159
 
157
 
160
-  /*LED灯操作*/
158
+  // LED light operation
161
   void LED_Action(void) {
159
   void LED_Action(void) {
162
     LED_Control(RGB_SCALE_WARM_WHITE,0x0F);
160
     LED_Control(RGB_SCALE_WARM_WHITE,0x0F);
163
     delay(30);
161
     delay(30);
164
     LED_Control(RGB_SCALE_WARM_WHITE,0x00);
162
     LED_Control(RGB_SCALE_WARM_WHITE,0x00);
165
   }
163
   }
166
 
164
 
167
-  /*LED初始化*/
165
+  // LED initialization
168
   void LED_Configuration(void) {
166
   void LED_Configuration(void) {
169
     SET_OUTPUT(LCD_LED_PIN);
167
     SET_OUTPUT(LCD_LED_PIN);
170
   }
168
   }
171
 
169
 
172
-  /*LED写数据*/
170
+  // LED write data
173
   void LED_WriteData(void) {
171
   void LED_WriteData(void) {
174
     unsigned char tempCounter_LED, tempCounter_Bit;
172
     unsigned char tempCounter_LED, tempCounter_Bit;
175
     for (tempCounter_LED = 0; tempCounter_LED < LED_NUM; tempCounter_LED++) {
173
     for (tempCounter_LED = 0; tempCounter_LED < LED_NUM; tempCounter_LED++) {
189
     }
187
     }
190
   }
188
   }
191
 
189
 
192
-  /*LED控制 RGB_Scale:RGB色彩配比 luminance:亮度(0~0xFF)*/
190
+  // LED control
191
+  //  RGB_Scale: RGB color ratio
192
+  //  luminance: brightness (0~0xFF)
193
   void LED_Control(unsigned char RGB_Scale, unsigned char luminance) {
193
   void LED_Control(unsigned char RGB_Scale, unsigned char luminance) {
194
     unsigned char temp_Counter;
194
     unsigned char temp_Counter;
195
     for (temp_Counter = 0; temp_Counter < LED_NUM; temp_Counter++) {
195
     for (temp_Counter = 0; temp_Counter < LED_NUM; temp_Counter++) {
203
     LED_WriteData();
203
     LED_WriteData();
204
   }
204
   }
205
 
205
 
206
-  /*LED渐变控制 RGB_Scale:RGB色彩配比 luminance:亮度(0~0xFF) change_Time:渐变时间(ms)*/
206
+  // LED gradient control
207
+  //  RGB_Scale: RGB color ratio
208
+  //  luminance: brightness (0~0xFF)
209
+  //  change_Time: gradient time (ms)
207
   void LED_GraduallyControl(unsigned char RGB_Scale, unsigned char luminance, unsigned int change_Interval) {
210
   void LED_GraduallyControl(unsigned char RGB_Scale, unsigned char luminance, unsigned int change_Interval) {
208
     unsigned char temp_Counter;
211
     unsigned char temp_Counter;
209
     unsigned char LED_R_Data[LED_NUM], LED_G_Data[LED_NUM], LED_B_Data[LED_NUM];
212
     unsigned char LED_R_Data[LED_NUM], LED_G_Data[LED_NUM], LED_B_Data[LED_NUM];
246
     }
249
     }
247
   }
250
   }
248
 
251
 
249
-#endif
252
+#endif // LCD_LED
250
 
253
 
251
 #endif // DWIN_CREALITY_LCD
254
 #endif // DWIN_CREALITY_LCD

+ 23
- 24
Marlin/src/lcd/dwin/e3v2/rotary_encoder.h View File

21
  */
21
  */
22
 #pragma once
22
 #pragma once
23
 
23
 
24
-/**
25
-  ******************************************************************************
24
+/*****************************************************************************
26
   * @file     rotary_encoder.h
25
   * @file     rotary_encoder.h
27
   * @author   LEO / Creality3D
26
   * @author   LEO / Creality3D
28
   * @date     2019/07/06
27
   * @date     2019/07/06
29
   * @version  2.0.1
28
   * @version  2.0.1
30
-  * @brief    旋转编码器操作函数
31
-  ******************************************************************************
32
-**/
29
+  * @brief    Rotary encoder functions
30
+  ****************************************************************************/
33
 
31
 
34
 #include "../../../inc/MarlinConfig.h"
32
 #include "../../../inc/MarlinConfig.h"
35
 #include "../../../MarlinCore.h"
33
 #include "../../../MarlinCore.h"
54
 extern ENCODER_Rate EncoderRate;
52
 extern ENCODER_Rate EncoderRate;
55
 
53
 
56
 typedef enum {
54
 typedef enum {
57
-  ENCODER_DIFF_NO    = 0,
58
-  ENCODER_DIFF_CW    = 1,
59
-  ENCODER_DIFF_CCW   = 2,
60
-  ENCODER_DIFF_ENTER = 3
55
+  ENCODER_DIFF_NO    = 0,  // no state
56
+  ENCODER_DIFF_CW    = 1,  // clockwise rotation
57
+  ENCODER_DIFF_CCW   = 2,  // counterclockwise rotation
58
+  ENCODER_DIFF_ENTER = 3   // click
61
 } ENCODER_DiffState;
59
 } ENCODER_DiffState;
62
 
60
 
63
-/*编码器初始化 PB12:Encoder_A PB13:Encoder_B PB14:Encoder_C*/
61
+// Encoder initialization
64
 void Encoder_Configuration(void);
62
 void Encoder_Configuration(void);
65
 
63
 
66
-/*接收数据解析 返回值:ENCODER_DIFF_NO,无状态; ENCODER_DIFF_CW,顺时针旋转; ENCODER_DIFF_CCW,逆时针旋转; ENCODER_DIFF_ENTER,按下*/
64
+// Analyze encoder value and return state
67
 ENCODER_DiffState Encoder_ReceiveAnalyze(void);
65
 ENCODER_DiffState Encoder_ReceiveAnalyze(void);
68
 
66
 
69
-
70
 /*********************** Encoder LED ***********************/
67
 /*********************** Encoder LED ***********************/
71
 
68
 
72
 #if PIN_EXISTS(LCD_LED)
69
 #if PIN_EXISTS(LCD_LED)
78
   #define RGB_SCALE_R10_G7_B5  1
75
   #define RGB_SCALE_R10_G7_B5  1
79
   #define RGB_SCALE_R10_G7_B4  2
76
   #define RGB_SCALE_R10_G7_B4  2
80
   #define RGB_SCALE_R10_G8_B7  3
77
   #define RGB_SCALE_R10_G8_B7  3
81
-  #define RGB_SCALE_NEUTRAL_WHITE  RGB_SCALE_R10_G7_B5 //正白
82
-  #define RGB_SCALE_WARM_WHITE  RGB_SCALE_R10_G7_B4 //暖白
83
-  #define RGB_SCALE_COOL_WHITE  RGB_SCALE_R10_G8_B7 //冷白
78
+  #define RGB_SCALE_NEUTRAL_WHITE RGB_SCALE_R10_G7_B5
79
+  #define RGB_SCALE_WARM_WHITE    RGB_SCALE_R10_G7_B4
80
+  #define RGB_SCALE_COOL_WHITE    RGB_SCALE_R10_G8_B7
84
 
81
 
85
   extern unsigned int LED_DataArray[LED_NUM];
82
   extern unsigned int LED_DataArray[LED_NUM];
86
 
83
 
87
-  /*状态LED初始化*/
88
-  void STATE_LED_Configuration(void);
89
-
90
-  /*LED灯操作*/
84
+  // LED light operation
91
   void LED_Action(void);
85
   void LED_Action(void);
92
 
86
 
93
-  /*LED初始化*/
87
+  // LED initialization
94
   void LED_Configuration(void);
88
   void LED_Configuration(void);
95
 
89
 
96
-  /*LED写数据*/
90
+  // LED write data
97
   void LED_WriteData(void);
91
   void LED_WriteData(void);
98
 
92
 
99
-  /*LED控制 RGB_Scale:RGB色彩配比 luminance:亮度(0~0xFF)*/
93
+  // LED control
94
+  //  RGB_Scale: RGB color ratio
95
+  //  luminance: brightness (0~0xFF)
100
   void LED_Control(unsigned char RGB_Scale, unsigned char luminance);
96
   void LED_Control(unsigned char RGB_Scale, unsigned char luminance);
101
 
97
 
102
-  /*LED渐变控制 RGB_Scale:RGB色彩配比 luminance:亮度(0~0xFF) change_Time:渐变时间(ms)*/
98
+  // LED gradient control
99
+  //  RGB_Scale: RGB color ratio
100
+  //  luminance: brightness (0~0xFF)
101
+  //  change_Time: gradient time (ms)
103
   void LED_GraduallyControl(unsigned char RGB_Scale, unsigned char luminance, unsigned int change_Interval);
102
   void LED_GraduallyControl(unsigned char RGB_Scale, unsigned char luminance, unsigned int change_Interval);
104
 
103
 
105
-#endif
104
+#endif // LCD_LED

Loading…
Cancel
Save