thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Minor HAL cleanup

Scott Lahteine 4 years ago
parent
40fdf8f087
commit
bc7720c0cd
7 changed files with 135 additions and 126 deletions
Split View Show Diff Stats
  1. 1
    1
      Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
  2. 1
    1
      Marlin/src/HAL/STM32F1/SoftwareSerial.cpp
  3. 1
    1
      Marlin/src/HAL/STM32_F4_F7/HAL_SPI.cpp
  4. 4
    2
      Marlin/src/HAL/TEENSY31_32/HAL.h
  5. 8
    3
      Marlin/src/HAL/TEENSY35_36/HAL.h
  6. 1
    1
      Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp
  7. 119
    117
      Marlin/src/HAL/shared/backtrace/unwmemaccess.cpp

+ 1
- 1
Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp View File 

@@ -147,4 +147,4 @@ uint8_t u8g_com_HAL_DUE_shared_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_va
147 147
148 148 
 #endif // HAS_GRAPHICAL_LCD
149 149
150 
-#endif //__SAM3X8E__
150 
+#endif // __SAM3X8E__

+ 1
- 1
Marlin/src/HAL/STM32F1/SoftwareSerial.cpp View File 

@@ -57,4 +57,4 @@ void SoftwareSerial::stopListening() {
57 57 
   listening = false;
58 58 
 }
59 59
60 
-#endif //__STM32F1__
60 
+#endif // __STM32F1__

+ 1
- 1
Marlin/src/HAL/STM32_F4_F7/HAL_SPI.cpp View File 

@@ -72,7 +72,7 @@ static SPISettings spiConfig;
72 72 
  */
