Skip to content

Commit da6bb81

Browse files
lbuquelbuque
committed
modules/startup: Added display firmware version.
Signed-off-by: lbuque <[email protected]>
1 parent 8743a02 commit da6bb81

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+1195
-1493
lines changed

‎m5stack/modules/startup/airq.py‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
from startup import Startup
66
import M5
77
import network
8-
from widgets.label import Label
9-
from widgets.image import Image
8+
import widgets
109
import os
1110
import sys
1211
import gc
@@ -186,51 +185,51 @@ def on_launch(self):
186185
self._user_id = self._get_user_id()
187186

188187
def on_view(self):
189-
self._mac_label = Label(
188+
self._mac_label = widgets.Label(
190189
str(None),
191190
15,
192191
63,
193192
w=138,
194193
h=24,
195-
font_align=Label.LEFT_ALIGNED,
194+
font_align=widgets.Label.LEFT_ALIGNED,
196195
fg_color=0x000000,
197196
bg_color=0xFFFFFF,
198197
font=M5.Lcd.FONTS.DejaVu18,
199198
parent=self._sprite,
200199
)
201-
self._mac_label.set_long_mode(Label.LONG_DOT)
200+
self._mac_label.set_long_mode(widgets.Label.LONG_DOT)
202201

203-
self._user_id_label = Label(
202+
self._user_id_label = widgets.Label(
204203
str(None),
205204
15,
206205
119,
207206
w=138,
208207
h=24,
209-
font_align=Label.LEFT_ALIGNED,
208+
font_align=widgets.Label.LEFT_ALIGNED,
210209
fg_color=0x000000,
211210
bg_color=0xFFFFFF,
212211
font=M5.Lcd.FONTS.DejaVu18,
213212
parent=self._sprite,
214213
)
215-
self._user_id_label.set_long_mode(Label.LONG_DOT)
214+
self._user_id_label.set_long_mode(widgets.Label.LONG_DOT)
216215

217-
self._bg_img = Image(
216+
self._bg_img = widgets.Image(
218217
use_sprite=False,
219218
parent=self._sprite,
220219
)
221220
self._bg_img.set_x(0)
222221
self._bg_img.set_y(0)
223222
self._bg_img.set_size(200, 200)
224223

225-
self._wifi_img = Image(
224+
self._wifi_img = widgets.Image(
226225
use_sprite=False,
227226
parent=self._sprite,
228227
)
229228
self._wifi_img.set_x(4)
230229
self._wifi_img.set_y(176)
231230
self._wifi_img.set_size(32, 24)
232231

233-
self._server_img = Image(
232+
self._server_img = widgets.Image(
234233
use_sprite=False,
235234
parent=self._sprite,
236235
)
@@ -323,35 +322,35 @@ def on_launch(self):
323322
self._server = self._get_server()
324323

325324
def on_view(self):
326-
self._ssid_label = Label(
325+
self._ssid_label = widgets.Label(
327326
str(None),
328327
15,
329328
63,
330329
w=138,
331330
h=24,
332-
font_align=Label.LEFT_ALIGNED,
331+
font_align=widgets.Label.LEFT_ALIGNED,
333332
fg_color=0x000000,
334333
bg_color=0xFFFFFF,
335334
font=M5.Lcd.FONTS.DejaVu18,
336335
parent=self._sprite,
337336
)
338-
self._ssid_label.set_long_mode(Label.LONG_DOT)
337+
self._ssid_label.set_long_mode(widgets.Label.LONG_DOT)
339338

340-
self._server_label = Label(
339+
self._server_label = widgets.Label(
341340
str(None),
342341
15,
343342
119,
344343
w=138,
345344
h=24,
346-
font_align=Label.LEFT_ALIGNED,
345+
font_align=widgets.Label.LEFT_ALIGNED,
347346
fg_color=0x000000,
348347
bg_color=0xFFFFFF,
349348
font=M5.Lcd.FONTS.DejaVu18,
350349
parent=self._sprite,
351350
)
352-
self._server_label.set_long_mode(Label.LONG_DOT)
351+
self._server_label.set_long_mode(widgets.Label.LONG_DOT)
353352

354-
self._bg_img = Image(use_sprite=False, parent=self._sprite)
353+
self._bg_img = widgets.Image(use_sprite=False, parent=self._sprite)
355354
self._bg_img.set_x(0)
356355
self._bg_img.set_y(0)
357356
self._bg_img.set_size(200, 200)
@@ -392,7 +391,7 @@ def __init__(self, sprite) -> None:
392391
super().__init__()
393392

394393
def on_launch(self):
395-
self._bg_img = Image(use_sprite=False, parent=self._sprite)
394+
self._bg_img = widgets.Image(use_sprite=False, parent=self._sprite)
396395
self._bg_img.set_x(0)
397396
self._bg_img.set_y(0)
398397
self._bg_img.set_size(200, 200)
@@ -413,7 +412,7 @@ def on_view(self):
413412
if len(self._labels) != 5:
414413
for i in range(5):
415414
self._labels.append(
416-
Label(
415+
widgets.Label(
417416
"",
418417
14,
419418
37 + 27 * i,
@@ -425,7 +424,7 @@ def on_view(self):
425424
parent=self._sprite,
426425
)
427426
)
428-
self._labels[-1].set_long_mode(Label.LONG_DOT)
427+
self._labels[-1].set_long_mode(widgets.Label.LONG_DOT)
429428

430429
for label, file in zip(self._labels, self._files):
431430
# print("file:", file)

‎m5stack/modules/startup/atoms3.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import machine
99
import binascii
1010
from . import Startup
11-
from hardware import RGB
1211

1312
# AtomS3 startup menu
1413

‎m5stack/modules/startup/basic/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from startup import Startup
66
import M5
7-
from .framework import Framework
7+
from . import framework
88
from .apps.settings import SettingsApp
99
from .apps.dev import DevApp
1010
from .apps.app_run import RunApp
@@ -36,7 +36,7 @@ def startup(self, ssid: str, pswd: str, timeout: int = 60) -> None:
3636
M5.Lcd.drawImage(res.LOGO_IMG)
3737
time.sleep_ms(200)
3838

39-
fw = Framework()
39+
fw = framework.Framework()
4040
settings_app = SettingsApp(None, data=self._wlan)
4141
dev_app = DevApp(None, data=self._wlan)
4242
run_app = RunApp(None)

‎m5stack/modules/startup/basic/app.py‎ renamed to ‎m5stack/modules/startup/basic/app_base.py‎

File renamed without changes.

‎m5stack/modules/startup/basic/apps/app_list.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5-
from .. import app
5+
from .. import app_base
66
import widgets
77
import M5
88
from M5 import Widgets
@@ -81,7 +81,7 @@ def __len__(self):
8181
return self.files_len
8282

8383

84-
class ListApp(app.AppBase):
84+
class ListApp(app_base.AppBase):
8585
def __init__(self, icos: dict, data=None) -> None:
8686
super().__init__()
8787

‎m5stack/modules/startup/basic/apps/app_run.py‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5-
from .. import app
5+
from .. import app_base
66
import M5
77
from M5 import Widgets
88
import sys
99
import machine
1010
import os
11+
import esp32
1112
import time
1213
import boot_option
1314
from .. import res
@@ -21,7 +22,7 @@
2122
_HAS_SERVER = False
2223

2324

24-
class RunApp(app.AppBase):
25+
class RunApp(app_base.AppBase):
2526
def __init__(self, icos: dict, data=None) -> None:
2627
super().__init__()
2728

@@ -82,10 +83,10 @@ async def _btnc_event_handler(self, fw):
8283
machine.reset()
8384

8485
@staticmethod
85-
def _get_file_info(path) -> tuple(str, str, str):
86+
def _get_file_info(path):
8687
mtime = None
8788
account = None
88-
ver = None
89+
ver = f"Ver: UIFLOW2 {esp32.firmware_info()[3]}"
8990

9091
try:
9192
stat = os.stat(path)
@@ -115,7 +116,4 @@ def _get_file_info(path) -> tuple(str, str, str):
115116
else:
116117
account = "Account: None"
117118

118-
if ver is None:
119-
ver = "Ver: None"
120-
121119
return (mtime, account, ver)

‎m5stack/modules/startup/basic/apps/dev.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5-
from .. import app
5+
from .. import app_base
66
from .. import res
77
import M5
88
from M5 import Widgets
@@ -46,7 +46,7 @@
4646
}
4747

4848

49-
class DevApp(app.AppBase):
49+
class DevApp(app_base.AppBase):
5050
def __init__(self, icos: dict, data=None) -> None:
5151
self._wifi = data
5252
super().__init__()

‎m5stack/modules/startup/basic/apps/ezdata.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5-
from .. import app
5+
from .. import app_base
66
from .. import res
77
import M5
88

99

10-
class EzDataApp(app.AppBase):
10+
class EzDataApp(app_base.AppBase):
1111
def __init__(self, icos) -> None:
1212
self._lcd = icos
1313
super().__init__()

0 commit comments

Comments
 (0)