Merge pull request #862 from cyberman54/development

Development

include/globals.h

@@ -30,11 +30,6 @@
 // length of display buffer for lmic event messages
 #define LMIC_EVENTMSG_LEN 17
 
-// I2C bus access control
-#define I2C_MUTEX_LOCK()                                                       \
-  (xSemaphoreTake(I2Caccess, pdMS_TO_TICKS(DISPLAYREFRESH_MS)) == pdTRUE)
-#define I2C_MUTEX_UNLOCK() (xSemaphoreGive(I2Caccess))
-
 // pseudo system halt function, useful to prevent writeloops to NVRAM
 #ifndef _ASSERT
 #define _ASSERT(cond)                                                          \

include/timekeeper.h

@@ -10,7 +10,8 @@
 #include "dcf77.h"
 #include "esp_sntp.h"
 
-#define HAS_LORA_TIME ((HAS_LORA) && ((TIME_SYNC_LORASERVER) || (TIME_SYNC_LORAWAN)))
+#define HAS_LORA_TIME                                                          \
+  ((HAS_LORA) && ((TIME_SYNC_LORASERVER) || (TIME_SYNC_LORAWAN)))
 
 #define SECS_YR_2000 (946684800UL)    // the time at the start of y2k
 #define GPS_UTC_DIFF 315964800UL      // seconds diff between gps and utc epoch
@@ -26,16 +27,14 @@ extern DRAM_ATTR bool TimePulseTick; // 1sec pps flag set by GPS or RTC
 extern DRAM_ATTR unsigned long lastPPS;
 extern hw_timer_t *ppsIRQ;
 
-void IRAM_ATTR CLOCKIRQ(void);
+//void IRAM_ATTR CLOCKIRQ(void);
-void IRAM_ATTR GPSIRQ(void);
+//void IRAM_ATTR GPSIRQ(void);
-void clock_init(void);
+//void clock_loop(void *pvParameters);
-void clock_loop(void *pvParameters);
 void setTimeSyncIRQ(void);
-uint8_t timepulse_init(void);
+void time_init(void);
 bool timeIsValid(time_t const t);
 void calibrateTime(void);
