charge controller page by shb-png · Pull Request #54 · PurdueElectricRacing/daqapp

shb-png · 2026-03-31T01:52:25Z

new charge controller widget
new semantic colors that other widgets can also reuse across ui
adds onedark theme!!

Copilot

Pull request overview

Adds a new “Charge Controller” workspace widget and expands the theming system (including a OneDark theme) to provide semantic colors that widgets can reuse across the UI.

Changes:

Introduces a ChargeController widget (spawnable from the sidebar / command palette) with CAN-driven status/fault display and command sending.
Extends theming with a OneDark TOML and adds semantic theme colors stored in egui context for global access.
Adjusts CAN extended-ID handling and UDP ID parsing to better preserve extended-vs-standard identity.

Reviewed changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
themes/onedark.toml	Adds OneDark theme color definitions (including semantic colors).
src/workspace.rs	Tracks Charge Controller open-state and clears it when the tab is closed.
src/widgets.rs	Registers the new `ChargeController` widget and routes show/message handling.
src/ui/sidebar.rs	Adds “Add Charge Controller” button; uses theme semantic colors for connection status.
src/ui/mod.rs	Exposes the new `charge_controller` module.
src/ui/charge_controller.rs	Implements the Charge Controller UI, CAN parsing, and command send/stop behavior.
src/theme.rs	Adds OneDark selection, semantic colors, and egui-context storage/getters for theme colors.
src/can/thread.rs	Restores an extended-ID flag on received extended CAN IDs before DBC decode.
src/can/driver.rs	Enables UDP socket nonblocking mode; uses explicit isExtID bit when parsing UDP identity.
src/app.rs	Prevents multiple Charge Controller widgets; stores theme colors globally each frame.
src/action.rs	Adds `WidgetType::ChargeController` to spawn actions / command palette list.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

LelsersLasers

Reviewing on my phone so some comments may be dumb

LelsersLasers

If it works it looks good to me 🔋 📈

Copilot

Pull request overview

Copilot reviewed 10 out of 10 changed files in this pull request and generated 9 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

fixed stale + pane open/close logic? weird things happening with extended ids error logs back suppress udp warns test charge disable/enable theme changes + udp nonblocking so debug is easier to see idrk what i changed i love chat gippity (it was claude)

…id flag and the 29 bit version

Copilot

Pull request overview

Copilot reviewed 10 out of 10 changed files in this pull request and generated 6 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

