Browse Source

🎨 Misc. code cleanup

Scott Lahteine 2 years ago
parent
commit
030b66eb27

+ 3
- 2
Marlin/src/MarlinCore.cpp View File

@@ -1554,6 +1554,7 @@ void setup() {
1554 1554
   #endif
1555 1555
 
1556 1556
   #if HAS_DWIN_E3V2_BASIC
1557
+    SETUP_LOG("E3V2 Init");
1557 1558
     Encoder_Configuration();
1558 1559
     HMI_Init();
1559 1560
     HMI_SetLanguageCache();
@@ -1562,7 +1563,7 @@ void setup() {
1562 1563
   #endif
1563 1564
 
1564 1565
   #if HAS_SERVICE_INTERVALS && !HAS_DWIN_E3V2_BASIC
1565
-    ui.reset_status(true);  // Show service messages or keep current status
1566
+    SETUP_RUN(ui.reset_status(true));  // Show service messages or keep current status
1566 1567
   #endif
1567 1568
 
1568 1569
   #if ENABLED(MAX7219_DEBUG)
@@ -1593,7 +1594,7 @@ void setup() {
1593 1594
   #endif
1594 1595
 
1595 1596
   #if BOTH(HAS_LCD_MENU, TOUCH_SCREEN_CALIBRATION) && EITHER(TFT_CLASSIC_UI, TFT_COLOR_UI)
1596
-    ui.check_touch_calibration();
1597
+    SETUP_RUN(ui.check_touch_calibration());
1597 1598
   #endif
1598 1599
 
1599 1600
   marlin_state = MF_RUNNING;

+ 1
- 1
Marlin/src/feature/twibus.cpp View File

@@ -98,7 +98,7 @@ void TWIBus::echodata(uint8_t bytes, FSTR_P const pref, uint8_t adr, const uint8
98 98
   union TwoBytesToInt16 { uint8_t bytes[2]; int16_t integervalue; };
99 99
   TwoBytesToInt16 ConversionUnion;
100 100
 
101
-  echoprefix(bytes, pref, adr);  
101
+  echoprefix(bytes, pref, adr);
102 102
 
103 103
   while (bytes-- && Wire.available()) {
104 104
     int value = Wire.read();

+ 2
- 2
Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h View File

@@ -54,7 +54,7 @@
54 54
 
55 55
 //
56 56
 // Limit Switches
57
-// 
57
+//
58 58
 #define X_STOP_PIN                          PD8
59 59
 #define Y_STOP_PIN                          PD15
60 60
 #define Z_MIN_PIN                           PA11
@@ -173,7 +173,7 @@
173 173
   #define LCD_PINS_D5                       PE7
174 174
   #define LCD_PINS_D6                       PB2
175 175
   #define LCD_PINS_D7                       PB1
176
-  
176
+
177 177
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
178 178
     #define BTN_ENC_EN               LCD_PINS_D7  // Detect the presence of the encoder
179 179
   #endif

+ 9
- 9
buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.cpp View File

@@ -190,12 +190,12 @@ WEAK void SystemClock_Config(void)
190 190
 
191 191
   /* Enable Power Control clock */
192 192
   __HAL_RCC_PWR_CLK_ENABLE();
193
-  
194
-  /* The voltage scaling allows optimizing the power consumption when the device is 
195
-     clocked below the maximum system frequency, to update the voltage scaling value 
193
+
194
+  /* The voltage scaling allows optimizing the power consumption when the device is
195
+     clocked below the maximum system frequency, to update the voltage scaling value
196 196
      regarding system frequency refer to product datasheet.  */
197 197
   __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
198
-  
198
+
199 199
   /* Enable HSE Oscillator and activate PLL with HSE as source */
200 200
   RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
201 201
   RCC_OscInitStruct.HSEState = RCC_HSE_ON;
@@ -209,19 +209,19 @@ WEAK void SystemClock_Config(void)
209 209
   {
210 210
     /* Initialization Error */
211 211
   }
212
-  
212
+
213 213
   if(HAL_PWREx_EnableOverDrive() != HAL_OK)
214 214
   {
215 215
     /* Initialization Error */
216 216
   }
217
-  
218
-  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2 
217
+
218
+  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2
219 219
      clocks dividers */
220 220
   RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2);
221 221
   RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
222 222
   RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
223
-  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;  
224
-  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;  
223
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;
224
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;
225 225
   if(HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5) != HAL_OK)
226 226
   {
227 227
     /* Initialization Error */

Loading…
Cancel
Save