73 73 
 void spiBegin() {
74 74 
   #if !defined(SS_PIN) || SS_PIN < 0
75 
-    #error SS_PIN not defined!
75 
+    #error "SS_PIN not defined!"
76 76 
   #endif
77 77
78 78 
   OUT_WRITE(SS_PIN, HIGH);

+ 4
- 2
Marlin/src/HAL/TEENSY31_32/HAL.h View File 

@@ -44,8 +44,10 @@
44 44 
 //#undef MOTHERBOARD
45 45 
 //#define MOTHERBOARD BOARD_TEENSY31_32
46 46
47 
-#define IS_32BIT_TEENSY defined(__MK20DX256__)
48 
-#define IS_TEENSY32 defined(__MK20DX256__)
47 
+#ifdef __MK20DX256__
48 
+  #define IS_32BIT_TEENSY 1
49 
+  #define IS_TEENSY32 1
50 
+#endif
49 51
50 52 
 #define NUM_SERIAL 1
51 53

+ 8
- 3
Marlin/src/HAL/TEENSY35_36/HAL.h View File 

@@ -45,9 +45,14 @@
45 45 
 // Defines
46 46 
 // ------------------------
47 47
48 
-#define IS_32BIT_TEENSY (defined(__MK64FX512__) || defined(__MK66FX1M0__))
49 
-#define IS_TEENSY35 defined(__MK64FX512__)
50 
-#define IS_TEENSY36 defined(__MK66FX1M0__)
48 
+#ifdef __MK64FX512__
49 
+  #define IS_32BIT_TEENSY 1
50 
+  #define IS_TEENSY35 1
51 
+#endif
52 
+#ifdef __MK66FX1M0__
53 
+  #define IS_32BIT_TEENSY 1
54 
+  #define IS_TEENSY36 1
55 
+#endif
51 56
52 57 
 #define NUM_SERIAL 1
53 58

+ 1
- 1
Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp View File 

@@ -31,7 +31,7 @@ static SPISettings spiConfig;
31 31
32 32 
 void spiBegin() {
33 33 
   #if !PIN_EXISTS(SS)
34 
-    #error SS_PIN not defined!
34 
+    #error "SS_PIN not defined!"
35 35 
   #endif
36 36 
   OUT_WRITE(SS_PIN, HIGH);
37 37 
   SET_OUTPUT(SCK_PIN);

+ 119
- 117
Marlin/src/HAL/shared/backtrace/unwmemaccess.cpp View File 

@@ -20,124 +20,126 @@
20 20 
 /* Validate address */
21 21
22 22 
 #ifdef ARDUINO_ARCH_SAM
23 
-// For DUE, valid address ranges are
24 
-//  SRAM  (0x20070000 - 0x20088000) (96kb)
25 
-//  FLASH (0x00080000 - 0x00100000) (512kb)
26 
-//
27 
-#define START_SRAM_ADDR   0x20070000
28 
-#define END_SRAM_ADDR     0x20088000
29 
-#define START_FLASH_ADDR  0x00080000
30 
-#define END_FLASH_ADDR    0x00100000
31 
-#endif
32 
-
33 
-#ifdef TARGET_LPC1768
34 
-// For LPC1769:
35 
-//  SRAM  (0x10000000 - 0x10008000) (32kb)
36 
-//  FLASH (0x00000000 - 0x00080000) (512kb)
37 
-//
38 
-#define START_SRAM_ADDR   0x10000000
39 
-#define END_SRAM_ADDR     0x10008000
40 
-#define START_FLASH_ADDR  0x00000000
41 
-#define END_FLASH_ADDR    0x00080000
42 
-#endif
43 
-
44 
-#if 0
45 
-// For STM32F103CBT6
46 
-//  SRAM  (0x20000000 - 0x20005000) (20kb)
47 
-//  FLASH (0x00000000 - 0x00020000) (128kb)
48 
-//
49 
-#define START_SRAM_ADDR   0x20000000
50 
-#define END_SRAM_ADDR     0x20005000
51 
-#define START_FLASH_ADDR  0x00000000
52 
-#define END_FLASH_ADDR    0x00020000
53 
-#endif
54 23
55 
-#if defined(__STM32F1__) || defined(STM32F1xx) || defined(STM32F0xx)
56 
-// For STM32F103ZET6/STM32F103VET6/STM32F0xx
57 
-//  SRAM  (0x20000000 - 0x20010000) (64kb)
58 
-//  FLASH (0x00000000 - 0x00080000) (512kb)
59 
-//
60 
-#define START_SRAM_ADDR   0x20000000
61 
-#define END_SRAM_ADDR     0x20010000
62 
-#define START_FLASH_ADDR  0x00000000
63 
-#define END_FLASH_ADDR    0x00080000
64 
-#endif
65 
-
66 
-#if defined(STM32F4) || defined(STM32F4xx)
67 
-// For STM32F407VET
68 
-//  SRAM  (0x20000000 - 0x20030000) (192kb)
69 
-//  FLASH (0x08000000 - 0x08080000) (512kb)
70 
-//
71 
-#define START_SRAM_ADDR   0x20000000
72 
-#define END_SRAM_ADDR     0x20030000
73 
-#define START_FLASH_ADDR  0x08000000
74 
-#define END_FLASH_ADDR    0x08080000
75 
-#endif
76 
-
77 
-#if MB(THE_BORG)
78 
-// For STM32F765 in BORG
79 
-//  SRAM  (0x20000000 - 0x20080000) (512kb)
80 
-//  FLASH (0x08000000 - 0x08100000) (1024kb)
81 
-//
82 
-#define START_SRAM_ADDR   0x20000000
83 
-#define END_SRAM_ADDR     0x20080000
84 
-#define START_FLASH_ADDR  0x08000000
85 
-#define END_FLASH_ADDR    0x08100000
86 
-#endif
24 
+  // For DUE, valid address ranges are
25 
+  //  SRAM  (0x20070000 - 0x20088000) (96kb)
26 
+  //  FLASH (0x00080000 - 0x00100000) (512kb)
27 
+  //
28 
+  #define START_SRAM_ADDR   0x20070000
29 
+  #define END_SRAM_ADDR     0x20088000
30 
+  #define START_FLASH_ADDR  0x00080000
31 
+  #define END_FLASH_ADDR    0x00100000
32 
+
33 
+#elif defined(TARGET_LPC1768)
34 
+
35 
+  // For LPC1769:
36 
+  //  SRAM  (0x10000000 - 0x10008000) (32kb)
37 
+  //  FLASH (0x00000000 - 0x00080000) (512kb)
38 
+  //
39 
+  #define START_SRAM_ADDR   0x10000000
40 
+  #define END_SRAM_ADDR     0x10008000
41 
+  #define START_FLASH_ADDR  0x00000000
42 
+  #define END_FLASH_ADDR    0x00080000
43 
+
44 
+#elif 0
45 
+
46 
+  // For STM32F103CBT6
47 
+  //  SRAM  (0x20000000 - 0x20005000) (20kb)
48 
+  //  FLASH (0x00000000 - 0x00020000) (128kb)
49 
+  //
50 
+  #define START_SRAM_ADDR   0x20000000
51 
+  #define END_SRAM_ADDR     0x20005000
52 
+  #define START_FLASH_ADDR  0x00000000
53 
+  #define END_FLASH_ADDR    0x00020000
54 
+
55 
+#elif defined(__STM32F1__) || defined(STM32F1xx) || defined(STM32F0xx)
56 
+
57 
+  // For STM32F103ZET6/STM32F103VET6/STM32F0xx
58 
+  //  SRAM  (0x20000000 - 0x20010000) (64kb)
59 
+  //  FLASH (0x00000000 - 0x00080000) (512kb)
60 
+  //
61 
+  #define START_SRAM_ADDR   0x20000000
62 
+  #define END_SRAM_ADDR     0x20010000
63 
+  #define START_FLASH_ADDR  0x00000000
64 
+  #define END_FLASH_ADDR    0x00080000
65 
+
66 
+#elif defined(STM32F4) || defined(STM32F4xx)
67 
+
68 
+  // For STM32F407VET
69 
+  //  SRAM  (0x20000000 - 0x20030000) (192kb)
70 
+  //  FLASH (0x08000000 - 0x08080000) (512kb)
71 
+  //
72 
+  #define START_SRAM_ADDR   0x20000000
73 
+  #define END_SRAM_ADDR     0x20030000
74 
+  #define START_FLASH_ADDR  0x08000000
75 
+  #define END_FLASH_ADDR    0x08080000
76 
+
77 
+#elif MB(THE_BORG)
78 
+
79 
+  // For STM32F765 in BORG
80 
+  //  SRAM  (0x20000000 - 0x20080000) (512kb)
81 
+  //  FLASH (0x08000000 - 0x08100000) (1024kb)
82 
+  //
83 
+  #define START_SRAM_ADDR   0x20000000
84 
+  #define END_SRAM_ADDR     0x20080000
85 
+  #define START_FLASH_ADDR  0x08000000
86 
+  #define END_FLASH_ADDR    0x08100000
87 
+
88 
+#elif MB(REMRAM_V1)
89 
+
90 
+  // For STM32F765VI in RemRam v1
91 
+  //  SRAM  (0x20000000 - 0x20080000) (512kb)
92 
+  //  FLASH (0x08000000 - 0x08200000) (2048kb)
93 
+  //
94 
+  #define START_SRAM_ADDR   0x20000000
95 
+  #define END_SRAM_ADDR     0x20080000
96 
+  #define START_FLASH_ADDR  0x08000000
97 
+  #define END_FLASH_ADDR    0x08200000
98 
+
99 
+#elif defined(__MK20DX256__)
100 
+
101 
+  // For MK20DX256 in TEENSY 3.1 or TEENSY 3.2
102 
+  //  SRAM  (0x1FFF8000 - 0x20008000) (64kb)
103 
+  //  FLASH (0x00000000 - 0x00040000) (256kb)
104 
+  //
105 
+  #define START_SRAM_ADDR   0x1FFF8000
106 
+  #define END_SRAM_ADDR     0x20008000
107 
+  #define START_FLASH_ADDR  0x00000000
108 
+  #define END_FLASH_ADDR    0x00040000
109 
+
110 
+#elif defined(__MK64FX512__)
111 
+
112 
+  // For MK64FX512 in TEENSY 3.5
113 
+  //  SRAM  (0x1FFF0000 - 0x20020000) (192kb)
114 
+  //  FLASH (0x00000000 - 0x00080000) (512kb)
115 
+  //
116 
+  #define START_SRAM_ADDR   0x1FFF0000
117 
+  #define END_SRAM_ADDR     0x20020000
118 
+  #define START_FLASH_ADDR  0x00000000
119 
+  #define END_FLASH_ADDR    0x00080000
120 
+
121 
+#elif defined(__MK66FX1M0__)
122 
+
123 
+  // For MK66FX1M0 in TEENSY 3.6
124 
+  //  SRAM  (0x1FFF0000 - 0x20030000) (256kb)
125 
+  //  FLASH (0x00000000 - 0x00140000) (1.25Mb)
126 
+  //
127 
+  #define START_SRAM_ADDR   0x1FFF0000
128 
+  #define END_SRAM_ADDR     0x20030000
129 
+  #define START_FLASH_ADDR  0x00000000
130 
+  #define END_FLASH_ADDR    0x00140000
131 
+
132 
+#elif defined(__SAMD51P20A__)
133 
+
134 
+  // For SAMD51x20, valid address ranges are
135 
+  //  SRAM  (0x20000000 - 0x20040000) (256kb)
136 
+  //  FLASH (0x00000000 - 0x00100000) (1024kb)
137 
+  //
138 
+  #define START_SRAM_ADDR   0x20000000
139 
+  #define END_SRAM_ADDR     0x20040000
140 
+  #define START_FLASH_ADDR  0x00000000
141 
+  #define END_FLASH_ADDR    0x00100000
87 142
88 
-#if MB(REMRAM_V1)
89 
-// For STM32F765VI in RemRam v1
90 
-//  SRAM  (0x20000000 - 0x20080000) (512kb)
91 
-//  FLASH (0x08000000 - 0x08200000) (2048kb)
92 
-//
93 
-#define START_SRAM_ADDR   0x20000000
94 
-#define END_SRAM_ADDR     0x20080000
95 
-#define START_FLASH_ADDR  0x08000000
96 
-#define END_FLASH_ADDR    0x08200000
97 
-#endif
98 
-
99 
-#ifdef __MK20DX256__
100 
-// For MK20DX256 in TEENSY 3.1 or TEENSY 3.2
101 
-//  SRAM  (0x1FFF8000 - 0x20008000) (64kb)
102 
-//  FLASH (0x00000000 - 0x00040000) (256kb)
103 
-//
104 
-#define START_SRAM_ADDR   0x1FFF8000
105 
-#define END_SRAM_ADDR     0x20008000
106 
-#define START_FLASH_ADDR  0x00000000
107 
-#define END_FLASH_ADDR    0x00040000
108 
-#endif
109 
-
110 
-#ifdef __MK64FX512__
111 
-// For MK64FX512 in TEENSY 3.5
112 
-//  SRAM  (0x1FFF0000 - 0x20020000) (192kb)
113 
-//  FLASH (0x00000000 - 0x00080000) (512kb)
114 
-//
115 
-#define START_SRAM_ADDR   0x1FFF0000
116 
-#define END_SRAM_ADDR     0x20020000
117 
-#define START_FLASH_ADDR  0x00000000
118 
-#define END_FLASH_ADDR    0x00080000
119 
-#endif
120 
-
121 
-#ifdef __MK66FX1M0__
122 
-// For MK66FX1M0 in TEENSY 3.6
123 
-//  SRAM  (0x1FFF0000 - 0x20030000) (256kb)
124 
-//  FLASH (0x00000000 - 0x00140000) (1.25Mb)
125 
-//
126 
-#define START_SRAM_ADDR   0x1FFF0000
127 
-#define END_SRAM_ADDR     0x20030000
128 
-#define START_FLASH_ADDR  0x00000000
129 
-#define END_FLASH_ADDR    0x00140000
130 
-#endif
131 
-
132 
-#ifdef __SAMD51P20A__
133 
-// For SAMD51x20, valid address ranges are
134 
-//  SRAM  (0x20000000 - 0x20040000) (256kb)
135 
-//  FLASH (0x00000000 - 0x00100000) (1024kb)
136 
-//
137 
-#define START_SRAM_ADDR   0x20000000
138 
-#define END_SRAM_ADDR     0x20040000
139 
-#define START_FLASH_ADDR  0x00000000
140 
-#define END_FLASH_ADDR    0x00100000
141 143 
 #endif
142 144
143 145 
 static bool validate_addr(uint32_t addr) {
 
@@ -177,4 +179,4 @@ bool UnwReadB(const uint32_t a, uint8_t *v) {
177 179 
   return true;
178 180 
 }
179 181
180 
-#endif
182 
+#endif // __arm__ || __thumb__

Write Preview
Loading…
Cancel
Save