Skip to content

Fix: _PD_UFP.run() need to be run multiple times during power negotiation #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 31, 2022
Merged

Fix: _PD_UFP.run() need to be run multiple times during power negotiation #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9d8791
Ensure that run() is called often enough, otherwise we won't be able …
aentinger Jan 31, 2022
48b60d3
Throttle back, only run a 10 ms loop during PD negotiation, otherwise…
aentinger Jan 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 44 additions & 50 deletions src/Braccio++.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
};

/**************************************************************************************
Expand Down Expand Up @@ -77,7 +77,6 @@ BraccioClass::BraccioClass()
, _display_thd{}
, _pd_events{}
, _pd_timer{}
, _start_pd_burst{0xFFFFFFFF}
, _pd_thd{osPriorityHigh}
{

Expand All @@ -96,12 +95,13 @@ bool BraccioClass::begin(voidFuncPtr custom_menu)
Serial.begin(115200);

pinMode(PIN_FUSB302_INT, INPUT_PULLUP);
attachInterrupt(PIN_FUSB302_INT, braccio_onPowerIrqEvent, FALLING);
pinMode(RS485_RX_PIN, INPUT_PULLUP);

_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_UFP.init_PPS(_i2c_mtx, PPS_V(7.2), PPS_A(2.0));
_pd_timer.attach(braccio_onPowerTimerEvent, 10ms);
braccio_onPowerIrqEvent(); /* Start power burst. */
_pd_thd.start(mbed::callback(this, &BraccioClass::pd_thread_func));

button_init();

Expand All @@ -112,26 +112,14 @@ 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()) { delay(10); }
lv_obj_clean(lv_scr_act());

if (custom_menu)
Expand Down Expand Up @@ -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);
}

/**************************************************************************************
Expand Down Expand Up @@ -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;

Expand All @@ -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);
}
Expand Down Expand Up @@ -457,27 +438,40 @@ void BraccioClass::lvgl_defaultMenu()

void BraccioClass::pd_thread_func()
{
_start_pd_burst = millis();
size_t last_time_ask_pps = 0;
unsigned long start_pd_burst = 0;
static unsigned long const START_PD_BURST_TIMEOUT_ms = 1000;

for(;;)
{
auto ret = _pd_events.wait_any(0xFF);
if ((ret & 1) && (millis() - _start_pd_burst > 1000)) {
_pd_timer.detach();
_pd_timer.attach(braccio_unlock_pd_semaphore, 5s);
}
if (ret & 2) {
_pd_timer.detach();
_pd_timer.attach(braccio_unlock_pd_semaphore, 50ms);
}
if (millis() - last_time_ask_pps > 5000) {
/* Wait for either a timer or a IRQ event. */
uint32_t const flags = _pd_events.wait_any(0xFF);

/* The actual calls to the PD library. */
if ((millis() - last_time_ask_pps) > 5000)
{
start_pd_burst = millis();
_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()) {
_PD_UFP.print_status(Serial);

/* Set up the next time this loop is called. */
if (flags & PD_IRQ_EVENT_FLAG)
{
start_pd_burst = millis();
_pd_timer.detach();
_pd_timer.attach(braccio_onPowerTimerEvent, 10ms);
}

if (flags & PD_TIMER_EVENT_FLAG)
{
_pd_timer.detach();
if ((millis() - start_pd_burst) < START_PD_BURST_TIMEOUT_ms)
_pd_timer.attach(braccio_onPowerTimerEvent, 10ms);
else
_pd_timer.attach(braccio_onPowerTimerEvent, 1000ms);
}
}
}
Expand Down Expand Up @@ -539,12 +533,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();
}
9 changes: 5 additions & 4 deletions src/Braccio++.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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();
};
Expand Down