fix firmware crash, fix icon size in software, fix version numberings

NotQuiteApex · NotQuiteApex · commit 562e31ada4de · 2025-08-05T22:47:02.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v0.6.1 - But Not Serialized (August 5, 2025)
+- Fix firmware having too big of a serial buffer, causing a crash on startup.
+- Fix versioning issue with firmware and software.
+- Fix action icon size in software.
+
 # v0.6.0 - Defaultized (August 5, 2025)
 - Added EEPROM support to firmware. A default, app-disconnected profile can now be set. Support in GUI will be added at a later date.
 - Added "sleep mode" for when host computer goes to sleep (suspends USB), turning off the screen and RGB.
diff --git a/desktop/Cargo.lock b/desktop/Cargo.lock
diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jukebox_desktop"
-version = "0.5.0"
+version = "0.6.1"
 edition = "2021"
 build = "build.rs"
 license = "MIT"
diff --git a/desktop/src/actions/types.rs b/desktop/src/actions/types.rs
@@ -7,7 +7,7 @@ use std::{
 };
 
 use eframe::egui::{
-    load::Bytes, vec2, Image, ImageSource, TextureFilter, TextureOptions, TextureWrapMode, Ui,
+    load::Bytes, Image, ImageSource, TextureFilter, TextureOptions, TextureWrapMode, Ui,
 };
 use jukebox_util::peripheral::DeviceType;
 use serde::{Deserialize, Serialize};
@@ -111,7 +111,6 @@ macro_rules! create_actions {
                         mipmap_mode: None,
                     })
                     .corner_radius(2.0)
-                    .max_size(vec2(64.0, 64.0))
             }
         }
     };
diff --git a/desktop/src/gui/action.rs b/desktop/src/gui/action.rs
@@ -241,13 +241,12 @@ impl JukeBoxGui {
                                 wrap_mode: TextureWrapMode::ClampToEdge,
                                 mipmap_mode: None,
                             })
-                            .corner_radius(2.0)
-                            .max_size(vec2(64.0, 64.0));
-                        Button::image(i)
+                            .corner_radius(2.0);
+                        Button::new(i)
                     }
                     ActionIcon::DefaultActionIcon => {
                         let i = self.editing_action.icon();
-                        Button::image(i)
+                        Button::new(i)
                     }
                 };
                 let test_btn = ui
diff --git a/desktop/src/gui/device.rs b/desktop/src/gui/device.rs
@@ -114,13 +114,12 @@ impl JukeBoxGui {
                                         wrap_mode: TextureWrapMode::ClampToEdge,
                                         mipmap_mode: None,
                                     })
-                                    .corner_radius(2.0)
-                                    .max_size(vec2(64.0, 64.0));
-                                Button::image(i)
+                                    .corner_radius(2.0);
+                                Button::new(i)
                             }
                             ActionIcon::DefaultActionIcon => {
                                 let i = a.icon();
-                                Button::image(i)
+                                Button::new(i)
                             }
                         };
 
diff --git a/firmware/Cargo.lock b/firmware/Cargo.lock
diff --git a/firmware/Cargo.toml b/firmware/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jukebox_firmware"
-version = "0.5.0"
+version = "0.6.1"
 edition = "2021"
 license = "MIT"
 
diff --git a/firmware/src/main.rs b/firmware/src/main.rs
@@ -67,8 +67,10 @@ use usbd_human_interface_device::{
 };
 use usbd_serial::SerialPort;
 
+use crate::util::USB_SUSPENDED;
 #[allow(unused_imports)]
 use defmt::*;
+
 use {defmt_rtt as _, panic_probe as _};
 
 use jukebox_util::peripheral::JBInputs;
@@ -385,16 +387,12 @@ fn main() -> ! {
             let _ = usb_hid.device::<NKROBootKeyboard<'_, _>, _>().read_report();
         }
 
-        util::USB_STATUS.with_mut_lock(|s| {
-            // if *s != usb_dev.state() {
-            //     match usb_dev.state() {
-            //         UsbDeviceState::Default => info!("usb state: default"),
-            //         UsbDeviceState::Addressed => info!("usb state: addressed"),
-            //         UsbDeviceState::Configured => info!("usb state: configured"),
-            //         UsbDeviceState::Suspend => info!("usb state: suspend"),
-            //     }
-            // }
-            *s = usb_dev.state();
-        });
+        USB_SUSPENDED.store(
+            match usb_dev.state() {
+                UsbDeviceState::Configured => false,
+                _ => true,
+            },
+            core::sync::atomic::Ordering::Relaxed,
+        );
     }
 }
diff --git a/firmware/src/modules/rgb.rs b/firmware/src/modules/rgb.rs
@@ -11,10 +11,9 @@ use rp2040_hal::{
 };
 use smart_leds::brightness;
 use smart_leds_trait::{SmartLedsWrite, RGB8};
-use usb_device::device::UsbDeviceState;
 use ws2812_pio::Ws2812;
 
-use crate::util::{DEFAULT_RGB_PROFILE, RGB_CONTROLS, USB_STATUS};
+use crate::util::{usb_suspended, DEFAULT_RGB_PROFILE, RGB_CONTROLS};
 
 const RGB_LEN: usize = 12;
 const FRAME_TIME: u32 = 33;
@@ -24,7 +23,6 @@ pub struct RgbMod {
     buffer: [RGB8; RGB_LEN],
     timer: CountDown,
     rgb_mode: RgbProfile,
-    usb_state: UsbDeviceState,
 }
 
 impl RgbMod {
@@ -41,7 +39,6 @@ impl RgbMod {
             buffer: [(0, 0, 0).into(); RGB_LEN],
             timer: count_down,
             rgb_mode: default_rgb_profile,
-            usb_state: UsbDeviceState::Default,
         }
     }
 
