Update version and J1939 address in m-ecu crate

Laixer · Mar 21, 2024 · d184ba2 · d184ba2
1 parent 0be8293
commit d184ba2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 29 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/m-ecu/Cargo.toml b/m-ecu/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "m-ecu"
-version = "0.5.2"
+version = "0.5.5"
 edition = "2021"
 
 [dependencies]

diff --git a/m-ecu/src/main.rs b/m-ecu/src/main.rs
@@ -28,7 +28,7 @@ const FDCAN_CLOCK: Hertz = Hertz::MHz(32);
 const USART_CLOCK: Hertz = Hertz::MHz(48);
 
 /// J1939 network address.
-const J1939_ADDRESS: u8 = 0x0;
+const J1939_ADDRESS: u8 = 0x12;
 /// J1939 name manufacturer code.
 ///
 const J1939_NAME_MANUFACTURER_CODE: u16 = 0x717;
@@ -387,39 +387,13 @@ mod app {
                     );
 
                     if let Some(rpm) = message.rpm {
-                        // if rpm < 700 {
-                        //     ctx.local.pwm0.set_duty(0);
-                        //     ctx.local.pwm0.enable();
-
-                        //     ctx.local.pwm1.set_duty(0);
-                        //     ctx.local.pwm1.enable();
-                        // } else
-
                         let duty = match rpm {
                             ..=1049 => 24_500,
                             1050..=1549 => 22_500,
                             1550..=u16::MAX => 20_500,
                         };
 
                         ctx.local.pwm0.set_duty(duty);
-
-                        // if rpm < 1050 {
-                        //     let value = 24_500;
-
-                        //     ctx.local.pwm0.set_duty(value);
-                        //     ctx.local.pwm0.enable();
-
-                        //     ctx.local.pwm1.set_duty(0);
-                        //     ctx.local.pwm1.enable();
-                        // } else if rpm < 1550 {
-                        //     let value = 22_500;
-
-                        //     ctx.local.pwm0.set_duty(value);
-                        //     ctx.local.pwm0.enable();
-
-                        //     ctx.local.pwm1.set_duty(0);
-                        //     ctx.local.pwm1.enable();
-                        // }
                     }
                 }
                 // PGN::TorqueSpeedControl1 => {