Scott Lahteine 6 lat temu
rodzic
commit
631d867dc9

+ 0
- 2
Marlin/src/HAL/HAL_DUE/HAL.h Wyświetl plik

@@ -112,10 +112,8 @@ uint8_t HAL_get_reset_source(void); // get reset reason
112 112
 
113 113
 // Write single byte to specified SPI channel
114 114
 void spiSend(uint32_t chan, byte b);
115
-
116 115
 // Write buffer to specified SPI channel
117 116
 void spiSend(uint32_t chan, const uint8_t* buf, size_t n);
118
-
119 117
 // Read single byte from specified SPI channel
120 118
 uint8_t spiRec(uint32_t chan);
121 119
 

+ 8
- 4
Marlin/src/HAL/HAL_STM32/HAL.h Wyświetl plik

@@ -176,7 +176,10 @@ static inline int freeMemory() {
176 176
   return &top - reinterpret_cast<char*>(_sbrk(0));
177 177
 }
178 178
 
179
+//
179 180
 // SPI: Extended functions which take a channel number (hardware SPI only)
181
+//
182
+
180 183
 /** Write single byte to specified SPI channel */
181 184
 void spiSend(uint32_t chan, byte b);
182 185
 /** Write buffer to specified SPI channel */
@@ -184,18 +187,19 @@ void spiSend(uint32_t chan, const uint8_t* buf, size_t n);
184 187
 /** Read single byte from specified SPI channel */
185 188
 uint8_t spiRec(uint32_t chan);
186 189
 
187
-
190
+//
188 191
 // EEPROM
192
+//
189 193
 
190
-/**
191
- * Wire library should work for i2c eeproms.
192
- */
194
+// Wire library should work for i2c EEPROMs
193 195
 void eeprom_write_byte(uint8_t *pos, unsigned char value);
194 196
 uint8_t eeprom_read_byte(uint8_t *pos);
195 197
 void eeprom_read_block (void *__dst, const void *__src, size_t __n);
196 198
 void eeprom_update_block (const void *__src, void *__dst, size_t __n);
197 199
 
200
+//
198 201
 // ADC
202
+//
199 203
 
200 204
 #define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT)
201 205
 

+ 9
- 3
Marlin/src/HAL/HAL_STM32F1/HAL.h Wyświetl plik

@@ -185,7 +185,10 @@ static int freeMemory() {
185 185
   return &top - reinterpret_cast<char*>(_sbrk(0));
186 186
 }
187 187
 
188
+//
188 189
 // SPI: Extended functions which take a channel number (hardware SPI only)
190
+//
191
+
189 192
 /** Write single byte to specified SPI channel */
190 193
 void spiSend(uint32_t chan, byte b);
191 194
 /** Write buffer to specified SPI channel */
@@ -193,19 +196,22 @@ void spiSend(uint32_t chan, const uint8_t* buf, size_t n);
193 196
 /** Read single byte from specified SPI channel */
194 197
 uint8_t spiRec(uint32_t chan);
195 198
 
196
-
199
+//
197 200
 // EEPROM
201
+//
198 202
 
199 203
 /**
200
- * TODO: Write all this eeprom stuff. Can emulate eeprom in flash as last resort.
201
- * Wire library should work for i2c eeproms.
204
+ * TODO: Write all this EEPROM stuff. Can emulate EEPROM in flash as last resort.
205
+ * Wire library should work for i2c EEPROMs.
202 206
  */
203 207
 void eeprom_write_byte(uint8_t *pos, unsigned char value);
204 208
 uint8_t eeprom_read_byte(uint8_t *pos);
205 209
 void eeprom_read_block (void *__dst, const void *__src, size_t __n);
206 210
 void eeprom_update_block (const void *__src, void *__dst, size_t __n);
207 211
 
212
+//
208 213
 // ADC
214
+//
209 215
 
210 216
 #define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT_ANALOG);
211 217
 

+ 9
- 2
Marlin/src/HAL/HAL_STM32F4/HAL.h Wyświetl plik

@@ -195,7 +195,10 @@ static int freeMemory() {
195 195
   return &top - reinterpret_cast<char*>(_sbrk(0));
196 196
 }
197 197
 
198
+//
198 199
 // SPI: Extended functions which take a channel number (hardware SPI only)
200
+//
201
+
199 202
 /** Write single byte to specified SPI channel */
200 203
 void spiSend(uint32_t chan, byte b);
201 204
 /** Write buffer to specified SPI channel */
@@ -203,18 +206,22 @@ void spiSend(uint32_t chan, const uint8_t* buf, size_t n);
203 206
 /** Read single byte from specified SPI channel */
204 207
 uint8_t spiRec(uint32_t chan);
205 208
 
209
+//
206 210
 // EEPROM
211
+//
207 212
 
208 213
 /**
209
- * TODO: Write all this eeprom stuff. Can emulate eeprom in flash as last resort.
210
- * Wire library should work for i2c eeproms.
214
+ * TODO: Write all this EEPROM stuff. Can emulate EEPROM in flash as last resort.
215
+ * Wire library should work for i2c EEPROMs.
211 216
  */
212 217
 void eeprom_write_byte(uint8_t *pos, unsigned char value);
213 218
 uint8_t eeprom_read_byte(uint8_t *pos);
214 219
 void eeprom_read_block (void *__dst, const void *__src, size_t __n);
215 220
 void eeprom_update_block (const void *__src, void *__dst, size_t __n);
216 221
 
222
+//
217 223
 // ADC
224
+//
218 225
 
219 226
 #define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT)
220 227
 

+ 1
- 1
Marlin/src/inc/SanityCheck.h Wyświetl plik

@@ -240,7 +240,7 @@
240 240
   #error "Remove DELTA_PROBEABLE_RADIUS and use MIN_PROBE_EDGE to inset the probe area instead."
241 241
 #elif defined(UBL_MESH_INSET)
242 242
   #error "UBL_MESH_INSET is now just MESH_INSET. Please update your configuration."
243
-#elif defined(UBL_MESH_MIN_X) || defined(UBL_MESH_MIN_Y) || defined(UBL_MESH_MAX_X)  || defined(UBL_MESH_MAX_Y)
243
+#elif defined(UBL_MESH_MIN_X) || defined(UBL_MESH_MIN_Y) || defined(UBL_MESH_MAX_X) || defined(UBL_MESH_MAX_Y)
244 244
   #error "UBL_MESH_(MIN|MAX)_[XY] is now just MESH_(MIN|MAX)_[XY]. Please update your configuration."
245 245
 #elif defined(ABL_PROBE_PT_1_X) || defined(ABL_PROBE_PT_1_Y) || defined(ABL_PROBE_PT_2_X) || defined(ABL_PROBE_PT_2_Y) || defined(ABL_PROBE_PT_3_X) || defined(ABL_PROBE_PT_3_Y)
246 246
   #error "ABL_PROBE_PT_[123]_[XY] is now PROBE_PT_[123]_[XY]. Please update your configuration."

Ładowanie…
Anuluj
Zapisz