-bool setMyTime(uint32_t t_sec, uint16_t t_msec,
+bool setMyTime(uint32_t t_sec, uint16_t t_msec, timesource_t mytimesource);
-                         timesource_t mytimesource);
 time_t compileTime(void);
 time_t mkgmtime(const struct tm *ptm);
 TickType_t tx_Ticks(uint32_t framesize, unsigned long baud, uint32_t config,

src/bmesensor.cpp

@@ -52,9 +52,6 @@ int bme_init(void) {
   int rc = 0;
 
 #ifdef HAS_BME680
-  // block i2c bus access
-  if (I2C_MUTEX_LOCK()) {
-
   Wire.begin(HAS_BME680);
   iaqSensor.begin(BME680_ADDR, Wire);
 
@@ -69,25 +66,14 @@ int bme_init(void) {
 
   rc = checkIaqSensorStatus();
 
-  } else
-    ESP_LOGE(TAG, "I2c bus busy - BME680 initialization error");
-
 #elif defined HAS_BME280
-  if (I2C_MUTEX_LOCK()) {
   rc = bme.begin(BME280_ADDR);
-  } else
-    ESP_LOGE(TAG, "I2c bus busy - BME280 initialization error");
-
 #elif defined HAS_BMP180
-  if (I2C_MUTEX_LOCK()) {
   // Wire.begin(21, 22);
   rc = bmp.begin();
-  } else
-    ESP_LOGE(TAG, "I2c bus busy - BMP180 initialization error");
 
 #endif
 
-  I2C_MUTEX_UNLOCK(); // release i2c bus access
   if (rc)
     bmecycler.attach(BMECYCLE, setBMEIRQ); // start cyclic data transmit
   return rc;
@@ -123,8 +109,7 @@ int checkIaqSensorStatus(void) {
 // store current BME sensor data in struct
 void bme_storedata(bmeStatus_t *bme_store) {
 
-  if ((cfg.payloadmask & MEMS_DATA) &&
+  if (cfg.payloadmask & MEMS_DATA)
-      (I2C_MUTEX_LOCK())) { // block i2c bus access
 
 #ifdef HAS_BME680
     if (iaqSensor.run()) { // if new data is available
@@ -154,9 +139,6 @@ void bme_storedata(bmeStatus_t *bme_store) {
   bme_store->iaq = 0; // IAQ feature not present with BME280
 #endif
 
-    I2C_MUTEX_UNLOCK(); // release i2c bus access
-  }
-
 } // bme_storedata()
 
 #ifdef HAS_BME680

src/cyclic.cpp

@@ -18,10 +18,6 @@ void doHousekeeping() {
   if ((RTC_runmode == RUNMODE_UPDATE) || (RTC_runmode == RUNMODE_MAINTENANCE))
     do_reset(true); // warmstart
 
-  // try to get time if we don't yet have a recent timesource
-  if (timeSource == _unsynced || timeSource == _set)
-    calibrateTime();
-
   // print heap and task storage information
   ESP_LOGD(TAG, "Heap: Free:%d, Min:%d, Size:%d, Alloc:%d, StackHWM:%d",
            ESP.getFreeHeap(), ESP.getMinFreeHeap(), ESP.getHeapSize(),

src/display.cpp

@@ -90,13 +90,6 @@ void dp_setup(int contrast) {
 
 void dp_init(bool verbose) {
 
-#if (HAS_DISPLAY) == 1 // i2c
-  // block i2c bus access
-  if (!I2C_MUTEX_LOCK())
-    ESP_LOGV(TAG, "[%0.3f] i2c mutex lock failed", _seconds());
-  else {
-#endif
-
   dp_setup(DISPLAYCONTRAST);
 
   if (verbose) {
@@ -122,8 +115,7 @@ void dp_init(bool verbose) {
               (chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : "");
     dp_println();
     dp_printf("%dMB %s Flash", spi_flash_get_chip_size() / (1024 * 1024),
-                (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "int."
+              (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "int." : "ext.");
-                                                              : "ext.");
 
     // give user some time to read or take picture
     dp_dump(displaybuf);
@@ -165,11 +157,6 @@ void dp_init(bool verbose) {
 
   dp_power(cfg.screenon); // set display off if disabled
 
-#if (HAS_DISPLAY) == 1  // i2c
-    I2C_MUTEX_UNLOCK(); // release i2c bus access
-  }                     // mutex
-#endif
-
 } // dp_init
 
 void dp_refresh(bool nextPage) {
@@ -182,10 +169,6 @@ void dp_refresh(bool nextPage) {
   if (!DisplayIsOn && (DisplayIsOn == cfg.screenon))
     return;
 
-  // block i2c bus access
-  if (!I2C_MUTEX_LOCK())
-    ESP_LOGV(TAG, "[%0.3f] i2c mutex lock failed", _seconds());
-  else {
   // set display on/off according to current device configuration
   if (DisplayIsOn != cfg.screenon) {
     DisplayIsOn = cfg.screenon;
@@ -202,9 +185,6 @@ void dp_refresh(bool nextPage) {
 
   dp_drawPage(nextPage);
 
-    I2C_MUTEX_UNLOCK(); // release i2c bus access
-
-  } // mutex
 } // refreshDisplay()
 
 void dp_drawPage(bool nextpage) {
@@ -600,14 +580,8 @@ void dp_power(uint8_t screenon) {
 
 void dp_shutdown(void) {
 #if (HAS_DISPLAY) == 1
-  // block i2c bus access
-  if (!I2C_MUTEX_LOCK())
-    ESP_LOGV(TAG, "[%0.3f] i2c mutex lock failed", _seconds());
-  else {
   obdPower(&ssoled, false);
   delay(DISPLAYREFRESH_MS / 1000 * 1.1);
-    I2C_MUTEX_UNLOCK(); // release i2c bus access
-  }
 #elif (HAS_DISPLAY) == 2
   // to come
 #endif

src/i2c.cpp

@@ -12,7 +12,7 @@ void i2c_init(void) {
   Wire.begin();
 }
 
-//void i2c_deinit(void) { Wire.end(); }
+// void i2c_deinit(void) { Wire.end(); }
 void i2c_deinit(void) { Wire.~TwoWire(); }
 
 void i2c_scan(void) {
@@ -49,9 +49,6 @@ void i2c_scan(void) {
 
   ESP_LOGI(TAG, "Starting I2C bus scan...");
 
-  // block i2c bus access
-  if (I2C_MUTEX_LOCK()) {
-
   memset(&bbi2c, 0, sizeof(bbi2c));
   bbi2c.bWire = 0;
   bbi2c.iSDA = MY_DISPLAY_SDA;
@@ -83,15 +80,10 @@ void i2c_scan(void) {
     } // for i
     ESP_LOGI(TAG, "%u I2C device(s) found", iCount);
   }
-
-    I2C_MUTEX_UNLOCK(); // release i2c bus access
-  } else
-    ESP_LOGE(TAG, "I2C bus busy - scan error");
 }
 
-// mutexed functions for i2c r/w access
+// functions for i2c r/w access, mutexing is done by Wire.cpp
 int i2c_readBytes(uint8_t addr, uint8_t reg, uint8_t *data, uint8_t len) {
-  if (I2C_MUTEX_LOCK()) {
 
   uint8_t ret = 0;
   Wire.beginTransmission(addr);
@@ -109,17 +101,11 @@ int i2c_readBytes(uint8_t addr, uint8_t reg, uint8_t *data, uint8_t len) {
     data[index++] = Wire.read();
   }
 
-  finish:
+finish:
-    I2C_MUTEX_UNLOCK(); // release i2c bus access
+  return ret ? ret : 0xFF;
-    return ret;
-  } else {
-    ESP_LOGW(TAG, "[%0.3f] i2c mutex lock failed", _seconds());
-    return 0xFF;
-  }
 }
 
 int i2c_writeBytes(uint8_t addr, uint8_t reg, uint8_t *data, uint8_t len) {
-  if (I2C_MUTEX_LOCK()) {
 
   uint8_t ret = 0;
   Wire.beginTransmission(addr);
@@ -129,10 +115,5 @@ int i2c_writeBytes(uint8_t addr, uint8_t reg, uint8_t *data, uint8_t len) {
   }
   ret = Wire.endTransmission();
 
-    I2C_MUTEX_UNLOCK(); // release i2c bus access
   return ret ? ret : 0xFF;
-  } else {
-    ESP_LOGW(TAG, "[%0.3f] i2c mutex lock failed", _seconds());
-    return 0xFF;
-  }
 }

src/main.cpp

@@ -87,11 +87,6 @@ void setup() {
 
   char features[100] = "";
 
-  // create some semaphores for syncing / mutexing tasks
-  I2Caccess = xSemaphoreCreateMutex(); // for access management of i2c bus
-  _ASSERT(I2Caccess != NULL);
-  I2C_MUTEX_UNLOCK();
-
   // disable brownout detection
 #ifdef DISABLE_BROWNOUT
   // register with brownout is at address DR_REG_RTCCNTL_BASE + 0xd4
@@ -481,20 +476,8 @@ void setup() {
 
 // only if we have a timesource we do timesync
 #if ((HAS_LORA_TIME) || (HAS_GPS) || (HAS_RTC))
-
+  time_init();
-#if (defined HAS_IF482 || defined HAS_DCF77)
-  ESP_LOGI(TAG, "Starting Clock Controller...");
-  clock_init();
-#endif
-
-#if (HAS_LORA_TIME)
-  timesync_init(); // create loraserver time sync task
-#endif
-
-  ESP_LOGI(TAG, "Starting Timekeeper...");
-  _ASSERT(timepulse_init()); // starts pps and cyclic time sync
   strcat_P(features, " TIME");
-
 #endif // timesync
 
   // show compiled features

src/rtctime.cpp

@@ -10,8 +10,6 @@ RtcDS3231<TwoWire> Rtc(Wire); // RTC hardware i2c interface
 // initialize RTC
 uint8_t rtc_init(void) {
 
-  if (I2C_MUTEX_LOCK()) { // block i2c bus access
-
   Wire.begin(HAS_RTC);
   Rtc.Begin(MY_DISPLAY_SDA, MY_DISPLAY_SCL);
 
@@ -36,41 +34,37 @@ uint8_t rtc_init(void) {
   }
 #endif
 
-    I2C_MUTEX_UNLOCK(); // release i2c bus access
   ESP_LOGI(TAG, "RTC initialized");
   return 1; // success
-  } else {
+
-    ESP_LOGE(TAG, "RTC initialization error, I2C bus busy");
+  // failure
-    return 0; // failure
+  // return 0
-  }
 
 } // rtc_init()
 
 uint8_t set_rtctime(time_t t) { // t is sec epoch time
-  if (I2C_MUTEX_LOCK()) {
+
 #ifdef RTC_INT // sync rtc 1Hz pulse on top of second
   Rtc.SetSquareWavePin(DS3231SquareWavePin_ModeNone);  // off
   Rtc.SetSquareWavePin(DS3231SquareWavePin_ModeClock); // start
 #endif
   Rtc.SetDateTime(RtcDateTime(t - SECS_YR_2000)); // epoch -> sec2000
-    I2C_MUTEX_UNLOCK();
   ESP_LOGI(TAG, "RTC time synced");
   return 1; // success
-  } else {
+
-    ESP_LOGE(TAG, "RTC set time failure");
+  // failure
-    return 0; // failure
+  // return 0
-  }
+
 } // set_rtctime()
 
 time_t get_rtctime(uint16_t *msec) {
+
   time_t t = 0;
   *msec = 0;
-  if (I2C_MUTEX_LOCK()) {
   if (Rtc.IsDateTimeValid() && Rtc.GetIsRunning()) {
     RtcDateTime tt = Rtc.GetDateTime();
     t = tt.Epoch32Time(); // sec2000 -> epoch
   }
-    I2C_MUTEX_UNLOCK();
 #ifdef RTC_INT
   // adjust time to top of next second by waiting TimePulseTick to flip
   bool lastTick = TimePulseTick;
@@ -79,19 +73,12 @@ time_t get_rtctime(uint16_t *msec) {
   t++;
 #endif
   return t;
-  } else {
+
-    ESP_LOGE(TAG, "RTC get time failure");
-    return 0; // failure
-  }
 } // get_rtctime()
 
 float get_rtctemp(void) {
-  if (I2C_MUTEX_LOCK()) {
   RtcTemperature temp = Rtc.GetTemperature();
-    I2C_MUTEX_UNLOCK();
   return temp.AsFloatDegC();
-  }
-  return 0;
 } // get_rtctemp()
 
 #endif // HAS_RTC

src/timekeeper.cpp

@@ -31,6 +31,40 @@ Ticker timesyncer;
 
 void setTimeSyncIRQ() { xTaskNotify(irqHandlerTask, TIMESYNC_IRQ, eSetBits); }
 
+// interrupt service routine triggered by GPS PPS
+void IRAM_ATTR GPSIRQ(void) {
+
+  BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+
+  // take timestamp
+  lastPPS = millis(); // last time of pps
+
+  // yield only if we should
+  if (xHigherPriorityTaskWoken)
+    portYIELD_FROM_ISR();
+}
+
+// interrupt service routine triggered by esp32 hardware timer
+void IRAM_ATTR CLOCKIRQ(void) {
+
+  BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+
+// advance wall clock, if we have
+#if (defined HAS_IF482 || defined HAS_DCF77)
+  xTaskNotifyFromISR(ClockTask, uint32_t(time(NULL)), eSetBits,
+                     &xHigherPriorityTaskWoken);
+#endif
+
+// flip time pulse ticker, if needed
+#ifdef HAS_DISPLAY
+  TimePulseTick = !TimePulseTick; // flip global variable pulse ticker
+#endif
+
+  // yield only if we should
+  if (xHigherPriorityTaskWoken)
+    portYIELD_FROM_ISR();
+}
+
 void calibrateTime(void) {
 
   // kick off asynchronous lora timesync if we have
@@ -63,8 +97,7 @@ void calibrateTime(void) {
 } // calibrateTime()
 
 // set system time (UTC), calibrate RTC and RTC_INT pps
-bool setMyTime(uint32_t t_sec, uint16_t t_msec,
+bool setMyTime(uint32_t t_sec, uint16_t t_msec, timesource_t mytimesource) {
-                         timesource_t mytimesource) {
 
   struct timeval tv = {0};
 
@@ -126,7 +159,7 @@ bool setMyTime(uint32_t t_sec, uint16_t t_msec,
 }
 
 // helper function to setup a pulse per second for time synchronisation
-uint8_t timepulse_init() {
+void timepulse_init(void) {
 
   // set esp-idf API sntp sync mode
   // sntp_init();
@@ -141,22 +174,12 @@ uint8_t timepulse_init() {
 
 // if we have, use pulse from on board RTC chip as time base for calendar time
 #if defined RTC_INT
-
   // setup external rtc 1Hz clock pulse
-  if (I2C_MUTEX_LOCK()) {
   Rtc.SetSquareWavePinClockFrequency(DS3231SquareWaveClock_1Hz);
   Rtc.SetSquareWavePin(DS3231SquareWavePin_ModeClock);
-    I2C_MUTEX_UNLOCK();
   pinMode(RTC_INT, INPUT_PULLUP);
   attachInterrupt(digitalPinToInterrupt(RTC_INT), CLOCKIRQ, FALLING);
   ESP_LOGI(TAG, "Timepulse: external (RTC)");
-    return 1; // success
-  } else {
-    ESP_LOGE(TAG, "RTC initialization error, I2C bus busy");
-    return 0; // failure
-  }
-  return 1; // success
-
 #else
   // use ESP32 hardware timer as time base for calendar time
   ppsIRQ = timerBegin(1, 8000, true);   // set 80 MHz prescaler to 1/10000 sec
@@ -164,53 +187,17 @@ uint8_t timepulse_init() {
   timerAttachInterrupt(ppsIRQ, &CLOCKIRQ, false);
   timerAlarmEnable(ppsIRQ);
   ESP_LOGI(TAG, "Timepulse: internal (ESP32 hardware timer)");
-  return 1; // success
-
 #endif
 
-  // start cyclic time sync
-  timesyncer.attach(TIME_SYNC_INTERVAL * 60, setTimeSyncIRQ);
-
   // get time if we don't have one
   if (timeSource != _set)
     setTimeSyncIRQ(); // init systime by RTC or GPS or LORA
 
+  // start cyclic time sync
+  timesyncer.attach(TIME_SYNC_INTERVAL * 60, setTimeSyncIRQ);
+
 } // timepulse_init
 
-// interrupt service routine triggered by GPS PPS
-void IRAM_ATTR GPSIRQ(void) {
-
-  BaseType_t xHigherPriorityTaskWoken = pdFALSE;
-
-  // take timestamp
-  lastPPS = millis(); // last time of pps
-
-  // yield only if we should
-  if (xHigherPriorityTaskWoken)
-    portYIELD_FROM_ISR();
-}
-
-// interrupt service routine triggered by esp32 hardware timer
-void IRAM_ATTR CLOCKIRQ(void) {
-
-  BaseType_t xHigherPriorityTaskWoken = pdFALSE;
-
-// advance wall clock, if we have
-#if (defined HAS_IF482 || defined HAS_DCF77)
-  xTaskNotifyFromISR(ClockTask, uint32_t(time(NULL)), eSetBits,
-                     &xHigherPriorityTaskWoken);
-#endif
-
-// flip time pulse ticker, if needed
-#ifdef HAS_DISPLAY
-  TimePulseTick = !TimePulseTick; // flip global variable pulse ticker
-#endif
-
-  // yield only if we should
-  if (xHigherPriorityTaskWoken)
-    portYIELD_FROM_ISR();
-}
-
 // helper function to check plausibility of a given epoch time
 bool timeIsValid(time_t const t) {
   // is t a time in the past? we use compile time to guess
@@ -231,26 +218,6 @@ TickType_t tx_Ticks(uint32_t framesize, unsigned long baud, uint32_t config,
   return round(txTime);
 }
 
-void clock_init(void) {
-
-// setup clock output interface
-#ifdef HAS_IF482
-  IF482.begin(HAS_IF482);
-#elif defined HAS_DCF77
-  pinMode(HAS_DCF77, OUTPUT);
-#endif
-
-  xTaskCreatePinnedToCore(clock_loop,  // task function
-                          "clockloop", // name of task
-                          3072,        // stack size of task
-                          (void *)1,   // task parameter
-                          6,           // priority of the task
-                          &ClockTask,  // task handle
-                          1);          // CPU core
-
-  _ASSERT(ClockTask != NULL); // has clock task started?
-} // clock_init
-
 void clock_loop(void *taskparameter) { // ClockTask
 
   uint32_t current_time = 0, previous_time = 0;
@@ -333,6 +300,26 @@ void clock_loop(void *taskparameter) { // ClockTask
   } // for
 } // clock_loop()
 
+void clock_init(void) {
+
+// setup clock output interface
+#ifdef HAS_IF482
+  IF482.begin(HAS_IF482);
+#elif defined HAS_DCF77
+  pinMode(HAS_DCF77, OUTPUT);
+#endif
+
+  xTaskCreatePinnedToCore(clock_loop,  // task function
+                          "clockloop", // name of task
+                          3072,        // stack size of task
+                          (void *)1,   // task parameter
+                          6,           // priority of the task
+                          &ClockTask,  // task handle
+                          1);          // CPU core
+
+  _ASSERT(ClockTask != NULL); // has clock task started?
+} // clock_init
+
 // we use compile date to create a time_t reference "in the past"
 time_t compileTime(void) {
 
@@ -392,3 +379,15 @@ time_t mkgmtime(const struct tm *ptm) {
   secs += ptm->tm_sec;
   return secs;
 }
+
+void time_init(void) {
+#if (HAS_LORA_TIME)
+  timesync_init(); // create loraserver time sync task
+#endif
+  ESP_LOGI(TAG, "Starting time pulse...");
+  timepulse_init(); // starts pps and cyclic time sync
+#if (defined HAS_IF482 || defined HAS_DCF77)
+  ESP_LOGI(TAG, "Starting clock controller...");
+  clock_init();
+#endif
+}