bump deps, misc cleanup of old IPC abstraction code of client

Cargo.toml

@@ -6,8 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-socketcan = "1.7.0"
-paho-mqtt = "0.12.3"
+socketcan = "3.3.0"
+paho-mqtt = "0.12.5"
 protobuf-codegen = "3.3.0"
 protobuf = "3.3.0"
 bitstream-io = "2.3.0"

README.md

@@ -1,16 +1,8 @@
 # Calypso
-Custom CAN Decoder for all the data being streamed around the car
+Custom CAN decoder to translate CAN messages to MQTT protobuf encoded packets with low latency and a YAML configuration structure.
 
-### Recommended Extensions
-View https://www.youtube.com/watch?v=BU1LYFkpJuk for more information
-
-- rust-analyzer
-- CodeLLDB
-- Even Better TOML
-- Error Lens
-- Todo Tree
-- crates
 
+### Develop setup
 #### Go to Settings in VSCode
 search Rust-analyzer check and set the command from check -> clippy
 
@@ -23,19 +15,29 @@ add following information:
 } 
 ```
 
-### NERO 1.0 Config
-Utilizes a linux IPC to stream data to the NERO frontend
+To test it on linux, please install:
+- mosquitto broker: https://mosquitto.org
+- can-utils
+- mqttui: https://github.com/EdJoPaTo/mqttui
+
+
+### Developing
+
+Process for testing:  
+- run `mosquitto` and leave it open
+- run `mqttui` and leave it open
+- setup the can network:
+    - `sudo ip link add dev vcan0 type vcan`
+    - `sudo ip link set dev vcan0 up`
 
-run ```/home/ner/Desktop/Calypso/target/release/calypso ipc /tmp/ipc.sock```
+run ```cargo run localhost:1883 vcan0```
 
-### SIREN and NERO 2.0 Config
-Utilizes MQTT Web Socket to offload data from the car for our telemetry system
-run ```/home/ner/Desktop/Calypso/target/release/calypso mqtt localhost:1883```
+To send a can message:
+- `cansend vcan0 <ID_IN_HEX>#<PAYLOAD_IN_HEX>`
+Ex. `cansend vcan0 702#01010101FFFFFFFF`  
+Now view calypso interpret the can message and broadcast it on `mqttui`
 
-### Synthesize Rust
-`cd oxy`
 
-`python3 typedpoc.py`
 
 ### Generate Proto
 

build.rs

@@ -7,14 +7,14 @@ fn main() {
     match Command::new("python3").arg("./calypsogen.py").status() {
         Ok(status) if status.success() => {
             println!("Python script executed successfully");
-        },
+        }
         Ok(status) => {
             eprintln!("Python script exited with status: {}", status);
             std::process::exit(1);
-        },
+        }
         Err(e) => {
             eprintln!("Failed to execute Python script: {}", e);
             std::process::exit(1);
-        },
+        }
     }
-}
+}

src/data.rs

@@ -41,8 +41,4 @@ impl Data {
             unit: unit.to_string(),
         }
     }
-
-    pub fn to_json(&self) -> String {
-        format!("{{\"value\": {:#?}, \"unit\": \"{}\"}}", self.value, self.unit)
-    }
-}
+}

src/lib.rs

@@ -1,7 +1,6 @@
-pub mod client;
 pub mod data;
 pub mod decode_data;
+pub mod master_mapping;
 pub mod message;
 pub mod mqtt;
-pub mod master_mapping;
-pub mod serverdata;
+pub mod serverdata;