ExternalVendorCode/chirpstack
1
0
Fork 0
mirror of https://github.com/chirpstack/chirpstack.git synced 2025-05-05 18:38:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "LoRa Cloud: use default if value is not present."

Browse Source 
This reverts commit 1867140272ce0625a3598ee3082b383171005702.
This commit is contained in:
Orne Brocaar 2022-09-27 11:15:53 +01:00
parent 1867140272
commit 2abc85afa6
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
chirpstack/src/integration/loracloud/client.rs
View File

@ -386,17 +386,13 @@ pub struct LocationResult {
#[derive(Deserialize, Clone)] #[derive(Deserialize, Clone)]
pub struct LocationSolverResult { pub struct LocationSolverResult {
#[serde(default)]
pub ecef: Vec<f64>, pub ecef: Vec<f64>,
#[serde(default)]
pub llh: Vec<f64>, pub llh: Vec<f64>,
#[serde(default)]
pub gdop: f64, pub gdop: f64,
#[serde(default)]
pub accuracy: f64, pub accuracy: f64,
#[serde(default, rename = "capture_time_gps")] #[serde(rename = "capture_time_gps")]
pub capture_time_gps: f64, pub capture_time_gps: f64,
#[serde(default, rename = "capture_time_utc")] #[serde(rename = "capture_time_utc")]
pub capture_time_utc: f64, pub capture_time_utc: f64,
} }

6
chirpstack/src/integration/loracloud/mod.rs
View File

@ -192,9 +192,6 @@ impl Integration {
return Err(anyhow!("{}", resp.error)); return Err(anyhow!("{}", resp.error));
} }
self.handle_response_integration_event(vars, pl, &resp.result)
.await?;
if self.config.modem_geolocation_services.parse_tlv && resp.result.stream_records.is_some() if self.config.modem_geolocation_services.parse_tlv && resp.result.stream_records.is_some()
{ {
self.handle_response_tlv_records( self.handle_response_tlv_records(
@ -205,6 +202,9 @@ impl Integration {
.await?; .await?;
} }
self.handle_response_integration_event(vars, pl, &resp.result)
.await?;
if let Some(v) = &resp.result.downlink { if let Some(v) = &resp.result.downlink {
self.handle_response_downlink(pl, v).await?; self.handle_response_downlink(pl, v).await?;
} }