rename time.h file, controller timekeeping

examples/Controller_examples/FastLED/fdrs_node_config.h

@@ -13,11 +13,35 @@
 //#define POWER_CTRL    14
 #define FDRS_DEBUG
 
+// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
 #define RADIOLIB_MODULE SX1276 //Tested on SX1276
 #define LORA_SS 18
 #define LORA_RST 14
 #define LORA_DIO 26
+#define LORA_BUSY  33
+//#define USE_SX126X
+
+//#define CUSTOM_SPI
+#define LORA_SPI_SCK  5
+#define LORA_SPI_MISO 19
+#define LORA_SPI_MOSI 27
 
 #define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
+
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/Controller_examples/Irrigation/fdrs_node_config.h

@@ -13,11 +13,35 @@
 //#define POWER_CTRL    14
 #define FDRS_DEBUG
 
+/// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
 #define RADIOLIB_MODULE SX1276 //Tested on SX1276
 #define LORA_SS 18
 #define LORA_RST 14
 #define LORA_DIO 26
+#define LORA_BUSY  33
+//#define USE_SX126X
+
+//#define CUSTOM_SPI
+#define LORA_SPI_SCK  5
+#define LORA_SPI_MISO 19
+#define LORA_SPI_MOSI 27
 
 #define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
+
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/Controller_examples/TFT_eSPI_fdrs/fdrs_node_config.h

@@ -13,11 +13,35 @@
 //#define POWER_CTRL    14
 #define FDRS_DEBUG
 
+// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
 #define RADIOLIB_MODULE SX1276 //Tested on SX1276
 #define LORA_SS 18
 #define LORA_RST 14
 #define LORA_DIO 26
+#define LORA_BUSY  33
+//#define USE_SX126X
+
+//#define CUSTOM_SPI
+#define LORA_SPI_SCK  5
+#define LORA_SPI_MISO 19
+#define LORA_SPI_MOSI 27
 
 #define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
+
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/ESPNOW_Controller/fdrs_node_config.h

@@ -13,13 +13,35 @@
 //#define POWER_CTRL    14
 #define FDRS_DEBUG
 
+// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
-#define RADIOLIB_MODULE SX1276
-#define LORA_SS    18
-#define LORA_RST   14
-#define LORA_DIO   26
+#define RADIOLIB_MODULE SX1276 //Tested on SX1276
+#define LORA_SS 18
+#define LORA_RST 14
+#define LORA_DIO 26
 #define LORA_BUSY  33
 //#define USE_SX126X
 
-#define LORA_TXPWR 17   // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
+//#define CUSTOM_SPI
+#define LORA_SPI_SCK  5
+#define LORA_SPI_MISO 19
+#define LORA_SPI_MOSI 27
+
+#define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
+
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/ESPNOW_Sensor/fdrs_node_config.h

@@ -13,13 +13,35 @@
 //#define POWER_CTRL    14
 #define FDRS_DEBUG
 
+// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
-#define RADIOLIB_MODULE SX1276
-#define LORA_SS    18
-#define LORA_RST   14
-#define LORA_DIO   26
+#define RADIOLIB_MODULE SX1276 //Tested on SX1276
+#define LORA_SS 18
+#define LORA_RST 14
+#define LORA_DIO 26
 #define LORA_BUSY  33
 //#define USE_SX126X
 
-#define LORA_TXPWR 17   // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
+//#define CUSTOM_SPI
+#define LORA_SPI_SCK  5
+#define LORA_SPI_MISO 19
+#define LORA_SPI_MOSI 27
+
+#define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
+
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/ESPNOW_Stress_Test/fdrs_node_config.h

@@ -13,11 +13,35 @@
 //#define POWER_CTRL    14
 //#define FDRS_DEBUG
 //
+// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
 #define RADIOLIB_MODULE SX1276 //Tested on SX1276
 #define LORA_SS 18
 #define LORA_RST 14
 #define LORA_DIO 26
+#define LORA_BUSY  33
+//#define USE_SX126X
+
+//#define CUSTOM_SPI
+#define LORA_SPI_SCK  5
+#define LORA_SPI_MISO 19
+#define LORA_SPI_MOSI 27
 
 #define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
+
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/LoRa_Controller/fdrs_node_config.h

@@ -12,13 +12,35 @@
 //#define POWER_CTRL    14
 #define FDRS_DEBUG
 
+// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
-#define RADIOLIB_MODULE SX1276
-#define LORA_SS    18
-#define LORA_RST   14
-#define LORA_DIO   26
+#define RADIOLIB_MODULE SX1276 //Tested on SX1276
+#define LORA_SS 18
+#define LORA_RST 14
+#define LORA_DIO 26
 #define LORA_BUSY  33
 //#define USE_SX126X
 
-#define LORA_TXPWR 17   // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
+//#define CUSTOM_SPI
+#define LORA_SPI_SCK  5
+#define LORA_SPI_MISO 19
+#define LORA_SPI_MOSI 27
+
+#define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
+
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/LoRa_Sensor/fdrs_node_config.h

@@ -13,18 +13,35 @@
 //#define POWER_CTRL    14
 #define FDRS_DEBUG
 
+/// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
-#define RADIOLIB_MODULE SX1276
-#define LORA_SS    18
-#define LORA_RST   14
-#define LORA_DIO   26
+#define RADIOLIB_MODULE SX1276 //Tested on SX1276
+#define LORA_SS 18
+#define LORA_RST 14
+#define LORA_DIO 26
 #define LORA_BUSY  33
 //#define USE_SX126X
 
-#define LORA_TXPWR 17   // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
-#define LORA_ACK        // Request LoRa acknowledgment.
-
 //#define CUSTOM_SPI
-#define LORA_SPI_SCK 5
+#define LORA_SPI_SCK  5
 #define LORA_SPI_MISO 19
-#define LORA_SPI_MOSI 27
+#define LORA_SPI_MOSI 27
+
+#define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
+#define LORA_ACK        // Request LoRa acknowledgment.
+
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/Sensor_Examples/AHT20_fdrs/fdrs_node_config.h

@@ -11,11 +11,36 @@
 #define DEEP_SLEEP
 //#define POWER_CTRL    14
 #define FDRS_DEBUG
+
+// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
 #define RADIOLIB_MODULE SX1276 //Tested on SX1276
 #define LORA_SS 18
 #define LORA_RST 14
 #define LORA_DIO 26
+#define LORA_BUSY  33
+//#define USE_SX126X
+
+//#define CUSTOM_SPI
+#define LORA_SPI_SCK  5
+#define LORA_SPI_MISO 19
+#define LORA_SPI_MOSI 27
 
 #define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
+
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/Sensor_Examples/BME280_fdrs/fdrs_node_config.h

@@ -11,11 +11,36 @@
 #define DEEP_SLEEP
 //#define POWER_CTRL    14
 #define FDRS_DEBUG
+
+// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
 #define RADIOLIB_MODULE SX1276 //Tested on SX1276
 #define LORA_SS 18
 #define LORA_RST 14
 #define LORA_DIO 26
+#define LORA_BUSY  33
+//#define USE_SX126X
+
+//#define CUSTOM_SPI
+#define LORA_SPI_SCK  5
+#define LORA_SPI_MISO 19
+#define LORA_SPI_MOSI 27
 
 #define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
+
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/Sensor_Examples/BMP280_fdrs/fdrs_node_config.h

@@ -11,11 +11,36 @@
 #define DEEP_SLEEP
 //#define POWER_CTRL    14
 #define FDRS_DEBUG
+
+// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
 #define RADIOLIB_MODULE SX1276 //Tested on SX1276
 #define LORA_SS 18
 #define LORA_RST 14
 #define LORA_DIO 26
+#define LORA_BUSY  33
+//#define USE_SX126X
+
+//#define CUSTOM_SPI
+#define LORA_SPI_SCK  5
+#define LORA_SPI_MISO 19
+#define LORA_SPI_MOSI 27
 
 #define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
+
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/Sensor_Examples/CapacitiveSoil/fdrs_node_config.h

@@ -15,11 +15,21 @@
 //#define POWER_CTRL  14
 #define FDRS_DEBUG
 
+// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
-#define RADIOLIB_MODULE SX1276  // ESP32 SX1276 (TTGO)
-#define LORA_SS    18
-#define LORA_RST   14
-#define LORA_DIO   26
+#define RADIOLIB_MODULE SX1276 //Tested on SX1276
+#define LORA_SS 18
+#define LORA_RST 14
+#define LORA_DIO 26
 #define LORA_BUSY  33
 //#define USE_SX126X
 
