Ver código fonte

Simplify MKS_MINI_12864 init (move 5ms to u8g seq.) (#15428)

DrDitto 5 anos atrás
pai
commit
55b8547f04

+ 1
- 0
Marlin/src/inc/Conditionals_LCD.h Ver arquivo

128
   #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
128
   #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
129
     #define RGB_LED
129
     #define RGB_LED
130
   #elif ENABLED(FYSETC_MINI_12864_2_1)
130
   #elif ENABLED(FYSETC_MINI_12864_2_1)
131
+    #define LED_CONTROL_MENU
131
     #define NEOPIXEL_LED
132
     #define NEOPIXEL_LED
132
     #undef NEOPIXEL_TYPE
133
     #undef NEOPIXEL_TYPE
133
     #define NEOPIXEL_TYPE       NEO_RGB
134
     #define NEOPIXEL_TYPE       NEO_RGB

+ 3
- 16
Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp Ver arquivo

130
     UC1701_INDICATOR(0),      // indicator disable
130
     UC1701_INDICATOR(0),      // indicator disable
131
     UC1701_ON(1),             // display on
131
     UC1701_ON(1),             // display on
132
     UC1701_COLUMN_HI(0),      // set upper 4 bit of the col adr to 0
132
     UC1701_COLUMN_HI(0),      // set upper 4 bit of the col adr to 0
133
+    U8G_ESC_END,              // end of sequence
134
+    U8G_ESC_DLY(5)            // delay 5 ms
133
   #else
135
   #else
134
     UC1701_COLUMN_ADR(0),     // address 0
136
     UC1701_COLUMN_ADR(0),     // address 0
137
+    U8G_ESC_END               // end of sequence
135
   #endif
138
   #endif
136
-  U8G_ESC_END                 // end of sequence
137
 };
139
 };
138
 
140
 
139
 uint8_t u8g_dev_uc1701_mini12864_HAL_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, void *arg) {
141
 uint8_t u8g_dev_uc1701_mini12864_HAL_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, void *arg) {
170
     case U8G_DEV_MSG_INIT:
172
     case U8G_DEV_MSG_INIT:
171
       u8g_InitCom(u8g, dev, U8G_SPI_CLK_CYCLE_300NS);
173
       u8g_InitCom(u8g, dev, U8G_SPI_CLK_CYCLE_300NS);
172
       u8g_WriteEscSeqP(u8g, dev, u8g_dev_uc1701_mini12864_HAL_init_seq);
174
       u8g_WriteEscSeqP(u8g, dev, u8g_dev_uc1701_mini12864_HAL_init_seq);
173
-      #if ENABLED(MKS_MINI_12864)
174
-        u8g_Delay(5);
175
-      #endif
176
       break;
175
       break;
177
 
176
 
178
     case U8G_DEV_MSG_STOP: break;
177
     case U8G_DEV_MSG_STOP: break;
180
     case U8G_DEV_MSG_PAGE_NEXT: {
179
     case U8G_DEV_MSG_PAGE_NEXT: {
181
       u8g_pb_t *pb = (u8g_pb_t *)(dev->dev_mem);
180
       u8g_pb_t *pb = (u8g_pb_t *)(dev->dev_mem);
182
       u8g_WriteEscSeqP(u8g, dev, u8g_dev_uc1701_mini12864_HAL_data_start);
181
       u8g_WriteEscSeqP(u8g, dev, u8g_dev_uc1701_mini12864_HAL_data_start);
183
-      #if ENABLED(MKS_MINI_12864)
184
-        u8g_Delay(5);
185
-      #endif
186
       u8g_WriteByte(u8g, dev, 0x0B0 | (2 * pb->p.page)); /* select current page */
182
       u8g_WriteByte(u8g, dev, 0x0B0 | (2 * pb->p.page)); /* select current page */
187
       u8g_SetAddress(u8g, dev, 1); /* data mode */
183
       u8g_SetAddress(u8g, dev, 1); /* data mode */
188
       u8g_WriteSequence(u8g, dev, pb->width, (uint8_t *)pb->buf);
184
       u8g_WriteSequence(u8g, dev, pb->width, (uint8_t *)pb->buf);
189
       u8g_SetChipSelect(u8g, dev, 0);
185
       u8g_SetChipSelect(u8g, dev, 0);
190
       u8g_WriteEscSeqP(u8g, dev, u8g_dev_uc1701_mini12864_HAL_data_start);
186
       u8g_WriteEscSeqP(u8g, dev, u8g_dev_uc1701_mini12864_HAL_data_start);
191
-      #if ENABLED(MKS_MINI_12864)
192
-        u8g_Delay(5);
193
-      #endif
194
       u8g_WriteByte(u8g, dev, 0x0B0 | (2 * pb->p.page + 1)); /* select current page */
187
       u8g_WriteByte(u8g, dev, 0x0B0 | (2 * pb->p.page + 1)); /* select current page */
195
       u8g_SetAddress(u8g, dev, 1); /* data mode */
188
       u8g_SetAddress(u8g, dev, 1); /* data mode */
196
       u8g_WriteSequence(u8g, dev, pb->width, (uint8_t *)(pb->buf)+pb->width);
189
       u8g_WriteSequence(u8g, dev, pb->width, (uint8_t *)(pb->buf)+pb->width);
199
 
192
 
200
     case U8G_DEV_MSG_CONTRAST:
193
     case U8G_DEV_MSG_CONTRAST:
201
       u8g_SetChipSelect(u8g, dev, 1);
194
       u8g_SetChipSelect(u8g, dev, 1);
202
-      #if ENABLED(MKS_MINI_12864)
203
-        u8g_Delay(5);
204
-      #endif
205
       u8g_SetAddress(u8g, dev, 0); /* instruction mode */
195
       u8g_SetAddress(u8g, dev, 0); /* instruction mode */
206
       u8g_WriteByte(u8g, dev, 0x081);
196
       u8g_WriteByte(u8g, dev, 0x081);
207
       u8g_WriteByte(u8g, dev, (*(uint8_t *)arg) >> 2);
197
       u8g_WriteByte(u8g, dev, (*(uint8_t *)arg) >> 2);
208
       u8g_SetChipSelect(u8g, dev, 0);
198
       u8g_SetChipSelect(u8g, dev, 0);
209
-      #if ENABLED(MKS_MINI_12864)
210
-        u8g_Delay(5);
211
-      #endif
212
       return 1;
199
       return 1;
213
   }
200
   }
214
   return u8g_dev_pb16v1_base_fn(u8g, dev, msg, arg);
201
   return u8g_dev_pb16v1_base_fn(u8g, dev, msg, arg);

Carregando…
Cancelar
Salvar