From 14b810692cacc31c14df65f2bc1a10e4799c2456 Mon Sep 17 00:00:00 2001 From: gn0st1c Date: Thu, 22 Mar 2018 15:17:51 +0300 Subject: [PATCH 1/3] Update hardware.h LED#_MODE info --- code/espurna/config/hardware.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h index 61deabcc..b2a1e901 100644 --- a/code/espurna/config/hardware.h +++ b/code/espurna/config/hardware.h @@ -15,7 +15,7 @@ // RELAY#_TYPE: Relay can be RELAY_TYPE_NORMAL, RELAY_TYPE_INVERSE, RELAY_TYPE_LATCHED or RELAY_TYPE_LATCHED_INVERSE // LED#_PIN: GPIO for the n-th LED (1-based, up to 4 LEDs) // LED#_PIN_INVERSE: LED has inversed logic (lit when pulled down) -// LED#_MODE: Check hardware.h for LED_MODE_% +// LED#_MODE: Check general.h for LED_MODE_% // LED#_RELAY: Linked relay (1-based) // // Besides, other hardware specific information should be stated here From a2f857c93f062d3586b76f58921f874fa6daec2b Mon Sep 17 00:00:00 2001 From: gn0st1c Date: Thu, 22 Mar 2018 15:47:35 +0300 Subject: [PATCH 2/3] Update utils.ino SPIFFS_SUPPORT info. why don't we free some bytes here --- code/espurna/utils.ino | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/code/espurna/utils.ino b/code/espurna/utils.ino index bef49c81..a1baee1d 100644 --- a/code/espurna/utils.ino +++ b/code/espurna/utils.ino @@ -227,24 +227,17 @@ void info() { DEBUG_MSG_P(PSTR("[INIT] Flash size (SDK): %8u bytes / %4d sectors\n"), ESP.getFlashChipSize(), sectors(ESP.getFlashChipSize())); DEBUG_MSG_P(PSTR("[INIT] Firmware size: %8u bytes / %4d sectors\n"), ESP.getSketchSize(), sectors(ESP.getSketchSize())); DEBUG_MSG_P(PSTR("[INIT] OTA size: %8u bytes / %4d sectors\n"), ESP.getFreeSketchSpace(), sectors(ESP.getFreeSketchSpace())); - #if SPIFFS_SUPPORT - FSInfo fs_info; - bool fs = SPIFFS.info(fs_info); - if (fs) { - DEBUG_MSG_P(PSTR("[INIT] SPIFFS size: %8u bytes / %4d sectors\n"), fs_info.totalBytes, sectors(fs_info.totalBytes)); - } - #else - DEBUG_MSG_P(PSTR("[INIT] SPIFFS size: %8u bytes / %4d sectors\n"), 0, 0); - #endif DEBUG_MSG_P(PSTR("[INIT] EEPROM size: %8u bytes / %4d sectors\n"), settingsMaxSize(), sectors(settingsMaxSize())); - DEBUG_MSG_P(PSTR("[INIT] Empty space: %8u bytes / 4 sectors\n"), 4 * SPI_FLASH_SEC_SIZE); + DEBUG_MSG_P(PSTR("[INIT] Empty space: %8u bytes / 4 sectors\n"), 4 * SPI_FLASH_SEC_SIZE); DEBUG_MSG_P(PSTR("\n")); // ------------------------------------------------------------------------- #if SPIFFS_SUPPORT + FSInfo fs_info; + bool fs = SPIFFS.info(fs_info); if (fs) { - DEBUG_MSG_P(PSTR("[INIT] SPIFFS total size: %8u bytes\n"), fs_info.totalBytes); + DEBUG_MSG_P(PSTR("[INIT] SPIFFS total size: %8u bytes / %4d sectors\n"), fs_info.totalBytes, sectors(fs_info.totalBytes)); DEBUG_MSG_P(PSTR("[INIT] used size: %8u bytes\n"), fs_info.usedBytes); DEBUG_MSG_P(PSTR("[INIT] block size: %8u bytes\n"), fs_info.blockSize); DEBUG_MSG_P(PSTR("[INIT] page size: %8u bytes\n"), fs_info.pageSize); From 130985e4b3cdd8365da548f550be6a86c2f74be8 Mon Sep 17 00:00:00 2001 From: gn0st1c Date: Thu, 22 Mar 2018 15:52:23 +0300 Subject: [PATCH 3/3] Update hardware.h --- code/espurna/config/hardware.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h index b2a1e901..d17bc95a 100644 --- a/code/espurna/config/hardware.h +++ b/code/espurna/config/hardware.h @@ -11,9 +11,9 @@ // - BUTTON_SWITCH: button event is fired when pressed or released // - BUTTON_DEFAULT_HIGH: there is a pull up in place // - BUTTON_SET_PULLUP: set pullup by software -// RELAY#_PIN: GPIO for the n-th relay (1-based, up to 4 relays) +// RELAY#_PIN: GPIO for the n-th relay (1-based, up to 8 relays) // RELAY#_TYPE: Relay can be RELAY_TYPE_NORMAL, RELAY_TYPE_INVERSE, RELAY_TYPE_LATCHED or RELAY_TYPE_LATCHED_INVERSE -// LED#_PIN: GPIO for the n-th LED (1-based, up to 4 LEDs) +// LED#_PIN: GPIO for the n-th LED (1-based, up to 8 LEDs) // LED#_PIN_INVERSE: LED has inversed logic (lit when pulled down) // LED#_MODE: Check general.h for LED_MODE_% // LED#_RELAY: Linked relay (1-based)