From 4b287ab4cbf3f4537c93131695b4f4121678a528 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Wed, 5 Dec 2018 12:23:42 +0100 Subject: [PATCH] Final fix compile error (#4509) Final fix soft_spi_flg compile error (#4509) --- sonoff/sonoff.ino | 3 ++- tools/{ => fw_efm8bb1}/RF-Bridge-EFM8BB1-20181127.hex | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename tools/{ => fw_efm8bb1}/RF-Bridge-EFM8BB1-20181127.hex (100%) diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 0772e76f2..869eaf7eb 100755 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -167,7 +167,7 @@ uint8_t dht_flg = 0; // DHT configured uint8_t energy_flg = 0; // Energy monitor configured uint8_t i2c_flg = 0; // I2C configured uint8_t spi_flg = 0; // SPI configured -uint8_t soft_spi_flg = 0; // Software SPI ** Temporary fix to satisfy compiler ** +uint8_t soft_spi_flg = 0; // Software SPI configured uint8_t light_type = 0; // Light types uint8_t ntp_force_sync = 0; // Force NTP sync byte serial_in_byte; // Received byte @@ -2498,6 +2498,7 @@ void GpioInit(void) my_module.gp.io[14] = GPIO_SPI_CLK; pin[GPIO_SPI_CLK] = 14; } + soft_spi_flg = ((pin[GPIO_SSPI_CS] < 99) && (pin[GPIO_SSPI_SCLK] < 99) && ((pin[GPIO_SSPI_MOSI] < 99) || (pin[GPIO_SSPI_MOSI] < 99))); #endif // USE_SPI #ifdef USE_I2C diff --git a/tools/RF-Bridge-EFM8BB1-20181127.hex b/tools/fw_efm8bb1/RF-Bridge-EFM8BB1-20181127.hex similarity index 100% rename from tools/RF-Bridge-EFM8BB1-20181127.hex rename to tools/fw_efm8bb1/RF-Bridge-EFM8BB1-20181127.hex