diff options
| author | Mike Fiore <mfiore@multitech.com> | 2015-12-11 10:18:02 -0600 |
|---|---|---|
| committer | Mike Fiore <mfiore@multitech.com> | 2015-12-11 10:18:02 -0600 |
| commit | c28f3e07a6320f48476fd4dad5cca0011669e49f (patch) | |
| tree | 063962dd2197419f62cd2555b8525df89db18ea1 /Mode/Mode.h | |
| parent | a1bb849d38853c79285665e702f9425770e74133 (diff) | |
| parent | 279d4b746cb23dce634c968a86eaab0199f1d4af (diff) | |
| download | mtdot-box-evb-factory-firmware-c28f3e07a6320f48476fd4dad5cca0011669e49f.tar.gz mtdot-box-evb-factory-firmware-c28f3e07a6320f48476fd4dad5cca0011669e49f.tar.bz2 mtdot-box-evb-factory-firmware-c28f3e07a6320f48476fd4dad5cca0011669e49f.zip | |
Merge branch 'link_check'
Conflicts:
Layout/LayoutSurveySuccess.cpp
Mode/Mode.cpp
Diffstat (limited to 'Mode/Mode.h')
| -rw-r--r-- | Mode/Mode.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Mode/Mode.h b/Mode/Mode.h index e552732..759592a 100644 --- a/Mode/Mode.h +++ b/Mode/Mode.h @@ -29,7 +29,7 @@ class Mode { GPSPARSER::latitude gps_latitude; int16_t gps_altitude; struct tm gps_time; - LoRaHandler::LoRaPing ping; + LoRaHandler::LoRaLink link; uint8_t data_rate; uint32_t power; } DataItem; @@ -75,7 +75,7 @@ class Mode { uint32_t _next_tx; ButtonHandler::ButtonEvent _be; LoRaHandler::LoRaStatus _ls; - LoRaHandler::LoRaPing _ping_result; + LoRaHandler::LoRaLink _link_check_result; uint8_t _state; bool _send_data; bool _gps_available; |