MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

🎨 Misc. code cleanup

Browse Source
This commit is contained in:
Scott Lahteine 2021-11-07 01:11:51 -06:00 committed by Scott Lahteine
parent 0273a68587
commit 6f9f25dbb2
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/src/MarlinCore.cpp
View File

@ -1554,6 +1554,7 @@ void setup() {
#endif #endif
#if HAS_DWIN_E3V2_BASIC #if HAS_DWIN_E3V2_BASIC
SETUP_LOG("E3V2 Init");
Encoder_Configuration(); Encoder_Configuration();
HMI_Init(); HMI_Init();
HMI_SetLanguageCache(); HMI_SetLanguageCache();
@ -1562,7 +1563,7 @@ void setup() {
#endif #endif
#if HAS_SERVICE_INTERVALS && !HAS_DWIN_E3V2_BASIC #if HAS_SERVICE_INTERVALS && !HAS_DWIN_E3V2_BASIC
ui.reset_status(true); // Show service messages or keep current status SETUP_RUN(ui.reset_status(true)); // Show service messages or keep current status
#endif #endif
#if ENABLED(MAX7219_DEBUG) #if ENABLED(MAX7219_DEBUG)
@ -1593,7 +1594,7 @@ void setup() {
#endif #endif
#if BOTH(HAS_LCD_MENU, TOUCH_SCREEN_CALIBRATION) && EITHER(TFT_CLASSIC_UI, TFT_COLOR_UI) #if BOTH(HAS_LCD_MENU, TOUCH_SCREEN_CALIBRATION) && EITHER(TFT_CLASSIC_UI, TFT_COLOR_UI)
ui.check_touch_calibration(); SETUP_RUN(ui.check_touch_calibration());
#endif #endif
marlin_state = MF_RUNNING; marlin_state = MF_RUNNING;

2
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
union TwoBytesToInt16 { uint8_t bytes[2]; int16_t integervalue; }; union TwoBytesToInt16 { uint8_t bytes[2]; int16_t integervalue; };
TwoBytesToInt16 ConversionUnion; TwoBytesToInt16 ConversionUnion;
echoprefix(bytes, pref, adr); echoprefix(bytes, pref, adr);
while (bytes-- && Wire.available()) { while (bytes-- && Wire.available()) {
int value = Wire.read(); int value = Wire.read();

4
Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h
View File

@ -54,7 +54,7 @@
// //
// Limit Switches // Limit Switches
// //
#define X_STOP_PIN PD8 #define X_STOP_PIN PD8
#define Y_STOP_PIN PD15 #define Y_STOP_PIN PD15
#define Z_MIN_PIN PA11 #define Z_MIN_PIN PA11
@ -173,7 +173,7 @@
#define LCD_PINS_D5 PE7 #define LCD_PINS_D5 PE7
#define LCD_PINS_D6 PB2 #define LCD_PINS_D6 PB2
#define LCD_PINS_D7 PB1 #define LCD_PINS_D7 PB1
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder #define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif #endif

18
buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.cpp
View File

@ -190,12 +190,12 @@ WEAK void SystemClock_Config(void)
/* Enable Power Control clock */ /* Enable Power Control clock */
__HAL_RCC_PWR_CLK_ENABLE(); __HAL_RCC_PWR_CLK_ENABLE();
/* The voltage scaling allows optimizing the power consumption when the device is /* The voltage scaling allows optimizing the power consumption when the device is
clocked below the maximum system frequency, to update the voltage scaling value clocked below the maximum system frequency, to update the voltage scaling value
regarding system frequency refer to product datasheet. */ regarding system frequency refer to product datasheet. */
__HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
/* Enable HSE Oscillator and activate PLL with HSE as source */ /* Enable HSE Oscillator and activate PLL with HSE as source */
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE; RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
RCC_OscInitStruct.HSEState = RCC_HSE_ON; RCC_OscInitStruct.HSEState = RCC_HSE_ON;
@ -209,19 +209,19 @@ WEAK void SystemClock_Config(void)
{ {
/* Initialization Error */ /* Initialization Error */
} }
if(HAL_PWREx_EnableOverDrive() != HAL_OK) if(HAL_PWREx_EnableOverDrive() != HAL_OK)
{ {
/* Initialization Error */ /* Initialization Error */
} }
/* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2 /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2
clocks dividers */ clocks dividers */
RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2); RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2);
RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK; RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4; RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;
RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2; RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;
if(HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5) != HAL_OK) if(HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5) != HAL_OK)
{ {
/* Initialization Error */ /* Initialization Error */