Scott Lahteine 6 vuotta sitten
vanhempi
commit
631d867dc9

+ 0
- 2
Marlin/src/HAL/HAL_DUE/HAL.h Näytä tiedosto

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

+ 8
- 4
Marlin/src/HAL/HAL_STM32/HAL.h Näytä tiedosto

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

+ 9
- 3
Marlin/src/HAL/HAL_STM32F1/HAL.h Näytä tiedosto

185
   return &top - reinterpret_cast<char*>(_sbrk(0));
185
   return &top - reinterpret_cast<char*>(_sbrk(0));
186
 }
186
 }
187
 
187
 
188
+//
188
 // SPI: Extended functions which take a channel number (hardware SPI only)
189
 // SPI: Extended functions which take a channel number (hardware SPI only)
190
+//
191
+
189
 /** Write single byte to specified SPI channel */
192
 /** Write single byte to specified SPI channel */
190
 void spiSend(uint32_t chan, byte b);
193
 void spiSend(uint32_t chan, byte b);
191
 /** Write buffer to specified SPI channel */
194
 /** Write buffer to specified SPI channel */
193
 /** Read single byte from specified SPI channel */
196
 /** Read single byte from specified SPI channel */
194
 uint8_t spiRec(uint32_t chan);
197
 uint8_t spiRec(uint32_t chan);
195
 
198
 
196
-
199
+//
197
 // EEPROM
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
 void eeprom_write_byte(uint8_t *pos, unsigned char value);
207
 void eeprom_write_byte(uint8_t *pos, unsigned char value);
204
 uint8_t eeprom_read_byte(uint8_t *pos);
208
 uint8_t eeprom_read_byte(uint8_t *pos);
205
 void eeprom_read_block (void *__dst, const void *__src, size_t __n);
209
 void eeprom_read_block (void *__dst, const void *__src, size_t __n);
206
 void eeprom_update_block (const void *__src, void *__dst, size_t __n);
210
 void eeprom_update_block (const void *__src, void *__dst, size_t __n);
207
 
211
 
212
+//
208
 // ADC
213
 // ADC
214
+//
209
 
215
 
210
 #define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT_ANALOG);
216
 #define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT_ANALOG);
211
 
217
 

+ 9
- 2
Marlin/src/HAL/HAL_STM32F4/HAL.h Näytä tiedosto

195
   return &top - reinterpret_cast<char*>(_sbrk(0));
195
   return &top - reinterpret_cast<char*>(_sbrk(0));
196
 }
196
 }
197
 
197
 
198
+//
198
 // SPI: Extended functions which take a channel number (hardware SPI only)
199
 // SPI: Extended functions which take a channel number (hardware SPI only)
200
+//
201
+
199
 /** Write single byte to specified SPI channel */
202
 /** Write single byte to specified SPI channel */
200
 void spiSend(uint32_t chan, byte b);
203
 void spiSend(uint32_t chan, byte b);
201
 /** Write buffer to specified SPI channel */
204
 /** Write buffer to specified SPI channel */
203
 /** Read single byte from specified SPI channel */
206
 /** Read single byte from specified SPI channel */
204
 uint8_t spiRec(uint32_t chan);
207
 uint8_t spiRec(uint32_t chan);
205
 
208
 
209
+//
206
 // EEPROM
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
 void eeprom_write_byte(uint8_t *pos, unsigned char value);
217
 void eeprom_write_byte(uint8_t *pos, unsigned char value);
213
 uint8_t eeprom_read_byte(uint8_t *pos);
218
 uint8_t eeprom_read_byte(uint8_t *pos);
214
 void eeprom_read_block (void *__dst, const void *__src, size_t __n);
219
 void eeprom_read_block (void *__dst, const void *__src, size_t __n);
215
 void eeprom_update_block (const void *__src, void *__dst, size_t __n);
220
 void eeprom_update_block (const void *__src, void *__dst, size_t __n);
216
 
221
 
222
+//
217
 // ADC
223
 // ADC
224
+//
218
 
225
 
219
 #define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT)
226
 #define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT)
220
 
227
 

+ 1
- 1
Marlin/src/inc/SanityCheck.h Näytä tiedosto

240
   #error "Remove DELTA_PROBEABLE_RADIUS and use MIN_PROBE_EDGE to inset the probe area instead."
240
   #error "Remove DELTA_PROBEABLE_RADIUS and use MIN_PROBE_EDGE to inset the probe area instead."
241
 #elif defined(UBL_MESH_INSET)
241
 #elif defined(UBL_MESH_INSET)
242
   #error "UBL_MESH_INSET is now just MESH_INSET. Please update your configuration."
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
   #error "UBL_MESH_(MIN|MAX)_[XY] is now just MESH_(MIN|MAX)_[XY]. Please update your configuration."
244
   #error "UBL_MESH_(MIN|MAX)_[XY] is now just MESH_(MIN|MAX)_[XY]. Please update your configuration."
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)
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
   #error "ABL_PROBE_PT_[123]_[XY] is now PROBE_PT_[123]_[XY]. Please update your configuration."
246
   #error "ABL_PROBE_PT_[123]_[XY] is now PROBE_PT_[123]_[XY]. Please update your configuration."

Loading…
Peruuta
Tallenna