MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Hide freeMemory et.al. warnings

Browse Source
This commit is contained in:
Scott Lahteine 2019-02-25 22:51:14 -06:00
parent dc88747770
commit 4200f9ed62
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/src/HAL/HAL_STM32F1/HAL.h
View File

@ -159,10 +159,10 @@ extern uint16_t HAL_adc_result;
#define __bss_end __bss_end__ #define __bss_end __bss_end__
/** clear reset reason */ /** clear reset reason */
void HAL_clear_reset_source (void); void HAL_clear_reset_source(void);
/** reset reason */ /** reset reason */
uint8_t HAL_get_reset_source (void); uint8_t HAL_get_reset_source(void);
void _delay_ms(const int delay); void _delay_ms(const int delay);
@ -180,11 +180,17 @@ static int freeMemory() {
return top; return top;
} }
*/ */
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
static int freeMemory() { static int freeMemory() {
volatile char top; volatile char top;
return &top - reinterpret_cast<char*>(_sbrk(0)); return &top - reinterpret_cast<char*>(_sbrk(0));
} }
#pragma GCC diagnostic pop
// //
// SPI: Extended functions which take a channel number (hardware SPI only) // SPI: Extended functions which take a channel number (hardware SPI only)
// //
@ -206,8 +212,8 @@ uint8_t spiRec(uint32_t chan);
*/ */
void eeprom_write_byte(uint8_t *pos, unsigned char value); void eeprom_write_byte(uint8_t *pos, unsigned char value);
uint8_t eeprom_read_byte(uint8_t *pos); uint8_t eeprom_read_byte(uint8_t *pos);
void eeprom_read_block (void *__dst, const void *__src, size_t __n); void eeprom_read_block(void *__dst, const void *__src, size_t __n);
void eeprom_update_block (const void *__src, void *__dst, size_t __n); void eeprom_update_block(const void *__src, void *__dst, size_t __n);
// //
// ADC // ADC

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

@ -62,7 +62,7 @@ bool PersistentStore::access_finish() {
} }
bool PersistentStore::write_data(int &pos, const uint8_t *value, const size_t size, uint16_t *crc) { bool PersistentStore::write_data(int &pos, const uint8_t *value, const size_t size, uint16_t *crc) {
for (int i = 0; i < size; i++) for (size_t i = 0; i < size; i++)
HAL_STM32F1_eeprom_content[pos + i] = value[i]; HAL_STM32F1_eeprom_content[pos + i] = value[i];
crc16(crc, value, size); crc16(crc, value, size);
pos += size; pos += size;
@ -70,7 +70,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, const size_t si
} }
bool PersistentStore::read_data(int &pos, uint8_t* value, const size_t size, uint16_t *crc, const bool writing/*=true*/) { bool PersistentStore::read_data(int &pos, uint8_t* value, const size_t size, uint16_t *crc, const bool writing/*=true*/) {
for (int i = 0; i < size; i++) { for (size_t i = 0; i < size; i++) {
uint8_t c = HAL_STM32F1_eeprom_content[pos + i]; uint8_t c = HAL_STM32F1_eeprom_content[pos + i];
if (writing) value[i] = c; if (writing) value[i] = c;
crc16(crc, &c, 1); crc16(crc, &c, 1);