@@ -31,10 +41,9 @@
 #define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
 
-// I2C - OLED or RTC
-#define I2C_SDA 4
-#define I2C_SCL 15
-
-//#define USE_OLED    
-#define OLED_HEADER "FDRS"
-#define OLED_RST 16
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/Sensor_Examples/DHT22_fdrs/fdrs_node_config.h

@@ -11,11 +11,36 @@
 #define DEEP_SLEEP
 //#define POWER_CTRL    14
 #define FDRS_DEBUG
+
+// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
 #define RADIOLIB_MODULE SX1276 //Tested on SX1276
 #define LORA_SS 18
 #define LORA_RST 14
 #define LORA_DIO 26
+#define LORA_BUSY  33
+//#define USE_SX126X
+
+//#define CUSTOM_SPI
+#define LORA_SPI_SCK  5
+#define LORA_SPI_MISO 19
+#define LORA_SPI_MOSI 27
 
 #define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
+
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/Sensor_Examples/DS18B20_fdrs/fdrs_node_config.h

@@ -11,11 +11,36 @@
 #define DEEP_SLEEP
 //#define POWER_CTRL    14
 #define FDRS_DEBUG
+
+// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
 #define RADIOLIB_MODULE SX1276 //Tested on SX1276
 #define LORA_SS 18
 #define LORA_RST 14
 #define LORA_DIO 26
+#define LORA_BUSY  33
+//#define USE_SX126X
+
+//#define CUSTOM_SPI
+#define LORA_SPI_SCK  5
+#define LORA_SPI_MISO 19
+#define LORA_SPI_MOSI 27
 
 #define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
+
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/Sensor_Examples/FrequencyCounter/fdrs_node_config.h

@@ -11,11 +11,36 @@
 #define DEEP_SLEEP
 #define POWER_CTRL    22
 #define FDRS_DEBUG
+
+// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
 #define RADIOLIB_MODULE SX1276 //Tested on SX1276
 #define LORA_SS 18
 #define LORA_RST 14
 #define LORA_DIO 26
+#define LORA_BUSY  33
+//#define USE_SX126X
+
+//#define CUSTOM_SPI
+#define LORA_SPI_SCK  5
+#define LORA_SPI_MISO 19
+#define LORA_SPI_MOSI 27
 
 #define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
+
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/Sensor_Examples/GenericGPS_fdrs/fdrs_node_config.h

@@ -11,20 +11,36 @@
 //#define DEEP_SLEEP
 //#define POWER_CTRL    14
 #define FDRS_DEBUG
+
+// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
-#define RADIOLIB_MODULE SX1276  // ESP32 SX1276 (TTGO)
-#define LORA_SS    18
-#define LORA_RST   14
-#define LORA_DIO   26
+#define RADIOLIB_MODULE SX1276 //Tested on SX1276
+#define LORA_SS 18
+#define LORA_RST 14
+#define LORA_DIO 26
 #define LORA_BUSY  33
+//#define USE_SX126X
+
+//#define CUSTOM_SPI
+#define LORA_SPI_SCK  5
+#define LORA_SPI_MISO 19
+#define LORA_SPI_MOSI 27
 
 #define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
 
-// I2C - OLED or RTC
-#define I2C_SDA 4
-#define I2C_SCL 15
-
-#define USE_OLED    
-#define OLED_HEADER "FDRS"
-#define OLED_RST 16
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/Sensor_Examples/KisssysGypsum/fdrs_node_config.h

@@ -11,11 +11,36 @@
 #define DEEP_SLEEP
 //#define POWER_CTRL    14
 #define FDRS_DEBUG
+
+// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
 #define RADIOLIB_MODULE SX1276 //Tested on SX1276
 #define LORA_SS 18
 #define LORA_RST 14
 #define LORA_DIO 26
+#define LORA_BUSY  33
+//#define USE_SX126X
+
+//#define CUSTOM_SPI
+#define LORA_SPI_SCK  5
+#define LORA_SPI_MISO 19
+#define LORA_SPI_MOSI 27
 
 #define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
+
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/Sensor_Examples/LilyGo_HiGrow_32/fdrs_node_config.h

@@ -11,11 +11,36 @@
 #define DEEP_SLEEP
 #define POWER_CTRL    4
 #define FDRS_DEBUG
