Simplify repeated code

pull/23/head
sh123 2021-06-08 17:36:02 +03:00
rodzic 1300b7c0ce
commit 08f3bcb413
1 zmienionych plików z 5 dodań i 16 usunięć

Wyświetl plik

@ -421,8 +421,7 @@ bool Service::onSerialRxHasData()
bool Service::onSerialRx(byte *b) bool Service::onSerialRx(byte *b)
{ {
if (config_.BtEnableBle) { int rxResult = config_.BtEnableBle ? serialBLE_.read() : serialBt_.read();
int rxResult = serialBLE_.read();
if (rxResult == -1) { if (rxResult == -1) {
return false; return false;
} }
@ -430,16 +429,6 @@ bool Service::onSerialRx(byte *b)
return true; return true;
} }
else {
int rxResult = serialBt_.read();
if (rxResult == -1) {
return false;
}
*b = (byte)rxResult;
return true;
}
}
void Service::onControlCommand(Cmd cmd, byte value) void Service::onControlCommand(Cmd cmd, byte value)
{ {
switch (cmd) { switch (cmd) {