From dcd1e5ac988a15bae3fcb9269f4495a7fb5f9215 Mon Sep 17 00:00:00 2001 From: Mike Fiore Date: Mon, 7 Dec 2015 13:21:28 -0600 Subject: remove empty case statements from switches in modes --- Mode/ModeDemo.cpp | 20 --------------- Mode/ModeSingle.cpp | 63 ++-------------------------------------------- Mode/ModeSweep.cpp | 72 ----------------------------------------------------- 3 files changed, 2 insertions(+), 153 deletions(-) (limited to 'Mode') diff --git a/Mode/ModeDemo.cpp b/Mode/ModeDemo.cpp index 333bc54..e70ccbd 100644 --- a/Mode/ModeDemo.cpp +++ b/Mode/ModeDemo.cpp @@ -44,10 +44,6 @@ bool ModeDemo::start() { _sam.updateInterval(_intervals[_interval]); } break; - case success: - break; - case failure: - break; } break; @@ -69,10 +65,6 @@ bool ModeDemo::start() { send = true; } break; - case success: - break; - case failure: - break; } break; case ButtonHandler::sw1_hold: @@ -86,8 +78,6 @@ bool ModeDemo::start() { switch (_ls) { case LoRaHandler::send_success: switch (_state) { - case show_help: - break; case sampling: if (_mode == trigger) { _sam.updateSw2("Send"); @@ -97,17 +87,11 @@ bool ModeDemo::start() { _sam.updateInterval(_intervals[_interval]); } break; - case success: - break; - case failure: - break; } break; case LoRaHandler::send_failure: switch (_state) { - case show_help: - break; case sampling: if (_mode == trigger) { _sam.updateSw2("Send"); @@ -117,10 +101,6 @@ bool ModeDemo::start() { _sam.updateInterval(_intervals[_interval]); } break; - case success: - break; - case failure: - break; } break; } diff --git a/Mode/ModeSingle.cpp b/Mode/ModeSingle.cpp index 1f38e22..737301f 100644 --- a/Mode/ModeSingle.cpp +++ b/Mode/ModeSingle.cpp @@ -66,22 +66,14 @@ bool ModeSingle::start() { case show_help: incrementRatePower(); _help.updateMsg(formatRatePower()); - logInfo("new data rate %u, power %lu", _data_rate, _power); - break; - case in_progress: - // do nothing break; case success: incrementRatePower(); _success.updateInfo(formatRatePower()); - logInfo("new data rate %u, power %lu", _data_rate, _power); - break; - case data: break; case failure: incrementRatePower(); _failure.updateInfo(formatRatePower()); - logInfo("new data rate %u, power %lu", _data_rate, _power); break; } break; @@ -107,9 +99,6 @@ bool ModeSingle::start() { else send_ping = true; break; - case in_progress: - // do nothing - break; case success: _state = in_progress; _progress.display(); @@ -118,8 +107,6 @@ bool ModeSingle::start() { else send_ping = true; break; - case data: - break; case failure: _state = in_progress; _progress.display(); @@ -139,12 +126,6 @@ bool ModeSingle::start() { switch (_ls) { case LoRaHandler::ping_success: switch (_state) { - case check_file: - break; - case confirm: - break; - case show_help: - break; case in_progress: _ping_result = _lora->getPingResults(); displaySuccess(); @@ -163,23 +144,11 @@ bool ModeSingle::start() { _success.updateSw2("Survey"); } break; - case success: - break; - case data: - break; - case failure: - break; } break; case LoRaHandler::ping_failure: switch (_state) { - case check_file: - break; - case confirm: - break; - case show_help: - break; case in_progress: _state = failure; _failure.display(); @@ -203,27 +172,11 @@ bool ModeSingle::start() { _failure.updateSw2("Survey"); logInfo("ping failed"); break; - case success: - break; - case data: - break; - case failure: - break; } break; case LoRaHandler::send_success: switch (_state) { - case check_file: - break; - case confirm: - break; - case show_help: - break; - case in_progress: - break; - case success: - break; case data: _state = success; _success.updateInfo(" "); @@ -234,23 +187,11 @@ bool ModeSingle::start() { _dot->setTxWait(true); logInfo("data send success"); break; - case failure: - break; } break; case LoRaHandler::send_failure: switch (_state) { - case check_file: - break; - case confirm: - break; - case show_help: - break; - case in_progress: - break; - case success: - break; case data: _state = success; _success.updateInfo(" "); @@ -261,8 +202,6 @@ bool ModeSingle::start() { _dot->setTxWait(true); logInfo("data send failed"); break; - case failure: - break; } break; } @@ -390,5 +329,7 @@ void ModeSingle::incrementRatePower() { } else { _power += 3; } + + logInfo("new data rate %u, power %lu", _data_rate, _power); } diff --git a/Mode/ModeSweep.cpp b/Mode/ModeSweep.cpp index 2c1d4be..17047b3 100644 --- a/Mode/ModeSweep.cpp +++ b/Mode/ModeSweep.cpp @@ -89,10 +89,6 @@ bool ModeSweep::start() { _state = check_file; _file.display(); break; - case show_help: - break; - case in_progress: - break; case success: _state = complete; _display_timer.stop(); @@ -105,8 +101,6 @@ bool ModeSweep::start() { _survey_success = 0; _survey_failure = 0; break; - case data: - break; case failure: _state = complete; _display_timer.stop(); @@ -119,8 +113,6 @@ bool ModeSweep::start() { _survey_success = 0; _survey_failure = 0; break; - case complete: - break; } break; @@ -146,14 +138,6 @@ bool ModeSweep::start() { else send_ping = true; break; - case in_progress: - break; - case success: - break; - case data: - break; - case failure: - break; case complete: _state = in_progress; _survey_current = 1; @@ -175,12 +159,6 @@ bool ModeSweep::start() { switch (_ls) { case LoRaHandler::ping_success: switch (_state) { - case check_file: - break; - case confirm: - break; - case show_help: - break; case in_progress: _survey_success++; _ping_result = _lora->getPingResults(); @@ -200,25 +178,11 @@ bool ModeSweep::start() { _display_timer.start(); } break; - case success: - break; - case data: - break; - case failure: - break; - case complete: - break; } break; case LoRaHandler::ping_failure: switch (_state) { - case check_file: - break; - case confirm: - break; - case show_help: - break; case in_progress: _survey_failure++; _state = failure; @@ -242,29 +206,11 @@ bool ModeSweep::start() { logInfo("ping failed"); _display_timer.start(); break; - case success: - break; - case data: - break; - case failure: - break; - case complete: - break; } break; case LoRaHandler::send_success: switch (_state) { - case check_file: - break; - case confirm: - break; - case show_help: - break; - case in_progress: - break; - case success: - break; case data: _state = success; _success.updateInfo(" "); @@ -275,25 +221,11 @@ bool ModeSweep::start() { _dot->setTxWait(true); _display_timer.start(); break; - case failure: - break; - case complete: - break; } break; case LoRaHandler::send_failure: switch (_state) { - case check_file: - break; - case confirm: - break; - case show_help: - break; - case in_progress: - break; - case success: - break; case data: _state = success; _success.updateInfo(" "); @@ -304,10 +236,6 @@ bool ModeSweep::start() { _dot->setTxWait(true); _display_timer.start(); break; - case failure: - break; - case complete: - break; } break; } -- cgit v1.2.3