Simplify power negotiation logic.

Author: aentinger

.vscode/settings.json

@@ -0,0 +1,85 @@
+{
+    "files.associations": {
+        "*.impl": "cpp",
+        "*.cppx": "cpp",
+        "*.tcc": "cpp",
+        "bitset": "cpp",
+        "list": "cpp",
+        "unordered_map": "cpp",
+        "fstream": "cpp",
+        "istream": "cpp",
+        "ostream": "cpp",
+        "streambuf": "cpp",
+        "functional": "cpp",
+        "__node_handle": "cpp",
+        "hash_map": "cpp",
+        "map": "cpp",
+        "string": "cpp",
+        "vector": "cpp",
+        "mutex": "cpp",
+        "condition_variable": "cpp",
+        "__mutex_base": "cpp",
+        "memory": "cpp",
+        "chrono": "cpp",
+        "__hash_table": "cpp",
+        "array": "cpp",
+        "deque": "cpp",
+        "string_view": "cpp",
+        "initializer_list": "cpp",
+        "__bit_reference": "cpp",
+        "__split_buffer": "cpp",
+        "__tree": "cpp",
+        "filesystem": "cpp",
+        "iterator": "cpp",
+        "cctype": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "atomic": "cpp",
+        "codecvt": "cpp",
+        "complex": "cpp",
+        "cstdint": "cpp",
+        "exception": "cpp",
+        "algorithm": "cpp",
+        "memory_resource": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "random": "cpp",
+        "ratio": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "iomanip": "cpp",
+        "iosfwd": "cpp",
+        "limits": "cpp",
+        "new": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "thread": "cpp",
+        "cinttypes": "cpp",
+        "typeinfo": "cpp",
+        "bit": "cpp",
+        "__config": "cpp",
+        "__debug": "cpp",
+        "__errc": "cpp",
+        "__functional_base": "cpp",
+        "__locale": "cpp",
+        "__nullptr": "cpp",
+        "__string": "cpp",
+        "__threading_support": "cpp",
+        "__tuple": "cpp",
+        "ios": "cpp",
+        "locale": "cpp",
+        "queue": "cpp",
+        "stack": "cpp",
+        "*.cx": "cpp"
+    }
+}

src/Braccio++.cpp

@@ -42,8 +42,8 @@ extern "C"
 {
   void braccio_disp_flush(lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *color_p);
   void braccio_read_keypad(lv_indev_drv_t * indev, lv_indev_data_t * data);
-  void braccio_unlock_pd_semaphore_irq();
-  void braccio_unlock_pd_semaphore();
+  void braccio_onPowerIrqEvent();
+  void braccio_onPowerTimerEvent();
 };
 
 /**************************************************************************************
@@ -77,7 +77,6 @@ BraccioClass::BraccioClass()
 , _display_thd{}
 , _pd_events{}
 , _pd_timer{}
-, _start_pd_burst{0xFFFFFFFF}
 , _pd_thd{osPriorityHigh}
 {
 
@@ -99,9 +98,9 @@ bool BraccioClass::begin(voidFuncPtr custom_menu)
   pinMode(RS485_RX_PIN, INPUT_PULLUP);
 
   _PD_UFP.init_PPS(_i2c_mtx, PPS_V(7.2), PPS_A(2.0));
+  attachInterrupt(PIN_FUSB302_INT, braccio_onPowerIrqEvent, FALLING);
   _pd_thd.start(mbed::callback(this, &BraccioClass::pd_thread_func));
-  attachInterrupt(PIN_FUSB302_INT, braccio_unlock_pd_semaphore_irq, FALLING);
-  _pd_timer.attach(braccio_unlock_pd_semaphore, 10ms);
+  _pd_timer.attach(braccio_onPowerTimerEvent, 10ms);
 
   button_init();
 
@@ -112,26 +111,15 @@ bool BraccioClass::begin(voidFuncPtr custom_menu)
   lvgl_init();
   _display_thd.start(mbed::callback(this, &BraccioClass::display_thread_func));
 
-
-  auto check_power_func = [this]()
-  {
-    if (!_PD_UFP.is_PPS_ready())
-    {
-      _PD_UFP.print_status(Serial);
-      _PD_UFP.set_PPS(PPS_V(7.2), PPS_A(2.0));
-      delay(10);
-    }
-  };
-
-  lvgl_splashScreen(2000, check_power_func);
+  lvgl_splashScreen(2000);
   lv_obj_clean(lv_scr_act());
 
   if (!_PD_UFP.is_PPS_ready())
     lvgl_pleaseConnectPower();
 
   /* Loop forever, if no power is attached. */
-  while(!_PD_UFP.is_PPS_ready())
-    check_power_func();
+  while(!_PD_UFP.is_PPS_ready()) { }
+  /* check_power_func(); */
   lv_obj_clean(lv_scr_act());
 
   if (custom_menu)
@@ -248,15 +236,14 @@ void BraccioClass::lvgl_disp_flush(lv_disp_drv_t *disp, const lv_area_t *area, l
   lv_disp_flush_ready(disp);
 }
 
