diff options
| author | Mike Fiore <mfiore@multitech.com> | 2016-08-18 15:18:44 -0500 |
|---|---|---|
| committer | Mike Fiore <mfiore@multitech.com> | 2016-08-18 15:18:44 -0500 |
| commit | 89072eb96a73fcb0bc899ca07ea9731bf9cde73f (patch) | |
| tree | 42f192647733b1b6d8e175ac6a8278005558de11 /Layout/LayoutJoin.h | |
| parent | 3b6a9751bed0f75a12fae4cb356f7f9a1faf13a2 (diff) | |
| parent | d15988a5fc22ea3b106ddd87b4457f378a6580fd (diff) | |
| download | mtdot-box-evb-factory-firmware-89072eb96a73fcb0bc899ca07ea9731bf9cde73f.tar.gz mtdot-box-evb-factory-firmware-89072eb96a73fcb0bc899ca07ea9731bf9cde73f.tar.bz2 mtdot-box-evb-factory-firmware-89072eb96a73fcb0bc899ca07ea9731bf9cde73f.zip | |
Merge branch 'Semtech/GpsSurveryMode'
Conflicts:
main.cpp
Diffstat (limited to 'Layout/LayoutJoin.h')
| -rw-r--r-- | Layout/LayoutJoin.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Layout/LayoutJoin.h b/Layout/LayoutJoin.h index 56cea3f..c493ce2 100644 --- a/Layout/LayoutJoin.h +++ b/Layout/LayoutJoin.h @@ -28,11 +28,13 @@ class LayoutJoin : public Layout { ~LayoutJoin(); void display(); + void displayEditFsb(uint8_t rate, uint32_t power, uint8_t band, string key, string id); void updateId(std::string id); void updateKey(std::string key); void updateFsb(uint8_t band); - void updateRate(std::string rate); + void updateJoinFsb(uint8_t band); + void updateRate(uint8_t rate); void updatePower(uint32_t power); void updateAttempt(uint32_t attempt); void updateStatus(std::string status); @@ -59,5 +61,4 @@ class LayoutJoin : public Layout { Field _fCancel; uint8_t _band; }; - #endif |