C3MA/PlantCtrl
5
0
Fork 0
Code Issues 8 Pull Requests Packages Projects Releases Wiki Activity

fix tread safty issues by annotating Box Traits correctly

Browse Source
This commit is contained in:
ju6ge
2025-06-19 18:36:48 +02:00
parent e2cbf9618e
commit 69077239a5
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rust/src/hal/initial_hal.rs
View File

@@ -12,7 +12,7 @@ pub struct Initial<'a> {
pub(crate) general_fault: PinDriver<'a, esp_idf_hal::gpio::AnyIOPin, InputOutput>,
pub(crate) esp: ESP<'a>,
pub(crate) config: PlantControllerConfig,
pub(crate) battery: Box<dyn BatteryInteraction>,
pub(crate) battery: Box<dyn BatteryInteraction + Send>,
}
pub(crate) fn create_initial_board(
@@ -20,7 +20,7 @@ pub(crate) fn create_initial_board(
fs_mount_error: bool,
config: PlantControllerConfig,
esp: ESP<'static>,
) -> Result<Box<dyn BoardInteraction<'static>> + Send + Sync> {
) -> Result<Box<dyn BoardInteraction<'static> + Send>> {
let mut general_fault = PinDriver::input_output(free_pins.gpio6.downgrade())?;
general_fault.set_pull(Pull::Floating)?;
general_fault.set_low()?;
@@ -46,7 +46,7 @@ impl<'a> BoardInteraction<'a> for Initial<'a> {
&self.config
}
fn get_battery_monitor(&mut self) -> &mut Box<dyn BatteryInteraction> {
fn get_battery_monitor(&mut self) -> &mut Box<dyn BatteryInteraction + Send> {
&mut self.battery
}