+        let crm_id = util::msg_id::can_dbc_to_u32_with_extid_flag(
+            &crm.as_ref().expect("Charge request message not found").id,
+        );
+
+        self.active_msg_id = Some(crm_id);
+
+        let is_extended = matches!(
+            &crm.as_ref().expect("Charge request message not found").id,
+            can_dbc::MessageId::Extended(_)
+        );
+
+        let signal_values: std::collections::HashMap<String, f64> = vec![
+            (
+                "charge_voltage".to_string(),
+                (self.max_charge_voltage as f64),
+            ),
+            (
+                "charge_current".to_string(),
+                (self.max_charge_current as f64),
+            ),
+            ("charge_enable".to_string(), self.charge_enable as u8 as f64),
+            (
+                "balance_enable".to_string(),
+                self.balance_enable as u8 as f64,
+            ),
+        ]
+        .into_iter()
+        .collect();
+
+        let Some(msg_bytes) = parser.parser.encode_msg(crm_id, &signal_values) else {
+            log::error!("Failed to encode charge_request");
+            return;
+        };
+
+        ui_to_can_tx
+            .send(messages::MsgFromUi::AddSendMessage(
+                messages::AddSendMessage {
+                    amount: messages::SendAmount::Infinite {
+                        period: self.request_msg_period,
+                    },
+                    msg_id: crm_id,
+                    is_msg_id_extended: is_extended,
+                    msg_bytes,


+    fn stop_charge_request(
+        &self,
+        ui_to_can_tx: &std::sync::mpsc::Sender<messages::MsgFromUi>,
+        parser: &app::ParserInfo,
+    ) {
+        // find charge_request message definition
+        let crm = parser
+            .parser
+            .msg_defs()
+            .into_iter()
+            .find(|m| m.name == "charge_request");
+
+        let crm_id = util::msg_id::can_dbc_to_u32_with_extid_flag(
+            &crm.as_ref().expect("Charge request message not found").id,
+        );
+        ui_to_can_tx
+            .send(messages::MsgFromUi::DeleteSendMessage { msg_id: crm_id })
+            .expect("Failed to send DeleteSendMessage");


+                        }
+                        "charge_current" => {
+                            if let can_decode::DecodedSignalValue::Numeric(v) = &signal.value {
+                                self.charge_current_raw = *v as u16;


    pub fn new(
        can_to_ui_rx: std::sync::mpsc::Receiver<messages::MsgFromCan>,
        ui_to_can_tx: std::sync::mpsc::Sender<messages::MsgFromUi>,
        settings: settings::Settings,
        _cc: &eframe::CreationContext,
    ) -> Self {
        let theme_selection = settings.theme;
        let theme_style = theme_selection.get_style();
+        let theme_colors = theme_selection.get_colors();

        Self {
            connection_status: ConnectionStatus::Disconnected,
            is_sidebar_open: true,
            command_palette: ui::command_palette::CommandPalette::new(),
            tile_tree: egui_tiles::Tree::empty("workspace_tree"),
            next_can_viewer_num: 1,
            next_can_list_num: 1,
            next_bootloader_num: 1,
            next_scope_num: 1,
            next_log_parser_num: 1,
            next_send_ui_num: 1,
            next_bus_load_num: 1,
+            is_charge_controller_open: false,
            next_battery_viewer_num: 1,
            can_to_ui_rx,
            ui_to_can_tx,
            action_queue: Vec::new(),
            selected_source: settings.selected_source,
            theme: theme_style,
            theme_selection,
            pixels_per_point: settings.pixels_per_point,
            serial_ports: util::get_available_serial_ports(),
            parser: ParserInfo::new_maybe(settings.dbc_path),
            udp_port: settings.udp_port,
            can_messages: Vec::new(),
+            theme_colors,
        }
    }


-            if let Some(egui_tiles::Tile::Pane(_)) = self.tile_tree.tiles.get(tile_id) {
+            if let Some(egui_tiles::Tile::Pane(widget)) = self.tile_tree.tiles.get(tile_id) {
+                if matches!(widget, widgets::Widget::ChargeController(_)) {
+                    log::info!("Closing Charge Controlller");


+        socket.set_nonblocking(true).map_err(|e| {
+            DriverError::ConnectionFailed(format!("Unable to set nonblocking mode: {}", e))
+        })?;


shb-png requested review from LelsersLasers and Copilot March 31, 2026 01:54

Copilot started reviewing on behalf of shb-png March 31, 2026 01:59 View session

Copilot AI reviewed Mar 31, 2026

View reviewed changes

Comment thread src/app.rs Outdated

Comment thread src/app.rs

Comment thread src/ui/charge_controller.rs Outdated

Comment thread src/ui/charge_controller.rs Outdated

Comment thread src/ui/charge_controller.rs Outdated

Comment thread src/can/driver.rs Outdated

LelsersLasers requested changes Mar 31, 2026

View reviewed changes

Comment thread src/ui/charge_controller.rs Outdated

Comment thread src/ui/charge_controller.rs Outdated

Comment thread src/ui/charge_controller.rs Outdated

Comment thread themes/onedark.toml

Comment thread src/ui/charge_controller.rs Outdated

Comment thread src/ui/charge_controller.rs Outdated

shb-png force-pushed the shriya/charge-controller branch from b245ed7 to 0dcd7da Compare April 9, 2026 16:51

shb-png requested a review from LelsersLasers April 9, 2026 17:46

LelsersLasers requested changes Apr 9, 2026

View reviewed changes

Comment thread src/ui/charge_controller.rs Outdated

Comment thread src/ui/charge_controller.rs Outdated

Comment thread src/ui/charge_controller.rs Outdated

shb-png requested a review from LelsersLasers April 9, 2026 20:06

shb-png marked this pull request as ready for review April 9, 2026 20:10

LelsersLasers mentioned this pull request Apr 22, 2026

Battery Viewer widget #58

Merged

LelsersLasers approved these changes Apr 22, 2026

View reviewed changes

Comment thread src/ui/charge_controller.rs

Comment thread src/ui/charge_controller.rs

LelsersLasers requested review from Copilot and irvingywang April 22, 2026 01:58

Copilot started reviewing on behalf of LelsersLasers April 22, 2026 01:59 View session

Copilot AI reviewed Apr 22, 2026

View reviewed changes

shb-png and others added 14 commits April 24, 2026 16:28

works?

529716c

fixed stale + pane open/close logic? weird things happening with extended ids error logs back suppress udp warns test charge disable/enable theme changes + udp nonblocking so debug is easier to see idrk what i changed i love chat gippity (it was claude)

fmt

0ae8654

fix scaling and charge command inputs

b7821c4

comments

1ac108d

correctly interpret broadcast command

f6c9fb4

disable changing output on enable

ede12b5

fmt

de29ea9

i dont remember what i was changign??

b616385

im on some bs

8849510

send charge request to abox instead of elcon charge command

277b2c7

encode fail

187c600

send page differiences between the u32 bit version with the extended …

de405bd

…id flag and the 29 bit version

fmt

a1337be

encode doesnt fail

6d5564b

shb-png added 8 commits April 24, 2026 16:28

fmt

ea28e00

display chargning telemetry

fc2e2f6

i might be illiterate

d12260c

add balance enable

a7ef746

fmt

aefa3be

smarter message finding?

dda7c71

nuke ts

324d79f

simplify charge controller message handling and remove unused fields

2013c65

shb-png force-pushed the shriya/charge-controller branch from 9b64bd4 to 2013c65 Compare April 24, 2026 20:28

implement drop for charge controller

9bdfe00

shb-png requested a review from Copilot April 26, 2026 01:39

Copilot started reviewing on behalf of shb-png April 26, 2026 01:40 View session

Copilot AI reviewed Apr 26, 2026

View reviewed changes

Uh oh!

Conversation

shb-png commented Mar 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

LelsersLasers left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

LelsersLasers left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

shb-png commented Mar 31, 2026 •

edited

Loading