Browse Source

🎨 Misc. code cleanup

Scott Lahteine 3 years ago
parent
commit
030b66eb27

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

1554
   #endif
1554
   #endif
1555
 
1555
 
1556
   #if HAS_DWIN_E3V2_BASIC
1556
   #if HAS_DWIN_E3V2_BASIC
1557
+    SETUP_LOG("E3V2 Init");
1557
     Encoder_Configuration();
1558
     Encoder_Configuration();
1558
     HMI_Init();
1559
     HMI_Init();
1559
     HMI_SetLanguageCache();
1560
     HMI_SetLanguageCache();
1562
   #endif
1563
   #endif
1563
 
1564
 
1564
   #if HAS_SERVICE_INTERVALS && !HAS_DWIN_E3V2_BASIC
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
   #endif
1567
   #endif
1567
 
1568
 
1568
   #if ENABLED(MAX7219_DEBUG)
1569
   #if ENABLED(MAX7219_DEBUG)
1593
   #endif
1594
   #endif
1594
 
1595
 
1595
   #if BOTH(HAS_LCD_MENU, TOUCH_SCREEN_CALIBRATION) && EITHER(TFT_CLASSIC_UI, TFT_COLOR_UI)
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
   #endif
1598
   #endif
1598
 
1599
 
1599
   marlin_state = MF_RUNNING;
1600
   marlin_state = MF_RUNNING;

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

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

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

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

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

190
 
190
 
191
   /* Enable Power Control clock */
191
   /* Enable Power Control clock */
192
   __HAL_RCC_PWR_CLK_ENABLE();
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
      regarding system frequency refer to product datasheet.  */
196
      regarding system frequency refer to product datasheet.  */
197
   __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
197
   __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
198
-  
198
+
199
   /* Enable HSE Oscillator and activate PLL with HSE as source */
199
   /* Enable HSE Oscillator and activate PLL with HSE as source */
200
   RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
200
   RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
201
   RCC_OscInitStruct.HSEState = RCC_HSE_ON;
201
   RCC_OscInitStruct.HSEState = RCC_HSE_ON;
209
   {
209
   {
210
     /* Initialization Error */
210
     /* Initialization Error */
211
   }
211
   }
212
-  
212
+
213
   if(HAL_PWREx_EnableOverDrive() != HAL_OK)
213
   if(HAL_PWREx_EnableOverDrive() != HAL_OK)
214
   {
214
   {
215
     /* Initialization Error */
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
      clocks dividers */
219
      clocks dividers */
220
   RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2);
220
   RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2);
221
   RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
221
   RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
222
   RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
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
   if(HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5) != HAL_OK)
225
   if(HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5) != HAL_OK)
226
   {
226
   {
227
     /* Initialization Error */
227
     /* Initialization Error */

Loading…
Cancel
Save