From 654dcb34d61bc8313ff0d3a62e73bdf945c231ad Mon Sep 17 00:00:00 2001 From: jacqueline Date: Wed, 20 Mar 2024 18:23:33 +1100 Subject: Support pinning decoded images to RAM --- lua/playing.lua | 20 ++++++++++---------- lua/widgets.lua | 42 ++++++++++++++++++++++++++---------------- 2 files changed, 36 insertions(+), 26 deletions(-) (limited to 'lua') diff --git a/lua/playing.lua b/lua/playing.lua index 947bdec9..a0b9fde3 100644 --- a/lua/playing.lua +++ b/lua/playing.lua @@ -7,16 +7,16 @@ local queue = require("queue") local screen = require("screen") local img = { - play = "//lua/img/play.png", - pause = "//lua/img/pause.png", - next = "//lua/img/next.png", - next_disabled = "//lua/img/next_disabled.png", - prev = "//lua/img/prev.png", - prev_disabled = "//lua/img/prev_disabled.png", - shuffle = "//lua/img/shuffle.png", - shuffle_disabled = "//lua/img/shuffle_disabled.png", - repeat_enabled = "//lua/img/repeat.png", - repeat_disabled = "//lua/img/repeat_disabled.png", + play = lvgl.ImgData("//lua/img/play.png"), + pause = lvgl.ImgData("//lua/img/pause.png"), + next = lvgl.ImgData("//lua/img/next.png"), + next_disabled = lvgl.ImgData("//lua/img/next_disabled.png"), + prev = lvgl.ImgData("//lua/img/prev.png"), + prev_disabled = lvgl.ImgData("//lua/img/prev_disabled.png"), + shuffle = lvgl.ImgData("//lua/img/shuffle.png"), + shuffle_disabled = lvgl.ImgData("//lua/img/shuffle_disabled.png"), + repeat_enabled = lvgl.ImgData("//lua/img/repeat.png"), + repeat_disabled = lvgl.ImgData("//lua/img/repeat_disabled.png"), } local is_now_playing_shown = false diff --git a/lua/widgets.lua b/lua/widgets.lua index 8905fa43..87e3f5fd 100644 --- a/lua/widgets.lua +++ b/lua/widgets.lua @@ -6,6 +6,20 @@ local backstack = require("backstack") local theme = require("theme") local database = require("database") +local img = { + db = lvgl.ImgData("//lua/img/db.png"), + chg = lvgl.ImgData("//lua/img/bat/chg.png"), + bat_100 = lvgl.ImgData("//lua/img/bat/100.png"), + bat_80 = lvgl.ImgData("//lua/img/bat/80.png"), + bat_60 = lvgl.ImgData("//lua/img/bat/60.png"), + bat_40 = lvgl.ImgData("//lua/img/bat/40.png"), + bat_20 = lvgl.ImgData("//lua/img/bat/20.png"), + bat_0 = lvgl.ImgData("//lua/img/bat/0.png"), + bat_0chg = lvgl.ImgData("//lua/img/bat/0chg.png"), + bt_conn = lvgl.ImgData("//lua/assets/bt_conn.png"), + bt = lvgl.ImgData("//lua/assets/bt.png") +} + local widgets = {} function widgets.MenuScreen(opts) @@ -93,14 +107,10 @@ function widgets.StatusBar(parent, opts) status_bar.title:set { text = opts.title } end - status_bar.db_updating = status_bar.root:Image { - src = "//lua/img/db.png" - } + status_bar.db_updating = status_bar.root:Image { src = img.db } status_bar.bluetooth = status_bar.root:Image {} status_bar.battery = status_bar.root:Image {} - status_bar.chg = status_bar.battery:Image { - src = "//lua/img/bat/chg.png" - } + status_bar.chg = status_bar.battery:Image { src = img.chg } status_bar.chg:center() local is_charging = nil @@ -110,20 +120,20 @@ function widgets.StatusBar(parent, opts) if is_charging == nil or percent == nil then return end local src if percent >= 95 then - src = "100.png" + src = img.bat_100 elseif percent >= 75 then - src = "80.png" + src = img.bat_80 elseif percent >= 55 then - src = "60.png" + src = img.bat_60 elseif percent >= 35 then - src = "40.png" + src = img.bat_40 elseif percent >= 15 then - src = "20.png" + src = img.bat_20 else if is_charging then - src = "0chg.png" + src = img.bat_0chg else - src = "0.png" + src = img.bat_0 end end if is_charging then @@ -131,7 +141,7 @@ function widgets.StatusBar(parent, opts) else status_bar.chg:add_flag(lvgl.FLAG.HIDDEN) end - status_bar.battery:set_src("//lua/img/bat/" .. src) + status_bar.battery:set_src(src) end status_bar.bindings = { @@ -159,9 +169,9 @@ function widgets.StatusBar(parent, opts) end), bluetooth.connected:bind(function(connected) if connected then - status_bar.bluetooth:set_src("//lua/assets/bt_conn.png") + status_bar.bluetooth:set_src(img.bt_conn) else - status_bar.bluetooth:set_src("//lua/assets/bt.png") + status_bar.bluetooth:set_src(img.bt) end end), } -- cgit v1.2.3 From dadac304dd930ddf4c5aebcc069c5d9f881b2b60 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Thu, 21 Mar 2024 11:51:48 +1100 Subject: Add very basic usb msc ui --- lua/settings.lua | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'lua') diff --git a/lua/settings.lua b/lua/settings.lua index 9d9ccf2d..e9e9d370 100644 --- a/lua/settings.lua +++ b/lua/settings.lua @@ -275,6 +275,53 @@ local InputSettings = screen:new { end } +local MassStorageSettings = screen:new { + createUi = function(self) + self.menu = SettingsScreen("USB Storage") + local version = require("version").samd() + if tonumber(version) < 2 then + self.menu.content:Label { + w = lvgl.PCT(100), + text = "Usb Mass Storage requires a SAMD21 firmware version >=2." + } + return + end + + local enable_container = self.menu.content:Object { + flex = { + flex_direction = "row", + justify_content = "flex-start", + align_items = "content", + align_content = "flex-start", + }, + w = lvgl.PCT(100), + h = lvgl.SIZE_CONTENT, + pad_bottom = 1, + } + enable_container:Label { text = "Enable", flex_grow = 1 } + local enable_sw = enable_container:Switch {} + + local usb = require("usb") + local bind_switch = function() + if usb.msc_enabled:get() then + enable_sw:add_state(lvgl.STATE.CHECKED) + else + enable_sw:clear_state(lvgl.STATE.CHECKED) + end + end + + enable_sw:onevent(lvgl.EVENT.VALUE_CHANGED, function() + usb.msc_enabled:set(enable_sw:enabled()) + bind_switch() + end) + + self.bindings = { + usb.msc_enabled:bind(bind_switch), + } + end, + canPop = true +} + local DatabaseSettings = screen:new { createUi = function(self) self.menu = SettingsScreen("Database") @@ -352,6 +399,9 @@ return screen:new { submenu("Display", DisplaySettings) submenu("Input Method", InputSettings) + section("USB") + submenu("Storage", MassStorageSettings) + section("System") submenu("Database", DatabaseSettings) submenu("Firmware", FirmwareSettings) -- cgit v1.2.3 From cddfc2fbf77fbc5b6e6484a86b119b771bc480af Mon Sep 17 00:00:00 2001 From: jacqueline Date: Thu, 21 Mar 2024 13:02:00 +1100 Subject: Dont allow quitting the msc screen when msc is enabled --- lua/settings.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lua') diff --git a/lua/settings.lua b/lua/settings.lua index e9e9d370..fe36fe02 100644 --- a/lua/settings.lua +++ b/lua/settings.lua @@ -8,6 +8,7 @@ local controls = require("controls") local bluetooth = require("bluetooth") local database = require("database") local screen = require("screen") +local usb = require("usb") local function SettingsScreen(title) local menu = widgets.MenuScreen { @@ -301,7 +302,6 @@ local MassStorageSettings = screen:new { enable_container:Label { text = "Enable", flex_grow = 1 } local enable_sw = enable_container:Switch {} - local usb = require("usb") local bind_switch = function() if usb.msc_enabled:get() then enable_sw:add_state(lvgl.STATE.CHECKED) @@ -319,7 +319,9 @@ local MassStorageSettings = screen:new { usb.msc_enabled:bind(bind_switch), } end, - canPop = true + canPop = function() + return not usb.msc_enabled:get() + end } local DatabaseSettings = screen:new { -- cgit v1.2.3