Skip to content

Commit

Permalink
rebase
Browse files Browse the repository at this point in the history 
Signed-off-by: Guillaume W. Bres <[email protected]>
  • Loading branch information
@gwbres
gwbres committed Sep 29, 2023
2 parents c8f18c9 + 8ae76a8 commit 36c57ca
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 39 deletions.
2 changes: 1 addition & 1 deletion crx2rnx/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ readme = "README.md"

[dependencies]
clap = { version = "4", features = ["derive", "color"] }
rinex = { version = "0.13.1", features = ["serde"] }
rinex = { path = "../rinex", version = "=0.14.0", features = ["serde"] }
8 changes: 4 additions & 4 deletions rinex-cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ pretty_env_logger = "0.5"
clap = { version = "4.4.3", features = ["derive", "color"] }
rand = "0.8"
serde_json = "1"
sp3 = { path = "../sp3", features = ["serde", "flate2"] }
rinex-qc = { path = "../rinex-qc", features = ["serde"] }
rinex = { path = "../rinex", features = ["serde", "flate2", "sbas", "obs", "nav", "ionex", "qc", "processing"] }
gnss-rtk = { path = "../gnss-rtk" , features = ["serde"] }
sp3 = { path = "../sp3", version = "=1.0.4", features = ["serde", "flate2"] }
rinex-qc = { path = "../rinex-qc", version = "=0.1.4", features = ["serde"] }
rinex = { path = "../rinex", version = "=0.14.0", features = ["full"] }
gnss-rtk = { path = "../gnss-rtk", version = "=0.0.1" }
thiserror = "1"
itertools = "0.11"
# plotly = "0.8.4"
Expand Down
2 changes: 1 addition & 1 deletion rinex-qc/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ horrorshow = "0.8"
itertools = "0.11.0"
statrs = "0.16"
sp3 = { path = "../sp3", features = ["serde"] }
rinex-qc-traits = { path = "../qc-traits" }
rinex-qc-traits = { path = "../qc-traits", version = "=0.1.1" }
rinex = { path = "../rinex", features = ["obs", "nav", "qc", "processing", "serde", "flate2"] }

[dev-dependencies]
Expand Down
15 changes: 14 additions & 1 deletion rinex/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,19 @@ ionex = []
processing = []
qc = ["rinex-qc-traits", "horrorshow"] # rinex Quality Check (mainly OBS RINEX)

