GEM-Remotes/GemBluetoothEmbeddedDevice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: GEM-Remotes:c271df4bced6213f6bfe5b34710e838dcc51100e
Branches Tags
GEM-Remotes:main
...
compare: GEM-Remotes:main
Branches Tags
GEM-Remotes:main

2 Commits
c271df4bce ... main

Author SHA1 Message Date
Daniel Mayfield
7ac157a4d3 Update the device name characteristic UUID to match the service UUID 2025-10-05 11:13:42 -04:00
Dave
8b5ff4ef93 add additional status update for auto and aux 2025-09-22 18:07:17 -04:00
3 changed files with 14 additions and 2 deletions
Expand all files Collapse all files

2
gem-remotes-esp32/src/ble_server.rs
View File

@ -60,7 +60,7 @@ const UUID_BUTTON_STOP: BleUuid = uuid128!("c1401123-8dda-45a3-959b-d23a0f8f53d7
const UUID_BUTTON_AUX: BleUuid = uuid128!("c1401124-8dda-45a3-959b-d23a0f8f53d7"); const UUID_BUTTON_AUX: BleUuid = uuid128!("c1401124-8dda-45a3-959b-d23a0f8f53d7");
const UUID_BUTTON_LEARN: BleUuid = uuid128!("c1401223-8dda-45a3-959b-d23a0f8f53d7"); const UUID_BUTTON_LEARN: BleUuid = uuid128!("c1401223-8dda-45a3-959b-d23a0f8f53d7");
const UUID_BUTTON_AUTO: BleUuid = uuid128!("c1401225-8dda-45a3-959b-d23a0f8f53d7"); const UUID_BUTTON_AUTO: BleUuid = uuid128!("c1401225-8dda-45a3-959b-d23a0f8f53d7");
const UUID_BLUETOOTH_NAME: BleUuid = uuid128!("c1411224-8dda-45a3-959b-d23a0f8f53d7"); const UUID_BLUETOOTH_NAME: BleUuid = uuid128!("c1401224-8dda-45a3-959b-d23a0f8f53d7");
// Status Characteristics // Status Characteristics
const UUID_STATUS_LIMITS: BleUuid = uuid128!("c1401321-8dda-45a3-959b-d23a0f8f53d7"); const UUID_STATUS_LIMITS: BleUuid = uuid128!("c1401321-8dda-45a3-959b-d23a0f8f53d7");

7
gem-remotes-lib/src/commands.rs
View File

@ -81,6 +81,13 @@ impl Button {
} }
} }
pub fn button_from_bool(b: bool) -> Button {
match b {
true => Button::Pressed,
false => Button::Released,
}
}
// Distinguish toggles(like auto) which is on/off from buttons (which are pressed/released) // Distinguish toggles(like auto) which is on/off from buttons (which are pressed/released)
//TODONOW: remove? //TODONOW: remove?
#[derive(Copy, Clone, Debug)] #[derive(Copy, Clone, Debug)]

7
gem-remotes-lib/src/fake_pic.rs
View File

@ -15,7 +15,7 @@ use crate::fake_motor::{Motors,MotorStatus};
use crate::fake_limits::{Limits, LimitStatus, EMPTY_LIMITS}; use crate::fake_limits::{Limits, LimitStatus, EMPTY_LIMITS};
use crate::fake_status::Statuses; use crate::fake_status::Statuses;
use crate::dispatch::{Dispatch, DispatchRecvQ, DispatchSendQ}; use crate::dispatch::{Dispatch, DispatchRecvQ, DispatchSendQ};
use crate::commands::{Commands}; use crate::commands::{Commands, button_from_bool};
pub struct FakePic { pub struct FakePic {
motor_state: Motors, motor_state: Motors,
@ -78,6 +78,9 @@ impl FakePic {
self.send_q.send(Commands::BluetoothStatusMotor { data: self.motor_state }).await?; self.send_q.send(Commands::BluetoothStatusMotor { data: self.motor_state }).await?;
self.send_q.send(Commands::BluetoothStatusLimits { data: self.limit_state }).await?; self.send_q.send(Commands::BluetoothStatusLimits { data: self.limit_state }).await?;
self.send_q.send(Commands::BluetoothStatusStatus { data: self.status_state }).await?; self.send_q.send(Commands::BluetoothStatusStatus { data: self.status_state }).await?;
self.send_q.send(Commands::BluetoothAuto { data: button_from_bool(!self.status_state.intersection(Statuses::AUTO).is_empty()) }).await?;
self.send_q.send(Commands::BluetoothAux { data: button_from_bool(!self.status_state.intersection(Statuses::AUX).is_empty()) }).await?;
self.send_q.send(Commands::BluetoothLearn { data: button_from_bool(!self.status_state.intersection(Statuses::LEARN).is_empty()) }).await?;
Ok(()) Ok(())
} }
// === Change Fake Hardware Parameters ====================================================== // === Change Fake Hardware Parameters ======================================================
@ -91,11 +94,13 @@ impl FakePic {
pub async fn toggle_aux(&mut self) -> Result<()> { pub async fn toggle_aux(&mut self) -> Result<()> {
self.status_state ^= Statuses::AUX; self.status_state ^= Statuses::AUX;
self.send_q.send(Commands::BluetoothStatusStatus { data: self.status_state }).await?; self.send_q.send(Commands::BluetoothStatusStatus { data: self.status_state }).await?;
self.send_q.send(Commands::BluetoothAux { data: button_from_bool(!self.status_state.intersection(Statuses::AUX).is_empty()) }).await?;
Ok(()) Ok(())
} }
pub async fn toggle_auto(&mut self) -> Result<()> { pub async fn toggle_auto(&mut self) -> Result<()> {
self.status_state ^= Statuses::AUTO; self.status_state ^= Statuses::AUTO;
self.send_q.send(Commands::BluetoothStatusStatus { data: self.status_state }).await?; self.send_q.send(Commands::BluetoothStatusStatus { data: self.status_state }).await?;
self.send_q.send(Commands::BluetoothAuto { data: button_from_bool(!self.status_state.intersection(Statuses::AUTO).is_empty()) }).await?;
Ok(()) Ok(())
} }
pub async fn press_learn(&mut self) -> Result<()> { pub async fn press_learn(&mut self) -> Result<()> {