-void BraccioClass::unlock_pd_semaphore_irq()
+void BraccioClass::onPowerIrqEvent()
 {
- _start_pd_burst = millis();
- _pd_events.set(2);
+ _pd_events.set(PD_IRQ_EVENT_FLAG);
 }
 
-void BraccioClass::unlock_pd_semaphore()
+void BraccioClass::onPowerTimerEvent()
 {
-  _pd_events.set(1);
+  _pd_events.set(PD_TIMER_EVENT_FLAG);
 }
 
 /**************************************************************************************
@@ -411,7 +398,7 @@ void BraccioClass::display_thread_func()
   }
 }
 
-void BraccioClass::lvgl_splashScreen(unsigned long const duration_ms, std::function<void()> check_power_func)
+void BraccioClass::lvgl_splashScreen(unsigned long const duration_ms)
 {
   extern const lv_img_dsc_t img_bulb_gif;
 
@@ -420,14 +407,8 @@ void BraccioClass::lvgl_splashScreen(unsigned long const duration_ms, std::funct
   lv_gif_set_src(img, &img_bulb_gif);
   lv_obj_align(img, LV_ALIGN_CENTER, 0, 0);
 
-  /* Wait until the splash screen duration is over.
-   * Meanwhile use the wait time for checking the
-   * power.
-   */
-  for (unsigned long const start = millis(); millis() - start < duration_ms;)
-  {
-    check_power_func();
-  }
+  /* Wait until the splash screen duration is over. */
+  for (unsigned long const start = millis(); millis() - start < duration_ms; delay(10)) { }
 
   lv_obj_del(img);
 }
@@ -457,27 +438,32 @@ void BraccioClass::lvgl_defaultMenu()
 
 void BraccioClass::pd_thread_func()
 {
-  _start_pd_burst = millis();
   size_t last_time_ask_pps = 0;
 
   for(;;)
   {
-    auto ret = _pd_events.wait_any(0xFF);
-    if ((ret & 1) && (millis() - _start_pd_burst > 1000)) {
+    uint32_t const flags = _pd_events.wait_any(0xFF);
+
+    if (flags & PD_IRQ_EVENT_FLAG)
+    {
       _pd_timer.detach();
-      _pd_timer.attach(braccio_unlock_pd_semaphore, 5s);
+      _pd_timer.attach(braccio_onPowerTimerEvent, 10ms);
     }
-    if (ret & 2) {
+
+    if (flags & PD_TIMER_EVENT_FLAG)
+    {
       _pd_timer.detach();
-      _pd_timer.attach(braccio_unlock_pd_semaphore, 50ms);
+      _pd_timer.attach(braccio_onPowerTimerEvent, 10ms);
     }
-    if (millis() - last_time_ask_pps > 5000) {
+
+    _PD_UFP.run();
+    _PD_UFP.print_status(Serial);
+
+    if ((millis() - last_time_ask_pps) > 5000)
+    {
       _PD_UFP.set_PPS(PPS_V(7.2), PPS_A(2.0));
       last_time_ask_pps = millis();
     }
-    _PD_UFP.run();
-    if (_PD_UFP.is_power_ready() && _PD_UFP.is_PPS_ready()) {
-    }
   }
 }
 
@@ -538,12 +524,12 @@ extern "C" void braccio_read_keypad(lv_indev_drv_t * drv, lv_indev_data_t* data)
     data->key = last_key;
 }
 
-void braccio_unlock_pd_semaphore_irq()
+void braccio_onPowerIrqEvent()
 {
-  Braccio.unlock_pd_semaphore_irq();
+  Braccio.onPowerIrqEvent();
 }
 
-void braccio_unlock_pd_semaphore()
+void braccio_onPowerTimerEvent()
 {
-  Braccio.unlock_pd_semaphore();
+  Braccio.onPowerTimerEvent();
 }

src/Braccio++.h

@@ -103,8 +103,8 @@ class BraccioClass
 
   /* Those functions MUST NOT be used by the user. */
   void lvgl_disp_flush(lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *color_p);
-  void unlock_pd_semaphore_irq();
-  void unlock_pd_semaphore();
+  void onPowerIrqEvent();
+  void onPowerTimerEvent();
 
 protected:
 
@@ -156,14 +156,15 @@ class BraccioClass
   void display_init();
   void lvgl_init();
   void display_thread_func();
-  void lvgl_splashScreen(unsigned long const duration_ms, std::function<void()> check_power_func);
+  void lvgl_splashScreen(unsigned long const duration_ms);
   void lvgl_pleaseConnectPower();
   void lvgl_defaultMenu();
 
 
+  static uint32_t constexpr PD_IRQ_EVENT_FLAG   = 1;
+  static uint32_t constexpr PD_TIMER_EVENT_FLAG = 2;
   rtos::EventFlags _pd_events;
   mbed::Ticker _pd_timer;
-  unsigned int _start_pd_burst;
   rtos::Thread _pd_thd;
   void pd_thread_func();
 };