# enable everything
full = [
"flate2",
"horrorshow",
"meteo",
"nav",
"obs",
"processing",
"qc",
"sbas",
"serde",
]

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docrs", "--generate-link-to-definition"]
Expand All @@ -48,7 +61,7 @@ serde = { version = "1.0", optional = true, default-features = false, features =
flate2 = { version = "1.0.24", optional = true, default-features = false, features = ["zlib"] }
hifitime = { version = "3.8", features = ["serde", "std"] }
horrorshow = { version = "0.8", optional = true }
rinex-qc-traits = { path = "../qc-traits", optional = true }
rinex-qc-traits = { path = "../qc-traits", version = "=0.1.1", optional = true }

[dev-dependencies]
serde_json = "1"
Expand Down
2 changes: 2 additions & 0 deletions rinex/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ If this feature is not enabled, one must first uncompress .gz files prior parsin
The `sbas` feature enables one method to select appropriate augmentation system
based on current location on Earth.

Compile with `full` to support all features.

## License

Licensed under either of:
Expand Down
2 changes: 1 addition & 1 deletion rnx2crx/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ readme = "README.md"
chrono = "0.4"
thiserror = "1"
clap = { version = "4", features = ["derive", "color"] }
rinex = { version = "0.13.1", features = ["serde"] }
rinex = { path = "../rinex", version = "=0.14.0", features = ["serde"] }
2 changes: 1 addition & 1 deletion sinex/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ chrono = "0.4"
thiserror = "1"
strum = { version = "0.25", features = ["derive"] }
strum_macros = "0.25"
rinex = { version = "0.13.1", features = ["serde"] }
rinex = { path = "../rinex", version = "=0.14.0", features = ["serde"] }
4 changes: 2 additions & 2 deletions sp3/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ rustdoc-args = ["--cfg", "docrs", "--generate-link-to-definition"]
[build-dependencies]

[dependencies]
rinex = { path = "../rinex", features = ["serde"] }
hifitime = "3.8.4"
thiserror = "1"
hifitime = "3.8.4"
rinex = { path = "../rinex", version = "=0.14.0", features = ["serde"] }
serde = { version = "1.0", optional = true, default-features = false, features = ["derive"] }
flate2 = { version = "1.0.24", optional = true, default-features = false, features = ["zlib"] }

Expand Down
4 changes: 2 additions & 2 deletions ublox-rnx/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ chrono = "0.4"
serde = "1.0"
serde_json = "1.0"
serialport = "4.2.0"
ublox = "0.3.0"
rinex = { path = "../rinex", features = ["serde"] }
ublox = "0.4.4"
rinex = { path = "../rinex", version = "=0.14.0", features = ["serde"] }
clap = { version = "3.2.22", features = ["yaml"] }
50 changes: 24 additions & 26 deletions ublox-rnx/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ use rinex::prelude::*;
//:use rinex::observation::record::ObservationData;

extern crate ublox;
//use ublox::*;
//use ublox::{CfgPrtUart, UartPortId};
use ublox::*;
use ublox::{CfgPrtUart, UartPortId};

mod device;

Expand All @@ -34,7 +34,6 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
.expect(&format!("failed to open serial port \"{}\"", port));
let mut device = device::Device::new(port);

/* needs ublox crate update !!
// Enable UBX protocol on all ports
// so User can connect to all of them
device.write_all(
Expand All @@ -52,7 +51,6 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
.into_packet_bytes(),
)?;
device.wait_for_ack::<CfgPrtUart>().unwrap();
*/

/* NEED UBX CRATE UPDATE!!
device.write_all(
Expand Down Expand Up @@ -93,12 +91,12 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
///////////////////////
// Observation opmode
///////////////////////
// device
// .write_all(
// &CfgMsgAllPortsBuilder::set_rate_for::<NavSat>([0, 1, 0, 0, 0, 0]).into_packet_bytes(),
// )
// .unwrap();
// device.wait_for_ack::<CfgMsgAllPorts>().unwrap();
device
.write_all(
&CfgMsgAllPortsBuilder::set_rate_for::<NavSat>([0, 1, 0, 0, 0, 0]).into_packet_bytes(),
)
.unwrap();
device.wait_for_ack::<CfgMsgAllPorts>().unwrap();

///////////////////////
// Navigation opmode
Expand Down Expand Up @@ -133,22 +131,22 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
// main loop
let _ = device.update(|packet| {
match packet {
// PacketRef::NavSat(pkt) => {
// for sv in pkt.svs() {
// let _gnss_id = sv.gnss_id();
// let _sv_id = sv.sv_id();
// let _elev = sv.elev();
// let _azim = sv.azim();
// let _pr_res = sv.pr_res();
// let _flags = sv.flags();
// //if flags.sv_used() {
// //}
// //flags.health();
// //flags.quality_ind();
// //flags.differential_correction_available();
// //flags.ephemeris_available();
// }
// },
PacketRef::NavSat(pkt) => {
for sv in pkt.svs() {
let _gnss_id = sv.gnss_id();
let _sv_id = sv.sv_id();
let _elev = sv.elev();
let _azim = sv.azim();
let _pr_res = sv.pr_res();
let _flags = sv.flags();
//if flags.sv_used() {
//}
//flags.health();
//flags.quality_ind();
//flags.differential_correction_available();
//flags.ephemeris_available();
}
},
/* NEED UBX CRATE UPDATE !!
PacketRef::NavEoe(pkt) => {
// End of epoch notification
Expand Down

0 comments on commit 36c57ca

Please sign in to comment.