File tree Expand file tree Collapse file tree 4 files changed +15
-5
lines changed Expand file tree Collapse file tree 4 files changed +15
-5
lines changed Original file line number Diff line number Diff line change @@ -68,7 +68,7 @@ debug_tool = jlink
68
68
; monitor adapter_khz 10000
69
69
70
70
lib_deps =
71
- https://github.com/meshtastic/esp8266-oled-ssd1306.git# 4e724c42f22effdcaa7cdc707a6dceaf9fc10383 ; ESP8266_SSD1306
71
+ https://github.com/meshtastic/esp8266-oled-ssd1306.git# 22c7eef2025431ba5e1f5f8bd1720cfdcc49cadc ; ESP8266_SSD1306
72
72
https://github.com/geeksville/OneButton.git ; OneButton library for non-blocking button debounce
73
73
1202 ; CRC32, explicitly needed because dependency is missing in the ble ota update lib
74
74
https://github.com/meshtastic/arduino-fsm.git# 2f106146071fc7bc620e1e8d4b88dc4e0266ce39
Original file line number Diff line number Diff line change @@ -1366,9 +1366,16 @@ int Screen::handleTextMessage(const MeshPacket *arg)
1366
1366
1367
1367
return 0 ;
1368
1368
}
1369
+ bool Screen::goToNextNotification () {
1370
+ uint32_t frame = ui.getFirstNotifyingFrame ();
1371
+ if (frame == -1 ) {
1372
+ return false ;
1373
+ }
1374
+ ui.switchToFrame (frame);
1375
+ }
1369
1376
1370
- void Screen::goToNextNotificaiton () {
1371
- ui.switchToFrame (ui. getFirstNotifyingFrame () );
1377
+ void Screen::goToFirstUIFrame () {
1378
+ ui.switchToFrame (0 );
1372
1379
}
1373
1380
1374
1381
} // namespace graphics
Original file line number Diff line number Diff line change @@ -196,7 +196,8 @@ class Screen : public concurrency::OSThread
196
196
197
197
int handleStatusUpdate (const meshtastic::Status *arg);
198
198
int handleTextMessage (const MeshPacket *arg);
199
- void goToNextNotificaiton ();
199
+ bool goToNextNotification ();
200
+ void goToFirstUIFrame ();
200
201
201
202
// / Used to force (super slow) eink displays to draw critical frames
202
203
void forceDisplay ();
Original file line number Diff line number Diff line change @@ -252,7 +252,9 @@ class ButtonThread : public OSThread
252
252
{
253
253
#ifndef NO_ESP32
254
254
disablePin ();
255
- screen->goToNextNotificaiton ();
255
+ if (!screen->goToNextNotification ()) {
256
+ screen->goToFirstUIFrame ();
257
+ }
256
258
#endif
257
259
}
258
260
You can’t perform that action at this time.
0 commit comments