+
+// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
 #define RADIOLIB_MODULE SX1276 //Tested on SX1276
 #define LORA_SS 18
 #define LORA_RST 14
 #define LORA_DIO 26
+#define LORA_BUSY  33
+//#define USE_SX126X
+
+//#define CUSTOM_SPI
+#define LORA_SPI_SCK  5
+#define LORA_SPI_MISO 19
+#define LORA_SPI_MOSI 27
 
 #define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
+
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/Sensor_Examples/MESB_fdrs/fdrs_node_config.h

@@ -11,11 +11,36 @@
 #define DEEP_SLEEP
 //#define POWER_CTRL    14
 #define FDRS_DEBUG
+
+// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
 #define RADIOLIB_MODULE SX1276 //Tested on SX1276
 #define LORA_SS 18
 #define LORA_RST 14
 #define LORA_DIO 26
+#define LORA_BUSY  33
+//#define USE_SX126X
+
+//#define CUSTOM_SPI
+#define LORA_SPI_SCK  5
+#define LORA_SPI_MISO 19
+#define LORA_SPI_MOSI 27
 
 #define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
+
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/Sensor_Examples/MLX90614_fdrs/fdrs_node_config.h

@@ -11,11 +11,36 @@
 #define DEEP_SLEEP
 #define POWER_CTRL    14
 #define FDRS_DEBUG
+
+// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
 #define RADIOLIB_MODULE SX1276 //Tested on SX1276
 #define LORA_SS 18
 #define LORA_RST 14
 #define LORA_DIO 26
+#define LORA_BUSY  33
+//#define USE_SX126X
+
+//#define CUSTOM_SPI
+#define LORA_SPI_SCK  5
+#define LORA_SPI_MISO 19
+#define LORA_SPI_MOSI 27
 
 #define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
+
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/Sensor_Examples/SHT20_fdrs/fdrs_node_config.h

@@ -12,11 +12,35 @@
 //#define POWER_CTRL    14
 #define FDRS_DEBUG
 
+// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
 #define RADIOLIB_MODULE SX1276 //Tested on SX1276
 #define LORA_SS 18
 #define LORA_RST 14
 #define LORA_DIO 26
+#define LORA_BUSY  33
+//#define USE_SX126X
+
+//#define CUSTOM_SPI
+#define LORA_SPI_SCK  5
+#define LORA_SPI_MISO 19
+#define LORA_SPI_MOSI 27
 
 #define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
+
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/Sensor_Examples/TSL2561/fdrs_node_config.h

@@ -11,11 +11,36 @@
 #define DEEP_SLEEP
 //#define POWER_CTRL    14
 #define FDRS_DEBUG
+
+// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
 #define RADIOLIB_MODULE SX1276 //Tested on SX1276
 #define LORA_SS 18
 #define LORA_RST 14
 #define LORA_DIO 26
+#define LORA_BUSY  33
+//#define USE_SX126X
+
+//#define CUSTOM_SPI
+#define LORA_SPI_SCK  5
+#define LORA_SPI_MISO 19
+#define LORA_SPI_MOSI 27
 
 #define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
+
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

examples/Sensor_Examples/TippingBucket/fdrs_node_config.h

@@ -11,11 +11,36 @@
 #define DEEP_SLEEP
 //#define POWER_CTRL    14
 #define FDRS_DEBUG
+
+// I2C - OLED or RTC
+#define I2C_SDA 5
+#define I2C_SCL 6
+
+// OLED -- Displays console debugging messages on an SSD1306 I²C OLED
+// #define USE_OLED    
+#define OLED_HEADER "FDRS"
+#define OLED_PAGE_SECS 30
+#define OLED_RST -1
+
 // LoRa Configuration
 #define RADIOLIB_MODULE SX1276 //Tested on SX1276
 #define LORA_SS 18
 #define LORA_RST 14
 #define LORA_DIO 26
+#define LORA_BUSY  33
+//#define USE_SX126X
+
+//#define CUSTOM_SPI
+#define LORA_SPI_SCK  5
+#define LORA_SPI_MISO 19
+#define LORA_SPI_MOSI 27
 
 #define LORA_TXPWR 17    // LoRa TX power in dBm (: +2dBm - +17dBm (for SX1276-7) +20dBm (for SX1278))
 #define LORA_ACK        // Request LoRa acknowledgment.
