@@ -126,33 +126,23 @@ bool BraccioClass::begin(voidFuncPtr customMenu) {
126
126
_display_thread.start (mbed::callback (this , &BraccioClass::display_thread));
127
127
128
128
lvgl_splashScreen (2000 );
129
+ lv_obj_clean (lv_scr_act ());
129
130
130
131
if (!PD_UFP.is_PPS_ready ())
131
- lvgl_emptyBatterySymbol ();
132
+ lvgl_pleaseConnectPower ();
132
133
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 ())
135
136
{
136
137
i2c_mutex.lock ();
137
138
PD_UFP.print_status (Serial);
138
139
PD_UFP.set_PPS (PPS_V (7.2 ), PPS_A (2.0 ));
139
140
delay (10 );
140
141
i2c_mutex.unlock ();
142
+ Serial.println (millis ());
141
143
}
142
-
143
144
lv_obj_clean (lv_scr_act ());
144
145
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\n connect\n power." );
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
-
156
146
if (customMenu) {
157
147
customMenu ();
158
148
} else {
@@ -237,23 +227,29 @@ void BraccioClass::lvgl_splashScreen(unsigned long const duration_ms)
237
227
}
238
228
239
229
lv_obj_del (img);
240
- lv_obj_clean (lv_scr_act ());
241
230
}
242
231
243
- void BraccioClass::lvgl_emptyBatterySymbol ()
232
+ void BraccioClass::lvgl_pleaseConnectPower ()
244
233
{
245
- lv_style_set_text_font (&_lv_style, &lv_font_montserrat_48 );
234
+ lv_style_set_text_font (&_lv_style, &lv_font_montserrat_32 );
246
235
lv_obj_t * label1 = lv_label_create (lv_scr_act ());
247
236
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\n connect\n power." );
238
+ lv_label_set_long_mode (label1, LV_LABEL_LONG_SCROLL);
249
239
lv_obj_set_align (label1, LV_ALIGN_CENTER);
250
240
lv_obj_set_pos (label1, 0 , 0 );
251
241
}
252
242
253
- void BraccioClass::defaultMenu () {
254
-
243
+ void BraccioClass::defaultMenu ()
244
+ {
255
245
// 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 );
257
253
}
258
254
259
255
void BraccioClass::motors_connected_thread () {
0 commit comments