diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-09-09 23:28:39 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-09-09 23:28:39 -0600 |
| commit | 16405fd3eb6f82ef3a709e3ed30fc48faef7b547 (patch) | |
| tree | c111819b3ba0c9357af41c81b798326b9df7adad /ao-tools/ao-send-telem/ao-send-telem.c | |
| parent | 5a2f6ed6210844f7284fbf9f7ecba68c8a14fa52 (diff) | |
| parent | 28bd5057252e61bc5b1a35a00bc1f9fdfde097f7 (diff) | |
Merge branch 'branch-1.5' into debian
Conflicts:
ChangeLog
Releasing
altosui/Instdrv/NSIS/Includes/java.nsh
altosui/altos-windows.nsi.in
configure.ac
doc/Makefile
doc/altusmetrum.xsl
micropeak/micropeak-windows.nsi.in
telegps/telegps-windows.nsi.in
Diffstat (limited to 'ao-tools/ao-send-telem/ao-send-telem.c')
| -rw-r--r-- | ao-tools/ao-send-telem/ao-send-telem.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ao-tools/ao-send-telem/ao-send-telem.c b/ao-tools/ao-send-telem/ao-send-telem.c index 3db44542..26c3263e 100644 --- a/ao-tools/ao-send-telem/ao-send-telem.c +++ b/ao-tools/ao-send-telem/ao-send-telem.c @@ -85,6 +85,12 @@ packet_state(union ao_telemetry_all *telem) case AO_TELEMETRY_MEGA_DATA: cur_state = telem->mega_data.state; break; + case AO_TELEMETRY_METRUM_SENSOR: + cur_state = telem->metrum_sensor.state; + break; + case AO_TELEMETRY_MINI: + cur_state = telem->mini.state; + break; } return cur_state; } |