+
+// Time settings
+#define USDST
+// #define EUDST
+#define STD_OFFSET      (-6)                // Local standard time offset in hours from UTC - if unsure, check https://time.is
+#define DST_OFFSET      (STD_OFFSET + 1)    // Local savings time offset in hours from UTC - if unsure, check https://time.is
+#define TIME_PRINTTIME    15     // Time, in minutes, between printing local time to debug

src/fdrs_gateway.h

@@ -71,7 +71,7 @@ void releaseLogBuffer();
   #include "fdrs_oled.h"
 #endif
 #include "fdrs_debug.h"
-#include "fdrs_gateway_time.h"
+#include "fdrs_time.h"
 #include "fdrs_gateway_serial.h"
 #include "fdrs_gateway_scheduler.h"
 #ifdef USE_ESPNOW

src/fdrs_globals.h

@@ -27,6 +27,7 @@
 #define GLOBAL_LOCAL_OFFSET     (-5)    // Time in hours between local time and UTC
 #define GLOBAL_TIME_FETCHNTP    60      // Time in minutes between fetching time from NTP server
 #define GLOBAL_TIME_PRINTTIME   15      // Time in minutes between printing local time
+#define GLOBAL_TIME_SEND_INTERVAL 60    // Time in minutes between sending out time
 
 #define GLOBAL_LORA_FREQUENCY 915.0   // Carrier frequency in MHz. Allowed values range from 137.0 MHz to 1020.0 MHz (varies by chip).
 #define GLOBAL_LORA_SF 7     // LoRa link spreading factor. Allowed values range from 6 to 12.

src/fdrs_node.h

@@ -37,7 +37,7 @@ static uint16_t crc16_update(uint16_t crc, uint8_t a)
 }
 
 bool is_controller = false;
-SystemPacket theCmd;
+// SystemPacket theCmd;  // does not seem to be used
 DataReading theData[256];
 uint8_t ln;
 bool newData;
@@ -48,20 +48,23 @@ crcResult crcReturned = CRC_NULL;
 uint8_t incMAC[6];
 DataReading fdrsData[espnow_size];
 DataReading incData[espnow_size];
+TimeMaster timeMaster;
 
 uint8_t data_count = 0;
 
 void (*callback_ptr)(DataReading);
 uint16_t subscription_list[256] = {};
 bool active_subs[256] = {};
+unsigned long lastTimePrint = 0;
 
+#ifdef USE_OLED
+  #include "fdrs_oled.h"
+#endif
 #include "fdrs_debug.h"
+#include "fdrs_time.h"
 #ifdef DEBUG_CONFIG
 // #include "fdrs_checkConfig.h"
 #endif
-#ifdef USE_OLED
-  #include "fdrs_oled.h"
-#endif
 #ifdef USE_ESPNOW
   #include "fdrs_node_espnow.h"
 #endif
@@ -71,13 +74,11 @@ bool active_subs[256] = {};
 
 void beginFDRS()
 {
-#ifdef FDRS_DEBUG
   Serial.begin(115200);
   // // find out the reset reason
   // esp_reset_reason_t resetReason;
   // resetReason = esp_reset_reason();
-#endif
-#ifdef USE_OLED
+#ifdef USE_I2C
   Wire.begin(I2C_SDA, I2C_SCL);
   init_oled();
   DBG("Display initialized!");
@@ -270,6 +271,7 @@ void sleepFDRS(uint32_t sleep_time)
 
 void loopFDRS()
 {
+  updateTime();
 #ifdef USE_LORA
   handleLoRa();
 #endif
@@ -283,6 +285,11 @@ if (is_controller){
     }
 #endif 
   }
+// Output time to display if time is valid
+  if(millis() - lastTimePrint > (1000*60*FDRS_TIME_PRINTTIME)) {
+    lastTimePrint = millis();
+    printTime();
+  }
 }
 
 bool addFDRS(void (*new_cb_ptr)(DataReading))
@@ -389,3 +396,10 @@ uint32_t pingFDRS(uint32_t timeout)
 #endif
 }
 
