Skip to content

Commit 40c1471

Browse files
armallenarmallen
committed
Fix naming
1 parent e0676ae commit 40c1471

File tree

7 files changed

+29
-32
lines changed

7 files changed

+29
-32
lines changed

‎c/include/libsbp/integrity/MSG_SSR_FLAG_HIGH_LEVEL.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ typedef struct {
7272
sbp_gps_time_sec_t obs_time;
7373

7474
/**
75-
* GNSS reference time of the atmospheric correction associated to the flag.
75+
* GNSS reference time of the ionospheric correction associated to the flag.
7676
*/
77-
sbp_gps_time_sec_t atmo_corr_time;
77+
sbp_gps_time_sec_t iono_corr_time;
7878

7979
/**
8080
* GNSS reference time of the satellite correction associated to the flag.

‎c/src/integrity.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ bool sbp_msg_ssr_flag_high_level_encode_internal(
379379
if (!sbp_gps_time_sec_encode_internal(ctx, &msg->obs_time)) {
380380
return false;
381381
}
382-
if (!sbp_gps_time_sec_encode_internal(ctx, &msg->atmo_corr_time)) {
382+
if (!sbp_gps_time_sec_encode_internal(ctx, &msg->iono_corr_time)) {
383383
return false;
384384
}
385385
if (!sbp_gps_time_sec_encode_internal(ctx, &msg->sat_corr_time)) {
@@ -450,7 +450,7 @@ bool sbp_msg_ssr_flag_high_level_decode_internal(
450450
if (!sbp_gps_time_sec_decode_internal(ctx, &msg->obs_time)) {
451451
return false;
452452
}
453-
if (!sbp_gps_time_sec_decode_internal(ctx, &msg->atmo_corr_time)) {
453+
if (!sbp_gps_time_sec_decode_internal(ctx, &msg->iono_corr_time)) {
454454
return false;
455455
}
456456
if (!sbp_gps_time_sec_decode_internal(ctx, &msg->sat_corr_time)) {
@@ -539,7 +539,7 @@ int sbp_msg_ssr_flag_high_level_cmp(const sbp_msg_ssr_flag_high_level_t *a,
539539
return ret;
540540
}
541541

542-
ret = sbp_gps_time_sec_cmp(&a->atmo_corr_time, &b->atmo_corr_time);
542+
ret = sbp_gps_time_sec_cmp(&a->iono_corr_time, &b->iono_corr_time);
543543
if (ret != 0) {
544544
return ret;
545545
}

‎haskell/src/SwiftNav/SBP/Integrity.hs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ msgSsrFlagHighLevel = 0x0BBA
188188
data MsgSsrFlagHighLevel = MsgSsrFlagHighLevel
189189
{ _msgSsrFlagHighLevel_obs_time :: !GpsTimeSec
190190
-- ^ GNSS reference time of the observation used to generate the flag.
191-
, _msgSsrFlagHighLevel_atmo_corr_time :: !GpsTimeSec
192-
-- ^ GNSS reference time of the atmospheric correction associated to the
191+
, _msgSsrFlagHighLevel_iono_corr_time :: !GpsTimeSec
192+
-- ^ GNSS reference time of the ionospheric correction associated to the
193193
-- flag.
194194
, _msgSsrFlagHighLevel_sat_corr_time :: !GpsTimeSec
195195
-- ^ GNSS reference time of the satellite correction associated to the flag.
@@ -224,7 +224,7 @@ data MsgSsrFlagHighLevel = MsgSsrFlagHighLevel
224224
instance Binary MsgSsrFlagHighLevel where
225225
get = do
226226
_msgSsrFlagHighLevel_obs_time <- get
227-
_msgSsrFlagHighLevel_atmo_corr_time <- get
227+
_msgSsrFlagHighLevel_iono_corr_time <- get
228228
_msgSsrFlagHighLevel_sat_corr_time <- get
229229
_msgSsrFlagHighLevel_ssr_sol_id <- getWord8
230230
_msgSsrFlagHighLevel_tile_set_id <- getWord16le
@@ -243,7 +243,7 @@ instance Binary MsgSsrFlagHighLevel where
243243

244244
put MsgSsrFlagHighLevel {..} = do
245245
put _msgSsrFlagHighLevel_obs_time
246-
put _msgSsrFlagHighLevel_atmo_corr_time
246+
put _msgSsrFlagHighLevel_iono_corr_time
247247
put _msgSsrFlagHighLevel_sat_corr_time
248248
putWord8 _msgSsrFlagHighLevel_ssr_sol_id
249249
putWord16le _msgSsrFlagHighLevel_tile_set_id

‎python/sbp/integrity.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,8 @@ class MsgSsrFlagHighLevel(SBP):
292292
SBP parent object to inherit from.
293293
obs_time : GPSTimeSec
294294
GNSS reference time of the observation used to generate the flag.
295-
atmo_corr_time : GPSTimeSec
296-
GNSS reference time of the atmospheric correction associated to the flag.
295+
iono_corr_time : GPSTimeSec
296+
GNSS reference time of the ionospheric correction associated to the flag.
297297
sat_corr_time : GPSTimeSec
298298
GNSS reference time of the satellite correction associated to the flag.
299299
ssr_sol_id : int
@@ -328,7 +328,7 @@ class MsgSsrFlagHighLevel(SBP):
328328
"""
329329
_parser = construct.Struct(
330330
'obs_time' / GPSTimeSec._parser,
331-
'atmo_corr_time' / GPSTimeSec._parser,
331+
'iono_corr_time' / GPSTimeSec._parser,
332332
'sat_corr_time' / GPSTimeSec._parser,
333333
'ssr_sol_id' / construct.Int8ul,
334334
'tile_set_id' / construct.Int16ul,
@@ -345,7 +345,7 @@ class MsgSsrFlagHighLevel(SBP):
345345
'use_iono_grid_point_sat_los' / construct.Int8ul,)
346346
__slots__ = [
347347
'obs_time',
348-
'atmo_corr_time',
348+
'iono_corr_time',
349349
'sat_corr_time',
350350
'ssr_sol_id',
351351
'tile_set_id',
@@ -373,7 +373,7 @@ def __init__(self, sbp=None, **kwargs):
373373
self.msg_type = SBP_MSG_SSR_FLAG_HIGH_LEVEL
374374
self.sender = kwargs.pop('sender', SENDER_ID)
375375
self.obs_time = kwargs.pop('obs_time')
376-
self.atmo_corr_time = kwargs.pop('atmo_corr_time')
376+
self.iono_corr_time = kwargs.pop('iono_corr_time')
377377
self.sat_corr_time = kwargs.pop('sat_corr_time')
378378
self.ssr_sol_id = kwargs.pop('ssr_sol_id')
379379
self.tile_set_id = kwargs.pop('tile_set_id')

‎rust/sbp/src/messages/integrity.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -889,10 +889,10 @@ pub mod msg_ssr_flag_high_level {
889889
/// GNSS reference time of the observation used to generate the flag.
890890
#[cfg_attr(feature = "serde", serde(rename = "obs_time"))]
891891
pub obs_time: GpsTimeSec,
892-
/// GNSS reference time of the atmospheric correction associated to the
892+
/// GNSS reference time of the ionospheric correction associated to the
893893
/// flag.
894-
#[cfg_attr(feature = "serde", serde(rename = "atmo_corr_time"))]
895-
pub atmo_corr_time: GpsTimeSec,
894+
#[cfg_attr(feature = "serde", serde(rename = "iono_corr_time"))]
895+
pub iono_corr_time: GpsTimeSec,
896896
/// GNSS reference time of the satellite correction associated to the flag.
897897
#[cfg_attr(feature = "serde", serde(rename = "sat_corr_time"))]
898898
pub sat_corr_time: GpsTimeSec,
@@ -1151,7 +1151,7 @@ pub mod msg_ssr_flag_high_level {
11511151
+ <u8 as WireFormat>::MIN_LEN;
11521152
fn len(&self) -> usize {
11531153
WireFormat::len(&self.obs_time)
1154-
+ WireFormat::len(&self.atmo_corr_time)
1154+
+ WireFormat::len(&self.iono_corr_time)
11551155
+ WireFormat::len(&self.sat_corr_time)
11561156
+ WireFormat::len(&self.ssr_sol_id)
11571157
+ WireFormat::len(&self.tile_set_id)
@@ -1169,7 +1169,7 @@ pub mod msg_ssr_flag_high_level {
11691169
}
11701170
fn write<B: BufMut>(&self, buf: &mut B) {
11711171
WireFormat::write(&self.obs_time, buf);
1172-
WireFormat::write(&self.atmo_corr_time, buf);
1172+
WireFormat::write(&self.iono_corr_time, buf);
11731173
WireFormat::write(&self.sat_corr_time, buf);
11741174
WireFormat::write(&self.ssr_sol_id, buf);
11751175
WireFormat::write(&self.tile_set_id, buf);
@@ -1189,7 +1189,7 @@ pub mod msg_ssr_flag_high_level {
11891189
MsgSsrFlagHighLevel {
11901190
sender_id: None,
11911191
obs_time: WireFormat::parse_unchecked(buf),
1192-
atmo_corr_time: WireFormat::parse_unchecked(buf),
1192+
iono_corr_time: WireFormat::parse_unchecked(buf),
11931193
sat_corr_time: WireFormat::parse_unchecked(buf),
11941194
ssr_sol_id: WireFormat::parse_unchecked(buf),
11951195
tile_set_id: WireFormat::parse_unchecked(buf),

‎rust/sbp/tests/integration/auto_check_sbp_integrity_msg_ssr_flag_high_level.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ fn test_auto_check_sbp_integrity_msg_ssr_flag_high_level() {
3737
sbp::messages::Sbp::MsgSsrFlagHighLevel(msg) => {
3838
let msg_type = msg.message_type().unwrap();
3939
assert_eq!(
40-
msg_type, 3001,
41-
"Incorrect message type, expected 3001, is {msg_type}"
40+
msg_type, 3002,
41+
"Incorrect message type, expected 3002, is {msg_type}"
4242
);
4343
let sender_id = msg.sender_id().unwrap();
4444
assert_eq!(
@@ -203,8 +203,8 @@ fn test_json2sbp_auto_check_sbp_integrity_msg_ssr_flag_high_level() {
203203
sbp::messages::Sbp::MsgSsrFlagHighLevel(msg) => {
204204
let msg_type = msg.message_type().unwrap();
205205
assert_eq!(
206-
msg_type, 3001,
207-
"Incorrect message type, expected 3001, is {msg_type}"
206+
msg_type, 3002,
207+
"Incorrect message type, expected 3002, is {msg_type}"
208208
);
209209
let sender_id = msg.sender_id().unwrap();
210210
assert_eq!(
@@ -377,8 +377,8 @@ fn test_sbp2json_auto_check_sbp_integrity_msg_ssr_flag_high_level() {
377377
sbp::messages::Sbp::MsgSsrFlagHighLevel(msg) => {
378378
let msg_type = msg.message_type().unwrap();
379379
assert_eq!(
380-
msg_type, 3001,
381-
"Incorrect message type, expected 3001, is {msg_type}"
380+
msg_type, 3002,
381+
"Incorrect message type, expected 3002, is {msg_type}"
382382
);
383383
let sender_id = msg.sender_id().unwrap();
384384
assert_eq!(

‎rust/sbp/tests/integration/auto_check_sbp_integrity_msg_ssr_flag_high_level_dep_a.rs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ fn test_auto_check_sbp_integrity_msg_ssr_flag_high_level_dep_a() {
3838
let msg_type = msg.message_type().unwrap();
3939
assert_eq!(
4040
msg_type, 3001,
41-
"Incorrect message type, expected 3001, is {}",
42-
msg_type
41+
"Incorrect message type, expected 3001, is {msg_type}"
4342
);
4443
let sender_id = msg.sender_id().unwrap();
4544
assert_eq!(
@@ -195,8 +194,7 @@ fn test_json2sbp_auto_check_sbp_integrity_msg_ssr_flag_high_level_dep_a() {
195194
let msg_type = msg.message_type().unwrap();
196195
assert_eq!(
197196
msg_type, 3001,
198-
"Incorrect message type, expected 3001, is {}",
199-
msg_type
197+
"Incorrect message type, expected 3001, is {msg_type}"
200198
);
201199
let sender_id = msg.sender_id().unwrap();
202200
assert_eq!(
@@ -360,8 +358,7 @@ fn test_sbp2json_auto_check_sbp_integrity_msg_ssr_flag_high_level_dep_a() {
360358
let msg_type = msg.message_type().unwrap();
361359
assert_eq!(
362360
msg_type, 3001,
363-
"Incorrect message type, expected 3001, is {}",
364-
msg_type
361+
"Incorrect message type, expected 3001, is {msg_type}"
365362
);
366363
let sender_id = msg.sender_id().unwrap();
367364
assert_eq!(

0 commit comments

Comments
 (0)