From 185dec800b3bcd7c4029ae89548565851c3d484b Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 5 Nov 2017 19:20:03 -0600 Subject: [PATCH] Use fastio for HAL SPI EEPROM --- Marlin/src/HAL/SpiEeprom.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Marlin/src/HAL/SpiEeprom.cpp b/Marlin/src/HAL/SpiEeprom.cpp index 356bb3d9d5..9e74b4f6f4 100644 --- a/Marlin/src/HAL/SpiEeprom.cpp +++ b/Marlin/src/HAL/SpiEeprom.cpp @@ -44,12 +44,12 @@ uint8_t eeprom_read_byte(uint8_t* pos) { eeprom_temp[0] = CMD_READ; eeprom_temp[1] = ((unsigned)pos>>8) & 0xFF; // addr High eeprom_temp[2] = (unsigned)pos& 0xFF; // addr Low - digitalWrite(SPI_EEPROM1_CS, HIGH); - digitalWrite(SPI_EEPROM1_CS, LOW); + WRITE(SPI_EEPROM1_CS, HIGH); + WRITE(SPI_EEPROM1_CS, LOW); spiSend(SPI_CHAN_EEPROM1, eeprom_temp, 3); v = spiRec(SPI_CHAN_EEPROM1); - digitalWrite(SPI_EEPROM1_CS, HIGH); + WRITE(SPI_EEPROM1_CS, HIGH); return v; } @@ -62,14 +62,14 @@ void eeprom_read_block(void* dest, const void* eeprom_address, size_t n) { eeprom_temp[0] = CMD_READ; eeprom_temp[1] = ((unsigned)eeprom_address>>8) & 0xFF; // addr High eeprom_temp[2] = (unsigned)eeprom_address& 0xFF; // addr Low - digitalWrite(SPI_EEPROM1_CS, HIGH); - digitalWrite(SPI_EEPROM1_CS, LOW); + WRITE(SPI_EEPROM1_CS, HIGH); + WRITE(SPI_EEPROM1_CS, LOW); spiSend(SPI_CHAN_EEPROM1, eeprom_temp, 3); uint8_t *p_dest = (uint8_t *)dest; while (n--) *p_dest++ = spiRec(SPI_CHAN_EEPROM1); - digitalWrite(SPI_EEPROM1_CS, HIGH); + WRITE(SPI_EEPROM1_CS, HIGH); } void eeprom_write_byte(uint8_t* pos, uint8_t value) { @@ -77,20 +77,20 @@ void eeprom_write_byte(uint8_t* pos, uint8_t value) { /*write enable*/ eeprom_temp[0] = CMD_WREN; - digitalWrite(SPI_EEPROM1_CS, LOW); + WRITE(SPI_EEPROM1_CS, LOW); spiSend(SPI_CHAN_EEPROM1, eeprom_temp, 1); - digitalWrite(SPI_EEPROM1_CS, HIGH); + WRITE(SPI_EEPROM1_CS, HIGH); delay(1); /*write addr*/ eeprom_temp[0] = CMD_WRITE; eeprom_temp[1] = ((unsigned)pos>>8) & 0xFF; //addr High eeprom_temp[2] = (unsigned)pos & 0xFF; //addr Low - digitalWrite(SPI_EEPROM1_CS, LOW); + WRITE(SPI_EEPROM1_CS, LOW); spiSend(SPI_CHAN_EEPROM1, eeprom_temp, 3); spiSend(SPI_CHAN_EEPROM1, value); - digitalWrite(SPI_EEPROM1_CS, HIGH); + WRITE(SPI_EEPROM1_CS, HIGH); delay(7); // wait for page write to complete } @@ -99,20 +99,20 @@ void eeprom_update_block(const void* src, void* eeprom_address, size_t n) { /*write enable*/ eeprom_temp[0] = CMD_WREN; - digitalWrite(SPI_EEPROM1_CS, LOW); + WRITE(SPI_EEPROM1_CS, LOW); spiSend(SPI_CHAN_EEPROM1, eeprom_temp, 1); - digitalWrite(SPI_EEPROM1_CS, HIGH); + WRITE(SPI_EEPROM1_CS, HIGH); delay(1); /*write addr*/ eeprom_temp[0] = CMD_WRITE; eeprom_temp[1] = ((unsigned)eeprom_address>>8) & 0xFF; //addr High eeprom_temp[2] = (unsigned)eeprom_address & 0xFF; //addr Low - digitalWrite(SPI_EEPROM1_CS, LOW); + WRITE(SPI_EEPROM1_CS, LOW); spiSend(SPI_CHAN_EEPROM1, eeprom_temp, 3); spiSend(SPI_CHAN_EEPROM1, (const uint8_t*)src, n); - digitalWrite(SPI_EEPROM1_CS, HIGH); + WRITE(SPI_EEPROM1_CS, HIGH); delay(7); // wait for page write to complete }