Skip to content

Commit

Permalink
added support for wonder_mv for beta version of firmware
Browse files Browse the repository at this point in the history
  • Loading branch information
qlrd committed Aug 24, 2024
1 parent f19d9a2 commit bc3ec6b
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 15 deletions.
15 changes: 8 additions & 7 deletions e2e/test_004_select_device_screen.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,14 @@ def test_render_buttons(self, mock_get_running_app):
grid = window.children[0].children[0]
buttons = grid.children

self.assertEqual(len(buttons), 6)
self.assertEqual(buttons[5].id, "select_device_m5stickv")
self.assertEqual(buttons[4].id, "select_device_amigo")
self.assertEqual(buttons[3].id, "select_device_dock")
self.assertEqual(buttons[2].id, "select_device_bit")
self.assertEqual(buttons[1].id, "select_device_yahboom")
self.assertEqual(buttons[0].id, "select_device_cube")
self.assertEqual(len(buttons), 7)
self.assertEqual(buttons[6].id, "select_device_m5stickv")
self.assertEqual(buttons[5].id, "select_device_amigo")
self.assertEqual(buttons[4].id, "select_device_dock")
self.assertEqual(buttons[3].id, "select_device_bit")
self.assertEqual(buttons[2].id, "select_device_yahboom")
self.assertEqual(buttons[1].id, "select_device_cube")
self.assertEqual(buttons[0].id, "select_device_wonder_mv")
mock_get_running_app.assert_called_once()

@patch.object(EventLoopBase, "ensure_window", lambda x: None)
Expand Down
10 changes: 9 additions & 1 deletion src/app/screens/download_beta_screen.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,15 @@ def update(self, *args, **kwargs):
self.redirect_error(f"Invalid firmware: {value}")

elif key == "device":
if value in ("m5stickv", "amigo", "dock", "bit", "yahboom", "cube"):
if value in (
"m5stickv",
"amigo",
"dock",
"bit",
"yahboom",
"cube",
"wonder_mv",
):
self.device = value
else:
self.redirect_error(f'Invalid device: "{value}"')
Expand Down
14 changes: 11 additions & 3 deletions src/app/screens/select_device_screen.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ def __init__(self, **kwargs):
wid="select_device_screen", name="SelectDeviceScreen", **kwargs
)
self.enabled_devices = []
self.make_grid(wid="select_device_screen_grid", rows=6)
self.make_grid(wid="select_device_screen_grid", rows=7)

for row, device in enumerate(
["m5stickv", "amigo", "dock", "bit", "yahboom", "cube"]
["m5stickv", "amigo", "dock", "bit", "yahboom", "cube", "wonder_mv"]
):

def _on_press(instance):
Expand Down Expand Up @@ -99,7 +99,15 @@ def update(self, *args, **kwargs):
if value is not None:
self.enabled_devices = []

for device in ("m5stickv", "amigo", "dock", "bit", "yahboom", "cube"):
for device in (
"m5stickv",
"amigo",
"dock",
"bit",
"yahboom",
"cube",
"wonder_mv",
):
cleanr = re.compile("\\[.*?\\]")
clean_text = re.sub(cleanr, "", value)
if device not in VALID_DEVICES_VERSIONS[clean_text]:
Expand Down
1 change: 1 addition & 0 deletions src/utils/constants/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"yahboom",
"dock",
"cube",
"wonder_mv",
],
}

Expand Down
2 changes: 1 addition & 1 deletion src/utils/downloader/beta_downloader.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
class BetaDownloader(AssetDownloader):
"""Download beta assets from odudex/krux_binaries"""

VALID_DEVICES = ("m5stickv", "amigo", "dock", "bit", "yahboom", "cube")
VALID_DEVICES = ("m5stickv", "amigo", "dock", "bit", "yahboom", "cube", "wonder_mv")

VALID_BINARY_TYPES = ("firmware.bin", "kboot.kfpkg")

Expand Down
4 changes: 2 additions & 2 deletions src/utils/flasher/base_flasher.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def port(self, value: str):
if value in ("amigo", "amigo_tft", "amigo_ips", "m5stickv", "bit", "cube"):
vid = "0403"

elif value in ("dock", "yahboom"):
elif value in ("dock", "yahboom", "wonder_mv"):
vid = "7523"

else:
Expand Down Expand Up @@ -115,7 +115,7 @@ def board(self, value: str):
self._board = "goE"
self.debug(f"board::setter={self._board}")

elif value == "dock":
elif value in ("dock", "wonder_mv"):
self._board = "dan"
self.debug(f"board::setter={self._board}")

Expand Down
1 change: 1 addition & 0 deletions src/utils/selector/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"bit",
"yahboom",
"cube",
"wonder_mv",
)


Expand Down
2 changes: 1 addition & 1 deletion src/utils/trigger/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"""
import os
from kivy.logger import Logger
from ..info import mro
from src.utils.info import mro


class Trigger:
Expand Down
7 changes: 7 additions & 0 deletions tests/test_002_trigger.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ def test_warn(self, mock_mro):
trigger.warning("Hello World")
mock_mro.assert_called_once()

@patch.dict(os.environ, {"LOGLEVEL": "warning"}, clear=True)
@patch("src.utils.trigger.mro", return_value="Mock")
def test_error(self, mock_mro):
trigger = Trigger()
trigger.error("Hello World")
mock_mro.assert_called_once()

@patch.dict(os.environ, {"LOGLEVEL": "debug"}, clear=True)
@patch("src.utils.trigger.mro", return_value="Mock")
def test_debug(self, mock_mro):
Expand Down

0 comments on commit bc3ec6b

Please sign in to comment.