andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix compilation for STM32F1 with no SDIO (#13366)

pull/1/head
jmz52 6 years ago
committed by Scott Lahteine
parent
e52bcc9408
commit
013bb469ca
2 changed files with 68 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Marlin/src/HAL/HAL_STM32F1/HAL_sdio_STM32F1.cpp
  2. 119
      Marlin/src/HAL/HAL_STM32F1/u8g_com_stm32duino_fsmc.cpp

4
Marlin/src/HAL/HAL_STM32F1/HAL_sdio_STM32F1.cpp
View File

@ -21,7 +21,7 @@
* *
*/ */
#ifdef __STM32F1__ #if defined(__STM32F1__) && (defined(STM32_HIGH_DENSITY) || defined(STM32_XL_DENSITY))
#include "HAL_sdio_STM32F1.h" #include "HAL_sdio_STM32F1.h"
@ -264,4 +264,4 @@ bool SDIO_GetCmdResp7(void) {
return true; return true;
} }
#endif // __STM32F1__ #endif // __STM32F1__ && (STM32_HIGH_DENSITY || STM32_XL_DENSITY)

119
Marlin/src/HAL/HAL_STM32F1/u8g_com_stm32duino_fsmc.cpp
View File

@ -26,7 +26,7 @@
* Communication interface for FSMC * Communication interface for FSMC
*/ */
#if defined(STM32F1) || defined(STM32F1xx) #if (defined(STM32F1) || defined(STM32F1xx)) && (defined(STM32_HIGH_DENSITY) || defined(STM32_XL_DENSITY))
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"
@ -108,36 +108,43 @@ __attribute__((always_inline)) __STATIC_INLINE void __DSB(void) {
} }
#define FSMC_CS_NE1 PD7 #define FSMC_CS_NE1 PD7
#define FSMC_CS_NE2 PG9
#define FSMC_CS_NE3 PG10 #ifdef STM32_XL_DENSITY
#define FSMC_CS_NE4 PG12 #define FSMC_CS_NE2 PG9
#define FSMC_CS_NE3 PG10
#define FSMC_RS_A0 PF0 #define FSMC_CS_NE4 PG12
#define FSMC_RS_A1 PF1
#define FSMC_RS_A2 PF2 #define FSMC_RS_A0 PF0
#define FSMC_RS_A3 PF3 #define FSMC_RS_A1 PF1
#define FSMC_RS_A4 PF4 #define FSMC_RS_A2 PF2
#define FSMC_RS_A5 PF5 #define FSMC_RS_A3 PF3
#define FSMC_RS_A6 PF12 #define FSMC_RS_A4 PF4
#define FSMC_RS_A7 PF13 #define FSMC_RS_A5 PF5
#define FSMC_RS_A8 PF14 #define FSMC_RS_A6 PF12
#define FSMC_RS_A9 PF15 #define FSMC_RS_A7 PF13
#define FSMC_RS_A10 PG0 #define FSMC_RS_A8 PF14
#define FSMC_RS_A11 PG1 #define FSMC_RS_A9 PF15
#define FSMC_RS_A12 PG2 #define FSMC_RS_A10 PG0
#define FSMC_RS_A13 PG3 #define FSMC_RS_A11 PG1
#define FSMC_RS_A14 PG4 #define FSMC_RS_A12 PG2
#define FSMC_RS_A15 PG5 #define FSMC_RS_A13 PG3
#define FSMC_RS_A16 PD11 #define FSMC_RS_A14 PG4
#define FSMC_RS_A17 PD12 #define FSMC_RS_A15 PG5
#define FSMC_RS_A18 PD13 #endif
#define FSMC_RS_A19 PE3
#define FSMC_RS_A20 PE4 #define FSMC_RS_A16 PD11
#define FSMC_RS_A21 PE5 #define FSMC_RS_A17 PD12
#define FSMC_RS_A22 PE6 #define FSMC_RS_A18 PD13
#define FSMC_RS_A23 PE2 #define FSMC_RS_A19 PE3
#define FSMC_RS_A24 PG13 #define FSMC_RS_A20 PE4
#define FSMC_RS_A25 PG14 #define FSMC_RS_A21 PE5
#define FSMC_RS_A22 PE6
#define FSMC_RS_A23 PE2
#ifdef STM32_XL_DENSITY
#define FSMC_RS_A24 PG13
#define FSMC_RS_A25 PG14
#endif
static uint8_t fsmcInit = 0; static uint8_t fsmcInit = 0;
@ -156,31 +163,35 @@ void LCD_IO_Init(uint8_t cs, uint8_t rs) {
switch (cs) { switch (cs) {
case FSMC_CS_NE1: controllerAddress = (uint32_t)FSMC_NOR_PSRAM_REGION1; break; case FSMC_CS_NE1: controllerAddress = (uint32_t)FSMC_NOR_PSRAM_REGION1; break;
case FSMC_CS_NE2: controllerAddress = (uint32_t)FSMC_NOR_PSRAM_REGION2; break; #ifdef STM32_XL_DENSITY
case FSMC_CS_NE3: controllerAddress = (uint32_t)FSMC_NOR_PSRAM_REGION3; break; case FSMC_CS_NE2: controllerAddress = (uint32_t)FSMC_NOR_PSRAM_REGION2; break;
case FSMC_CS_NE4: controllerAddress = (uint32_t)FSMC_NOR_PSRAM_REGION4; break; case FSMC_CS_NE3: controllerAddress = (uint32_t)FSMC_NOR_PSRAM_REGION3; break;
case FSMC_CS_NE4: controllerAddress = (uint32_t)FSMC_NOR_PSRAM_REGION4; break;
#endif
default: return; default: return;
} }
#define _ORADDR(N) controllerAddress |= (_BV32(N) - 2) #define _ORADDR(N) controllerAddress |= (_BV32(N) - 2)
switch (rs) { switch (rs) {
case FSMC_RS_A0: _ORADDR( 1); break; #ifdef STM32_XL_DENSITY
case FSMC_RS_A1: _ORADDR( 2); break; case FSMC_RS_A0: _ORADDR( 1); break;
case FSMC_RS_A2: _ORADDR( 3); break; case FSMC_RS_A1: _ORADDR( 2); break;
case FSMC_RS_A3: _ORADDR( 4); break; case FSMC_RS_A2: _ORADDR( 3); break;
case FSMC_RS_A4: _ORADDR( 5); break; case FSMC_RS_A3: _ORADDR( 4); break;
case FSMC_RS_A5: _ORADDR( 6); break; case FSMC_RS_A4: _ORADDR( 5); break;
case FSMC_RS_A6: _ORADDR( 7); break; case FSMC_RS_A5: _ORADDR( 6); break;
case FSMC_RS_A7: _ORADDR( 8); break; case FSMC_RS_A6: _ORADDR( 7); break;
case FSMC_RS_A8: _ORADDR( 9); break; case FSMC_RS_A7: _ORADDR( 8); break;
case FSMC_RS_A9: _ORADDR(10); break; case FSMC_RS_A8: _ORADDR( 9); break;
case FSMC_RS_A10: _ORADDR(11); break; case FSMC_RS_A9: _ORADDR(10); break;
case FSMC_RS_A11: _ORADDR(12); break; case FSMC_RS_A10: _ORADDR(11); break;
case FSMC_RS_A12: _ORADDR(13); break; case FSMC_RS_A11: _ORADDR(12); break;
case FSMC_RS_A13: _ORADDR(14); break; case FSMC_RS_A12: _ORADDR(13); break;
case FSMC_RS_A14: _ORADDR(15); break; case FSMC_RS_A13: _ORADDR(14); break;
case FSMC_RS_A15: _ORADDR(16); break; case FSMC_RS_A14: _ORADDR(15); break;
case FSMC_RS_A15: _ORADDR(16); break;
#endif
case FSMC_RS_A16: _ORADDR(17); break; case FSMC_RS_A16: _ORADDR(17); break;
case FSMC_RS_A17: _ORADDR(18); break; case FSMC_RS_A17: _ORADDR(18); break;
case FSMC_RS_A18: _ORADDR(19); break; case FSMC_RS_A18: _ORADDR(19); break;
@ -189,8 +200,10 @@ void LCD_IO_Init(uint8_t cs, uint8_t rs) {
case FSMC_RS_A21: _ORADDR(22); break; case FSMC_RS_A21: _ORADDR(22); break;
case FSMC_RS_A22: _ORADDR(23); break; case FSMC_RS_A22: _ORADDR(23); break;
case FSMC_RS_A23: _ORADDR(24); break; case FSMC_RS_A23: _ORADDR(24); break;
case FSMC_RS_A24: _ORADDR(25); break; #ifdef STM32_XL_DENSITY
case FSMC_RS_A25: _ORADDR(26); break; case FSMC_RS_A24: _ORADDR(25); break;
case FSMC_RS_A25: _ORADDR(26); break;
#endif
default: return; default: return;
} }
@ -254,4 +267,4 @@ uint32_t LCD_IO_ReadData(uint16_t RegValue, uint8_t ReadSize) {
#endif // HAS_GRAPHICAL_LCD #endif // HAS_GRAPHICAL_LCD
#endif // STM32F1 || STM32F1xx #endif // (STM32F1 || STM32F1xx) && (STM32_HIGH_DENSITY || STM32_XL_DENSITY)

Write Preview
Loading…
Cancel
Save