Style, spacing, typo cleanup for recent changes
This commit is contained in:
parent
91e9599554
commit
ad7fe15154
|
@ -53,5 +53,5 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI) && NOT_TARGET(STM32F4xx, STM32F1xx)
|
#if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI) && NOT_TARGET(STM32F4xx, STM32F1xx)
|
||||||
#error "TFT_COLOR_UI, TFT_LVGL_UI and TFT_CLASSIC_U are currently only supported on STM32F4 and STM32F1 hardware."
|
#error "TFT_COLOR_UI, TFT_LVGL_UI and TFT_CLASSIC_UI are currently only supported on STM32F4 and STM32F1 hardware."
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -141,8 +141,7 @@ uint8_t get_pin_mode(const pin_t Ard_num) {
|
||||||
uint32_t ll_pin = STM_LL_GPIO_PIN(dp);
|
uint32_t ll_pin = STM_LL_GPIO_PIN(dp);
|
||||||
GPIO_TypeDef *port = get_GPIO_Port(STM_PORT(dp));
|
GPIO_TypeDef *port = get_GPIO_Port(STM_PORT(dp));
|
||||||
uint32_t mode = LL_GPIO_GetPinMode(port, ll_pin);
|
uint32_t mode = LL_GPIO_GetPinMode(port, ll_pin);
|
||||||
switch (mode)
|
switch (mode) {
|
||||||
{
|
|
||||||
case LL_GPIO_MODE_ANALOG: return MODE_PIN_ANALOG;
|
case LL_GPIO_MODE_ANALOG: return MODE_PIN_ANALOG;
|
||||||
case LL_GPIO_MODE_INPUT: return MODE_PIN_INPUT;
|
case LL_GPIO_MODE_INPUT: return MODE_PIN_INPUT;
|
||||||
case LL_GPIO_MODE_OUTPUT: return MODE_PIN_OUTPUT;
|
case LL_GPIO_MODE_OUTPUT: return MODE_PIN_OUTPUT;
|
||||||
|
|
|
@ -40,8 +40,7 @@ void TFT_SPI::Init() {
|
||||||
if ((spiInstance = (SPI_TypeDef *)pinmap_peripheral(digitalPinToPinName(TFT_SCK_PIN), PinMap_SPI_SCLK)) == NP) return;
|
if ((spiInstance = (SPI_TypeDef *)pinmap_peripheral(digitalPinToPinName(TFT_SCK_PIN), PinMap_SPI_SCLK)) == NP) return;
|
||||||
if (spiInstance != (SPI_TypeDef *)pinmap_peripheral(digitalPinToPinName(TFT_MOSI_PIN), PinMap_SPI_MOSI)) return;
|
if (spiInstance != (SPI_TypeDef *)pinmap_peripheral(digitalPinToPinName(TFT_MOSI_PIN), PinMap_SPI_MOSI)) return;
|
||||||
|
|
||||||
#if PIN_EXISTS(TFT_MISO)
|
#if PIN_EXISTS(TFT_MISO) && TFT_MISO_PIN != TFT_MOSI_PIN
|
||||||
if (TFT_MISO_PIN != TFT_MOSI_PIN)
|
|
||||||
if (spiInstance != (SPI_TypeDef *)pinmap_peripheral(digitalPinToPinName(TFT_MISO_PIN), PinMap_SPI_MISO)) return;
|
if (spiInstance != (SPI_TypeDef *)pinmap_peripheral(digitalPinToPinName(TFT_MISO_PIN), PinMap_SPI_MISO)) return;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -49,10 +48,7 @@ void TFT_SPI::Init() {
|
||||||
SPIx.State = HAL_SPI_STATE_RESET;
|
SPIx.State = HAL_SPI_STATE_RESET;
|
||||||
SPIx.Init.NSS = SPI_NSS_SOFT;
|
SPIx.Init.NSS = SPI_NSS_SOFT;
|
||||||
SPIx.Init.Mode = SPI_MODE_MASTER;
|
SPIx.Init.Mode = SPI_MODE_MASTER;
|
||||||
if (TFT_MISO_PIN == TFT_MOSI_PIN)
|
SPIx.Init.Direction = (TFT_MISO_PIN == TFT_MOSI_PIN) ? SPI_DIRECTION_1LINE : SPI_DIRECTION_2LINES;
|
||||||
SPIx.Init.Direction = SPI_DIRECTION_1LINE;
|
|
||||||
else
|
|
||||||
SPIx.Init.Direction = SPI_DIRECTION_2LINES;
|
|
||||||
SPIx.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_2;
|
SPIx.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_2;
|
||||||
SPIx.Init.CLKPhase = SPI_PHASE_1EDGE;
|
SPIx.Init.CLKPhase = SPI_PHASE_1EDGE;
|
||||||
SPIx.Init.CLKPolarity = SPI_POLARITY_LOW;
|
SPIx.Init.CLKPolarity = SPI_POLARITY_LOW;
|
||||||
|
@ -64,8 +60,7 @@ void TFT_SPI::Init() {
|
||||||
|
|
||||||
pinmap_pinout(digitalPinToPinName(TFT_SCK_PIN), PinMap_SPI_SCLK);
|
pinmap_pinout(digitalPinToPinName(TFT_SCK_PIN), PinMap_SPI_SCLK);
|
||||||
pinmap_pinout(digitalPinToPinName(TFT_MOSI_PIN), PinMap_SPI_MOSI);
|
pinmap_pinout(digitalPinToPinName(TFT_MOSI_PIN), PinMap_SPI_MOSI);
|
||||||
#if PIN_EXISTS(TFT_MISO)
|
#if PIN_EXISTS(TFT_MISO) && TFT_MISO_PIN != TFT_MOSI_PIN
|
||||||
if (TFT_MISO_PIN != TFT_MOSI_PIN)
|
|
||||||
pinmap_pinout(digitalPinToPinName(TFT_MISO_PIN), PinMap_SPI_MISO);
|
pinmap_pinout(digitalPinToPinName(TFT_MISO_PIN), PinMap_SPI_MISO);
|
||||||
#endif
|
#endif
|
||||||
pin_PullConfig(get_GPIO_Port(STM_PORT(digitalPinToPinName(TFT_SCK_PIN))), STM_LL_GPIO_PIN(digitalPinToPinName(TFT_SCK_PIN)), GPIO_PULLDOWN);
|
pin_PullConfig(get_GPIO_Port(STM_PORT(digitalPinToPinName(TFT_SCK_PIN))), STM_LL_GPIO_PIN(digitalPinToPinName(TFT_SCK_PIN)), GPIO_PULLDOWN);
|
||||||
|
@ -119,7 +114,7 @@ void TFT_SPI::Init() {
|
||||||
DMAtx.Init.MemDataAlignment = DMA_MDATAALIGN_HALFWORD;
|
DMAtx.Init.MemDataAlignment = DMA_MDATAALIGN_HALFWORD;
|
||||||
DMAtx.Init.Mode = DMA_NORMAL;
|
DMAtx.Init.Mode = DMA_NORMAL;
|
||||||
DMAtx.Init.Priority = DMA_PRIORITY_LOW;
|
DMAtx.Init.Priority = DMA_PRIORITY_LOW;
|
||||||
#if defined(STM32F4xx)
|
#ifdef STM32F4xx
|
||||||
DMAtx.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
|
DMAtx.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -140,11 +135,10 @@ uint32_t TFT_SPI::GetID() {
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t TFT_SPI::ReadID(uint16_t Reg) {
|
uint32_t TFT_SPI::ReadID(uint16_t Reg) {
|
||||||
#if !PIN_EXISTS(TFT_MISO)
|
uint32_t Data = 0;
|
||||||
return 0;
|
#if PIN_EXISTS(TFT_MISO)
|
||||||
#else
|
|
||||||
uint32_t BaudRatePrescaler = SPIx.Init.BaudRatePrescaler;
|
uint32_t BaudRatePrescaler = SPIx.Init.BaudRatePrescaler;
|
||||||
uint32_t i, Data = 0;
|
uint32_t i;
|
||||||
|
|
||||||
SPIx.Init.BaudRatePrescaler = SPIx.Instance == SPI1 ? SPI_BAUDRATEPRESCALER_8 : SPI_BAUDRATEPRESCALER_4;
|
SPIx.Init.BaudRatePrescaler = SPIx.Instance == SPI1 ? SPI_BAUDRATEPRESCALER_8 : SPI_BAUDRATEPRESCALER_4;
|
||||||
DataTransferBegin(DATASIZE_8BIT);
|
DataTransferBegin(DATASIZE_8BIT);
|
||||||
|
@ -154,12 +148,12 @@ uint32_t TFT_SPI::ReadID(uint16_t Reg) {
|
||||||
__HAL_SPI_ENABLE(&SPIx);
|
__HAL_SPI_ENABLE(&SPIx);
|
||||||
|
|
||||||
for (i = 0; i < 4; i++) {
|
for (i = 0; i < 4; i++) {
|
||||||
if (TFT_MISO_PIN != TFT_MOSI_PIN) {
|
#if TFT_MISO_PIN != TFT_MOSI_PIN
|
||||||
//if (hspi->Init.Direction == SPI_DIRECTION_2LINES) {
|
//if (hspi->Init.Direction == SPI_DIRECTION_2LINES) {
|
||||||
while ((SPIx.Instance->SR & SPI_FLAG_TXE) != SPI_FLAG_TXE) {}
|
while ((SPIx.Instance->SR & SPI_FLAG_TXE) != SPI_FLAG_TXE) {}
|
||||||
SPIx.Instance->DR = 0;
|
SPIx.Instance->DR = 0;
|
||||||
//}
|
//}
|
||||||
}
|
#endif
|
||||||
while ((SPIx.Instance->SR & SPI_FLAG_RXNE) != SPI_FLAG_RXNE) {}
|
while ((SPIx.Instance->SR & SPI_FLAG_RXNE) != SPI_FLAG_RXNE) {}
|
||||||
Data = (Data << 8) | SPIx.Instance->DR;
|
Data = (Data << 8) | SPIx.Instance->DR;
|
||||||
}
|
}
|
||||||
|
@ -168,9 +162,9 @@ uint32_t TFT_SPI::ReadID(uint16_t Reg) {
|
||||||
DataTransferEnd();
|
DataTransferEnd();
|
||||||
|
|
||||||
SPIx.Init.BaudRatePrescaler = BaudRatePrescaler;
|
SPIx.Init.BaudRatePrescaler = BaudRatePrescaler;
|
||||||
|
#endif
|
||||||
|
|
||||||
return Data >> 7;
|
return Data >> 7;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool TFT_SPI::isBusy() {
|
bool TFT_SPI::isBusy() {
|
||||||
|
@ -183,9 +177,8 @@ bool TFT_SPI::isBusy() {
|
||||||
if (__HAL_DMA_GET_FLAG(&DMAtx, __HAL_DMA_GET_TC_FLAG_INDEX(&DMAtx)) != 0 || __HAL_DMA_GET_FLAG(&DMAtx, __HAL_DMA_GET_TE_FLAG_INDEX(&DMAtx)) != 0)
|
if (__HAL_DMA_GET_FLAG(&DMAtx, __HAL_DMA_GET_TC_FLAG_INDEX(&DMAtx)) != 0 || __HAL_DMA_GET_FLAG(&DMAtx, __HAL_DMA_GET_TE_FLAG_INDEX(&DMAtx)) != 0)
|
||||||
Abort();
|
Abort();
|
||||||
}
|
}
|
||||||
else {
|
else
|
||||||
Abort();
|
Abort();
|
||||||
}
|
|
||||||
return dmaEnabled;
|
return dmaEnabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
/**
|
/**
|
||||||
* Marlin 3D Printer Firmware
|
* Marlin 3D Printer Firmware
|
||||||
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
*
|
*
|
||||||
* Based on Sprinter and grbl.
|
* Based on Sprinter and grbl.
|
||||||
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
|
|
@ -129,7 +129,8 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAS_BTT_EXP_MOT
|
#if HAS_BTT_EXP_MOT
|
||||||
/* _____ _____
|
|
||||||
|
/** _____ _____
|
||||||
* NC | · · | GND NC | · · | GND
|
* NC | · · | GND NC | · · | GND
|
||||||
* NC | · · | 1.31 (M1EN) (M2EN) 1.23 | · · | 1.22 (M3EN)
|
* NC | · · | 1.31 (M1EN) (M2EN) 1.23 | · · | 1.22 (M3EN)
|
||||||
* (M1STP) 0.18 | · · 3.25 (M1DIR) (M1RX) 1.21 | · · 1.20 (M1DIAG)
|
* (M1STP) 0.18 | · · 3.25 (M1DIR) (M1RX) 1.21 | · · 1.20 (M1DIAG)
|
||||||
|
@ -153,6 +154,7 @@
|
||||||
#define E2_SERIAL_RX_PIN EXPA1_05_PIN
|
#define E2_SERIAL_RX_PIN EXPA1_05_PIN
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// M2 on Driver Expansion Module
|
// M2 on Driver Expansion Module
|
||||||
#define E3_STEP_PIN EXPA2_08_PIN
|
#define E3_STEP_PIN EXPA2_08_PIN
|
||||||
#define E3_DIR_PIN EXPA2_07_PIN
|
#define E3_DIR_PIN EXPA2_07_PIN
|
||||||
|
@ -167,6 +169,7 @@
|
||||||
#else
|
#else
|
||||||
#define E3_ENABLE_PIN EXPA2_04_PIN
|
#define E3_ENABLE_PIN EXPA2_04_PIN
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// M3 on Driver Expansion Module
|
// M3 on Driver Expansion Module
|
||||||
#define E4_STEP_PIN EXPA2_10_PIN
|
#define E4_STEP_PIN EXPA2_10_PIN
|
||||||
#define E4_DIR_PIN EXPA2_09_PIN
|
#define E4_DIR_PIN EXPA2_09_PIN
|
||||||
|
@ -181,4 +184,5 @@
|
||||||
#else
|
#else
|
||||||
#define E4_ENABLE_PIN EXPA2_04_PIN
|
#define E4_ENABLE_PIN EXPA2_04_PIN
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // HAS_BTT_EXP_MOT
|
#endif // HAS_BTT_EXP_MOT
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
/**
|
/**
|
||||||
* Marlin 3D Printer Firmware
|
* Marlin 3D Printer Firmware
|
||||||
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
*
|
*
|
||||||
* Based on Sprinter and grbl.
|
* Based on Sprinter and grbl.
|
||||||
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
/**
|
/**
|
||||||
* Marlin 3D Printer Firmware
|
* Marlin 3D Printer Firmware
|
||||||
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
*
|
*
|
||||||
* Based on Sprinter and grbl.
|
* Based on Sprinter and grbl.
|
||||||
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
/**
|
/**
|
||||||
* Marlin 3D Printer Firmware
|
* Marlin 3D Printer Firmware
|
||||||
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
*
|
*
|
||||||
* Based on Sprinter and grbl.
|
* Based on Sprinter and grbl.
|
||||||
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
/**
|
/**
|
||||||
* Marlin 3D Printer Firmware
|
* Marlin 3D Printer Firmware
|
||||||
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
*
|
*
|
||||||
* Based on Sprinter and grbl.
|
* Based on Sprinter and grbl.
|
||||||
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
/**
|
/**
|
||||||
* Marlin 3D Printer Firmware
|
* Marlin 3D Printer Firmware
|
||||||
* Copyright (C) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
*
|
*
|
||||||
* Based on Sprinter and grbl.
|
* Based on Sprinter and grbl.
|
||||||
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -16,7 +16,7 @@
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
Loading…
Reference in a new issue