Skip to content

Commit 2771773

Browse files
author
Jason Mobarak
authored
add AAR settings [DIP-59] (#560)
* add AAR settings [DIP-59] * cast * more casting
1 parent cd82403 commit 2771773

File tree

2 files changed

+213
-16
lines changed

2 files changed

+213
-16
lines changed

python/libsettings.pyx

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -135,18 +135,18 @@ cdef class Settings:
135135

136136
def __init__(self, link, sender_id=SENDER_ID, debug=False):
137137
self.c_api.ctx = <void *>self
138-
self.c_api.send = &send_wrapper
139-
self.c_api.send_from = &send_from_wrapper
140-
self.c_api.wait_init = &wait_init_wrapper
141-
self.c_api.wait = &wait_wrapper
142-
self.c_api.signal = &signal_wrapper
143-
self.c_api.wait_thd = &wait_thd_wrapper
144-
self.c_api.signal_thd = &signal_thd_wrapper
145-
self.c_api.lock = &lock_wrapper
146-
self.c_api.unlock = &unlock_wrapper
147-
self.c_api.register_cb = &register_cb_wrapper
148-
self.c_api.unregister_cb = &unregister_cb_wrapper
149-
self.c_api.log_preformatted = log_wrapper
138+
self.c_api.send = <settings_send_t>&send_wrapper
139+
self.c_api.send_from = <settings_send_from_t>&send_from_wrapper
140+
self.c_api.wait_init = <settings_wait_init_t>&wait_init_wrapper
141+
self.c_api.wait = <settings_wait_t>&wait_wrapper
142+
self.c_api.signal = <settings_signal_t>&signal_wrapper
143+
self.c_api.wait_thd = <settings_wait_thd_t>&wait_thd_wrapper
144+
self.c_api.signal_thd = <settings_signal_thd_t>&signal_thd_wrapper
145+
self.c_api.lock = <settings_lock_t>&lock_wrapper
146+
self.c_api.unlock = <settings_unlock_t>&unlock_wrapper
147+
self.c_api.register_cb = <settings_reg_cb_t>&register_cb_wrapper
148+
self.c_api.unregister_cb = <settings_unreg_cb_t>&unregister_cb_wrapper
149+
self.c_api.log_preformatted = <settings_log_preformatted_t>log_wrapper
150150

151151
self.ctx = settings_create(sender_id, &self.c_api)
152152

settings.yaml

Lines changed: 201 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,182 @@
11
---
22

3+
- group: aar
4+
name: pnm_id
5+
expert: false
6+
type: integer
7+
units: N/A
8+
default value: '0'
9+
readonly: false
10+
Description: PNM Identification. Range [0..2]. 0 = Non-locomotive, startup, advanced configuration; 1 = PNM1; 2 = PNM2
11+
Notes:
12+
13+
- group: aar
14+
name: pcps_pos_reference
15+
expert: false
16+
type: string
17+
units: N/A
18+
default value: '1'
19+
readonly: false
20+
Description: Reported locomotive position reference. Range [1..4]. 1 = Antenna ARP; 2 = Antenna Centroid; 3 = Front Coupler; 4 = Rear Coupler
21+
Notes: Valid locomotive attitude is required to compute Antenna Centroid, Front Coupler and Rear Coupler positions. Attitude may not be available after receiver start before the locomotive movement in a good sky visibility conditions.
22+
23+
- group: aar
24+
name: pcsh_ss_ssd_thr_high_precision_mph
25+
expert: true
26+
type: float
27+
units: MPH
28+
default_value: 0.2
29+
Description: Speed SD threshold below which speed High Precision mode is reported. Range [0.0..1000.0].
30+
Notes:
31+
32+
- group: aar
33+
name: pcsh_ss_ssd_thr_standard_mph
34+
expert: true
35+
type: float
36+
units: MPH
37+
default_value: 1.0
38+
Description: Speed SD threshold below which speed Standard mode is reported. Range [0.0..1000.0].
39+
Notes:
40+
41+
- group: aar
42+
name: pcsh_ss_ssd_thr_degraded_mph
43+
expert: true
44+
type: float
45+
units: MPH
46+
default_value: 2.5
47+
Description: Speed SD threshold below which speed Degraded mode is reported. Range [0.0..1000.0].
48+
Notes: Speed Very Low Confidence mode is reported when the speed is valid and speed SD is above this threshold.
49+
50+
- group: aar
51+
name: pcsh_ss_hsd_thr_high_precision_deg
52+
expert: true
53+
type: float
54+
units: degrees
55+
default_value: 0.5
56+
Description: Heading SD threshold below which heading High Precision mode is reported. Range [0.0..180.0].
57+
Notes:
58+
59+
- group: aar
60+
name: pcsh_ss_hsd_thr_standard_deg
61+
expert: true
62+
type: float
63+
units: degrees
64+
default_value: 2.0
65+
Description: Heading SD threshold below which heading Standard mode is reported. Range [0.0..180.0].
66+
Notes:
67+
68+
- group: aar
69+
name: pcsh_ss_hsd_thr_degraded_deg
70+
expert: true
71+
type: float
72+
units: degrees
73+
default_value: 5.0
74+
Description: Heading SD threshold below which heading Degraded mode is reported. Range [0.0..180.0].
75+
Notes: Heading Very Low Confidence mode is reported when the heading is valid and heading SD is above this threshold.
76+
77+
- group: aar
78+
name: pcof_along_track_offset_m
79+
expert: false
80+
type: float
81+
units: m
82+
default_value: 0.0
83+
Description: Antenna ARP Along Track Offset. Range [0.0..655.35].
84+
Notes: Distance is measured from the pulling face of the front coupler towards the rear of the locomotive.
85+
86+
- group: aar
87+
name: pcof_cross_track_offset_m
88+
expert: false
89+
type: float
90+
units: m
91+
default_value: 0.0
92+
Description: Antenna ARP Cross Track Offset. Range [-327.68..327.67].
93+
Notes: Distance is measured from the locomotive centerline towards the right of the locomotive.
94+
95+
- group: aar
96+
name: pcof_vertical_offset_m
97+
expert: false
98+
type: float
99+
units: m
100+
default_value: 0.0
101+
Description: Antenna ARP Vertical Offset. Range [0.0..655.35].
102+
Notes: Distance is measured from the top of the rail up.
103+
104+
- group: aar
105+
name: pcof_along_track_offset_ac_m
106+
expert: false
107+
type: float
108+
units: m
109+
default_value: 0.0
110+
Description: Antenna Centroid Along Track Offset. Range [0.0..655.35].
111+
Notes: Distance is measured from the pulling face of the front coupler towards the rear of the locomotive.
112+
113+
- group: aar
114+
name: pcof_cross_track_offset_ac_m
115+
expert: false
116+
type: float
117+
units: m
118+
default_value: 0.0
119+
Description: Antenna Centroid Cross Track Offset. Range [-327.68..327.67].
120+
Notes: Distance is measured from the locomotive centerline towards the right of the locomotive.
121+
122+
- group: aar
123+
name: pcof_vertical_offset_ac_m
124+
expert: false
125+
type: float
126+
units: m
127+
default_value: 0.0
128+
Description: Antenna Centroid Vertical Offset. Range [0.0..655.35].
129+
Notes: Distance is measured from the top of the rail up.
130+
131+
- group: aar
132+
name: pcof_loco_length_m
133+
expert: false
134+
type: float
135+
units: m
136+
default_value: 0.0
137+
Description: Locomotive length. Range [0.0..655.35].
138+
Notes: Distance is measured from the pulling face of the front coupler to the pulling face of the rear coupler.
139+
140+
- group: aar
141+
name: pccf_mfg_id
142+
expert: true
143+
type: integer
144+
units: N/A
145+
default value: '0'
146+
readonly: false
147+
Description: Manufacturer ID. Range [0..255].
148+
Notes:
149+
150+
- group: aar
151+
name: pccf_device_reported
152+
expert: true
153+
type: integer
154+
units: N/A
155+
default value: '0'
156+
readonly: false
157+
Description: Device being reported. Range [0..65535].
158+
Notes:
159+
160+
- group: aar
161+
name: pccf_equipment_description
162+
expert: true
163+
type: string
164+
units: N/A
165+
default value: ''
166+
readonly: false
167+
Description: Equipment description. Maximum 255 characters.
168+
Notes:
169+
170+
- group: aar
171+
name: pcsd_imu_stat_period_s
172+
expert: true
173+
type: integer
174+
units: N/A
175+
default value: '1'
176+
readonly: false
177+
Description: IMU statistic computation period. Range [0..1000].
178+
Notes: When set to zero statistic will be computed at the position output rate.
179+
3180
- group: acquisition
4181
name: sbas_acquisition_enabled
5182
expert: false
@@ -557,7 +734,7 @@
557734
default value: '20'
558735
readonly: false
559736
Description: Indicates the maximum standard deviation of position for which the inertial system will dead reckon.
560-
Notes: The default value of 20 meters was chosen as the logical minimum standard of the position accuracy during dead reckon mode.
737+
Notes: The default value of 20 meters was chosen as the logical minimum standard of the position accuracy during dead reckon mode.
561738

562739
- group: ins
563740
name: build_name
@@ -1837,11 +2014,11 @@
18372014
Description: |
18382015
The frequency at which GNSS navigation solution is computed.
18392016
Notes: |
1840-
Minimum is 1 Hz. Maximum is 10 Hz for RTK positioning with a maximum of 15 used satellites.
1841-
At 5 Hz and lower the maximum number of used satellites is 22. 20 Hz is an absolute maximum with
2017+
Minimum is 1 Hz. Maximum is 10 Hz for RTK positioning with a maximum of 15 used satellites.
2018+
At 5 Hz and lower the maximum number of used satellites is 22. 20 Hz is an absolute maximum with
18422019
a limit of 5 used satellites.
18432020
1844-
System with inertial fusion (Duro Inertial, Piksi Multi Inertial) can output position at a higher rate
2021+
System with inertial fusion (Duro Inertial, Piksi Multi Inertial) can output position at a higher rate
18452022
than the GNSS-only solution. See fused_soln_freq in the INS group.
18462023
18472024
- group: solution
@@ -2891,6 +3068,16 @@
28913068
Notes: The address setting is defined according to the convention "hostname:port".
28923069
For example, it should match the format 192.168.0.222:55555 or xxxxx.net:2101 .
28933070

3071+
- group: udp_client0
3072+
name: multicast_ttl
3073+
expert: true
3074+
type: integer
3075+
units: N/A
3076+
default value: '1'
3077+
readonly: false
3078+
Description: Multicast Time To Live property. Range [1..255].
3079+
Notes:
3080+
28943081
- group: udp_client1
28953082
name: mode
28963083
expert: false
@@ -2936,6 +3123,16 @@
29363123
Notes: The address setting is defined according to the convention "hostname:port".
29373124
For example, it should match the format 192.168.0.222:55555 or xxxxx.net:2101 .
29383125

3126+
- group: udp_client1
3127+
name: multicast_ttl
3128+
expert: true
3129+
type: integer
3130+
units: N/A
3131+
default value: '1'
3132+
readonly: false
3133+
Description: Multicast Time To Live property. Range [1..255].
3134+
Notes:
3135+
29393136
- group: udp_server0
29403137
name: mode
29413138
expert: false

0 commit comments

Comments
 (0)