Skip to content

Commit 1daccfd

Browse files
committed
Rewriting flow to entice user to attach power
- Directly show 'Please connect power' message. - Verify power while running splash screen.
1 parent 59ab72c commit 1daccfd

File tree

3 files changed

+20
-24
lines changed

3 files changed

+20
-24
lines changed

src/Braccio++.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ class BraccioClass
161161

162162
// default display APIs
163163
void lvgl_splashScreen(unsigned long const duration_ms);
164-
void lvgl_emptyBatterySymbol();
164+
void lvgl_pleaseConnectPower();
165165
void defaultMenu();
166166

167167
void setID(int id) {

src/Braccio.cpp

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -126,33 +126,23 @@ bool BraccioClass::begin(voidFuncPtr customMenu) {
126126
_display_thread.start(mbed::callback(this, &BraccioClass::display_thread));
127127

128128
lvgl_splashScreen(2000);
129+
lv_obj_clean(lv_scr_act());
129130

130131
if (!PD_UFP.is_PPS_ready())
131-
lvgl_emptyBatterySymbol();
132+
lvgl_pleaseConnectPower();
132133

133-
for(auto const now = millis();
134-
((millis() - now) < 5000) && !PD_UFP.is_PPS_ready();)
134+
/* Loop forever, if no power is attached. */
135+
while(!PD_UFP.is_PPS_ready())
135136
{
136137
i2c_mutex.lock();
137138
PD_UFP.print_status(Serial);
138139
PD_UFP.set_PPS(PPS_V(7.2), PPS_A(2.0));
139140
delay(10);
140141
i2c_mutex.unlock();
142+
Serial.println(millis());
141143
}
142-
143144
lv_obj_clean(lv_scr_act());
144145

145-
if (!PD_UFP.is_PPS_ready())
146-
{
147-
lv_style_set_text_font(&_lv_style, &lv_font_montserrat_32);
148-
lv_obj_t * label1 = lv_label_create(lv_scr_act());
149-
lv_obj_add_style(label1, &_lv_style, 0);
150-
lv_label_set_text(label1, "Please\nconnect\npower.");
151-
lv_label_set_long_mode(label1, LV_LABEL_LONG_SCROLL);
152-
lv_obj_set_align(label1, LV_ALIGN_CENTER);
153-
lv_obj_set_pos(label1, 0, 0);
154-
}
155-
156146
if (customMenu) {
157147
customMenu();
158148
} else {
@@ -237,23 +227,29 @@ void BraccioClass::lvgl_splashScreen(unsigned long const duration_ms)
237227
}
238228

239229
lv_obj_del(img);
240-
lv_obj_clean(lv_scr_act());
241230
}
242231

243-
void BraccioClass::lvgl_emptyBatterySymbol()
232+
void BraccioClass::lvgl_pleaseConnectPower()
244233
{
245-
lv_style_set_text_font(&_lv_style, &lv_font_montserrat_48);
234+
lv_style_set_text_font(&_lv_style, &lv_font_montserrat_32);
246235
lv_obj_t * label1 = lv_label_create(lv_scr_act());
247236
lv_obj_add_style(label1, &_lv_style, 0);
248-
lv_label_set_text(label1, LV_SYMBOL_BATTERY_EMPTY);
237+
lv_label_set_text(label1, "Please\nconnect\npower.");
238+
lv_label_set_long_mode(label1, LV_LABEL_LONG_SCROLL);
249239
lv_obj_set_align(label1, LV_ALIGN_CENTER);
250240
lv_obj_set_pos(label1, 0, 0);
251241
}
252242

253-
void BraccioClass::defaultMenu() {
254-
243+
void BraccioClass::defaultMenu()
244+
{
255245
// TODO: create a meaningful default menu
256-
246+
lv_style_set_text_font(&_lv_style, &lv_font_montserrat_32);
247+
lv_obj_t * label1 = lv_label_create(lv_scr_act());
248+
lv_obj_add_style(label1, &_lv_style, 0);
249+
lv_label_set_text(label1, "Braccio++");
250+
lv_label_set_long_mode(label1, LV_LABEL_LONG_SCROLL);
251+
lv_obj_set_align(label1, LV_ALIGN_CENTER);
252+
lv_obj_set_pos(label1, 0, 0);
257253
}
258254

259255
void BraccioClass::motors_connected_thread() {

src/lv_conf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
282282
#define LV_FONT_MONTSERRAT_42 0
283283
#define LV_FONT_MONTSERRAT_44 0
284284
#define LV_FONT_MONTSERRAT_46 0
285-
#define LV_FONT_MONTSERRAT_48 1
285+
#define LV_FONT_MONTSERRAT_48 0
286286

287287
/*Demonstrate special features*/
288288
#define LV_FONT_MONTSERRAT_12_SUBPX 0

0 commit comments

Comments
 (0)