+// Skeleton Functions related to function calls to files that are not included
+#ifndef USE_LORA
+  void sendTimeLoRa() {}
+#endif
+#ifndef USE_ESPNOW
+  esp_err_t sendTimeESPNow() { return ESP_OK; }                  // fdrs_gateway_time.h
+#endif

src/fdrs_node_espnow.h

@@ -14,6 +14,24 @@ bool pingFlag = false;
 uint32_t last_refresh = 0;
 uint32_t gtwy_timeout = 300000;
 
+void recvTimeEspNow(uint32_t t) {
+  // Process time if there is no master set yet or if LoRa is the master or if we are already the time master
+  if(timeMaster.tmType == TM_NONE || (timeMaster.tmType == TM_ESPNOW && timeMaster.tmAddress == incMAC[4] << 8 | incMAC[5])) {
+    DBG("Received time via ESP-NOW from 0x" + String(incMAC[5], HEX));
+    if(timeMaster.tmAddress == 0x0000) {
+      timeMaster.tmType = TM_ESPNOW;
+      timeMaster.tmAddress = incMAC[4] << 8 & incMAC[5];
+      DBG("ESP-NOW time master is 0x" + String(incMAC[5], HEX));
+    }
+    setTime(t);
+    timeMaster.tmLastTimeSet = millis();
+  }
+  else {
+    DBG("ESP-NOW 0x" + String(incMAC[5], HEX) + " is not time master, discarding request");
+  }
+  return;
+}
+
 // Set ESP-NOW send and receive callbacks for either ESP8266 or ESP32
 #if defined(ESP8266)
 void OnDataSent(uint8_t *mac_addr, uint8_t sendStatus)
@@ -44,6 +62,7 @@ void OnDataSent(const uint8_t *mac_addr, esp_now_send_status_t status)
 void OnDataRecv(const uint8_t *mac, const uint8_t *incomingData, int len)
 {
 #endif
+memcpy(&incMAC, mac, sizeof(incMAC));
     if (len < sizeof(DataReading))
     {
         SystemPacket command;
@@ -57,6 +76,9 @@ void OnDataRecv(const uint8_t *mac, const uint8_t *incomingData, int len)
             is_added = true;
             gtwy_timeout = command.param;
             break;
+case cmd_time:
+            recvTimeEspNow(command.param);
+            break;
         }
     }
     else
@@ -112,5 +134,4 @@ bool refresh_registration()
   return false;
 #endif // USE_ESPNOW
   return true;
-}
-
+}

src/fdrs_time.h

@@ -7,6 +7,12 @@
 #define FDRS_TIME_PRINTTIME GLOBAL_TIME_PRINTTIME
 #endif // TIME_PRINTTIME
 
+#if defined(TIME_SEND_INTERVAL)
+#define FDRS_TIME_SEND_INTERVAL TIME_SEND_INTERVAL
+#else
+#define FDRS_TIME_SEND_INTERVAL GLOBAL_TIME_SEND_INTERVAL
+#endif // TIME_SEND_INTERVAL
+
 // select Local Standard time Offset from UTC configuration
 #if defined(STD_OFFSET)
 #define FDRS_STD_OFFSET STD_OFFSET
@@ -294,7 +300,7 @@ bool setTime(time_t currentTime) {
   // Do not call sendFDRS here.  It will not work for some reason.
   if(validTime()) {
     lastNTPFetchSuccess = millis();
-    if(TIME_SEND_INTERVAL == 0 && ((millis() - lastTimeSend > 5000) || lastTimeSend == 0)) { // avoid sending twice on start with RTC and WiFi
+    if(FDRS_TIME_SEND_INTERVAL == 0 && ((millis() - lastTimeSend > 5000) || lastTimeSend == 0)) { // avoid sending twice on start with RTC and WiFi
       lastTimeSend = millis();
       sendTime();
     }
@@ -320,7 +326,7 @@ void updateTime() {
     lastUpdate = millis();
   }
   // Send out time to other devices if we have exceeded the time send interval
-  if(validTimeFlag && (TIME_SEND_INTERVAL != 0) && (millis() - lastTimeSend) > (1000 * 60 * TIME_SEND_INTERVAL)) {
+  if(validTimeFlag && (FDRS_TIME_SEND_INTERVAL != 0) && (millis() - lastTimeSend) > (1000 * 60 * FDRS_TIME_SEND_INTERVAL)) {
     lastTimeSend = millis();
     sendTime();
   }