Merge branch 'main' into Bartosz-Slowik-patch-1

grupacosmo · Aug 28, 2023 · 337686d · 337686d
2 parents 754bdb2 + 02edbe6
commit 337686d
Show file tree

Hide file tree

Showing 16 changed files with 586 additions and 79 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,5 @@
 /.vscode
-/target
+/.idea
+/target
+gyffhks
+package-lock.json
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/cansat-core/Cargo.toml b/crates/cansat-core/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
+edition = "2021"
 name = "cansat-core"
 version = "0.1.0"
-edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,10 +16,17 @@ accelerometer = "0.12.0"
 serde = { version = "1.0.159", default-features = false, features = ["derive"] }
 heapless-bytes = "0.3.0"
 defmt = { version = "0.3.4", optional = true }
+mpu6050 = { version = "0.1.0"}
+
+[dependencies.nmea]
+git = "https://github.com/AeroRust/nmea"
+default-features = false
+features = ["serde", "GGA"]
 
 [dependencies.derive_more]
-version = "0.99.17"
 default-features = false
 features = [
-    "add", "mul",
+  "add",
+  "mul",
 ]
+version = "0.99.17"
diff --git a/crates/cansat-core/src/lib.rs b/crates/cansat-core/src/lib.rs
@@ -3,6 +3,7 @@
 #![no_std]
 
 pub mod measurements;
+pub mod nmea;
 pub mod quantity;
 
 pub use measurements::Measurements;