@@ -64,11 +61,10 @@ impl RgbMod {
             }
             c.0 = false;
         });
-        self.usb_state = USB_STATUS.with_lock(|p| *p);
 
         let buffer = self.rgb_mode.calculate_matrix(t);
 
-        let brtns = if self.usb_state == UsbDeviceState::Suspend {
+        let brtns = if usb_suspended() {
             0
         } else {
             self.rgb_mode.brightness()
diff --git a/firmware/src/modules/screen.rs b/firmware/src/modules/screen.rs
@@ -29,13 +29,12 @@ use rp2040_hal::{
     timer::CountDown,
     Timer,
 };
-use usb_device::device::UsbDeviceState;
 
 use crate::{
     st7789::St7789,
     util::{
-        CONNECTION_STATUS, DEFAULT_PROFILE_NAME, DEFAULT_SCREEN_PROFILE, DEFAULT_SYSTEM_STATS,
-        ICONS, PROFILE_NAME, SCREEN_CONTROLS, SCREEN_SYSTEM_STATS, USB_STATUS,
+        usb_suspended, CONNECTION_STATUS, DEFAULT_PROFILE_NAME, DEFAULT_SCREEN_PROFILE,
+        DEFAULT_SYSTEM_STATS, ICONS, PROFILE_NAME, SCREEN_CONTROLS, SCREEN_SYSTEM_STATS,
     },
 };
 
@@ -133,7 +132,7 @@ pub struct ScreenMod {
     profile_name: ProfileName,
     screen_profile: ScreenProfile,
     system_stats: SystemStats,
-    usb_state: UsbDeviceState,
+    usb_suspended: bool,
 
     dma_ch0: Channel<CH0>,
     timer: CountDown,
@@ -161,7 +160,7 @@ impl ScreenMod {
             profile_name: DEFAULT_PROFILE_NAME,
             screen_profile: default_screen_profile,
             system_stats: DEFAULT_SYSTEM_STATS,
-            usb_state: UsbDeviceState::Default,
+            usb_suspended: true,
 
             dma_ch0,
             timer,
@@ -258,7 +257,7 @@ impl ScreenMod {
             c.into()
         };
 
-        let brtns = if self.usb_state == UsbDeviceState::Suspend {
+        let brtns = if self.usb_suspended {
             0
         } else {
             self.screen_profile.brightness()
@@ -623,12 +622,10 @@ impl ScreenMod {
             }
             p.0 = false;
         });
-        USB_STATUS.with_lock(|p| {
-            if self.usb_state != *p {
-                changed = true;
-                self.usb_state = *p;
-            }
-        });
+        if self.usb_suspended != usb_suspended() {
+            changed = true;
+            self.usb_suspended = usb_suspended();
+        }
 
         if changed {
             // using multiple channels did not meaningfully improve performance.
diff --git a/firmware/src/modules/serial.rs b/firmware/src/modules/serial.rs
@@ -33,8 +33,8 @@ use crate::util::{
 
 type SerialPort<'a> = FullSerialPort<'a, UsbBus, [u8; SERIAL_READ_SIZE], [u8; SERIAL_WRITE_SIZE]>;
 
-pub const SERIAL_WRITE_SIZE: usize = 1024;
-pub const SERIAL_READ_SIZE: usize = 1024;
+pub const SERIAL_WRITE_SIZE: usize = 256;
+pub const SERIAL_READ_SIZE: usize = 512;
 const BUFFER_SIZE: usize = 4096;
 const KEEPALIVE: u32 = 1000;
 
diff --git a/firmware/src/util.rs b/firmware/src/util.rs
@@ -1,6 +1,7 @@
 use core::{
     cmp::{max, min},
     i8,
+    sync::atomic::AtomicBool,
 };
 
 use embedded_graphics::{pixelcolor::Bgr565, prelude::RgbColor};
@@ -14,7 +15,6 @@ use jukebox_util::{
     stats::SystemStats,
 };
 // use rp2040_hal::dma::{single_buffer, Channel, CH1};
-use usb_device::device::UsbDeviceState;
 use usbd_human_interface_device::{device::mouse::WheelMouseReport, page::Keyboard};
 
 use crate::mutex::Mutex;
@@ -64,7 +64,6 @@ type InputEvents = Mutex<7, [InputEvent; 16]>;
 type ProfileNameControl = Mutex<9, (bool, ProfileName)>;
 type ScreenSystemStats = Mutex<10, (bool, SystemStats)>;
 type ScreenControls = Mutex<11, (bool, ScreenProfile)>;
-type UsbStatus = Mutex<12, UsbDeviceState>;
 
 type DefaultInputEvents = Mutex<13, (bool, [InputEvent; 16])>;
 type DefaultRgbProfile = Mutex<14, (bool, RgbProfile)>;
@@ -91,7 +90,11 @@ pub static INPUT_EVENTS: InputEvents = Mutex::new(InputEvent::default_all());
 pub static PROFILE_NAME: ProfileNameControl = Mutex::new((true, DEFAULT_PROFILE_NAME));
 pub static SCREEN_SYSTEM_STATS: ScreenSystemStats = Mutex::new((false, DEFAULT_SYSTEM_STATS));
 pub static SCREEN_CONTROLS: ScreenControls = Mutex::new((false, ScreenProfile::default_profile()));
-pub static USB_STATUS: UsbStatus = Mutex::new(UsbDeviceState::Default);
+
+pub static USB_SUSPENDED: AtomicBool = AtomicBool::new(true);
+pub fn usb_suspended() -> bool {
+    USB_SUSPENDED.load(core::sync::atomic::Ordering::Relaxed)
+}
 
 #[macro_export]
 macro_rules! time_func {
