From a5d8661b10887f6deda35357b59b1f8736347a64 Mon Sep 17 00:00:00 2001 From: topquark12 Date: Fri, 29 Jan 2021 16:18:07 +0800 Subject: [PATCH] main: fix handling of incomplete data received (#55) Reviewed-on: https://git.m-labs.hk/M-Labs/thermostat/pulls/55 Co-Authored-By: topquark12 Co-Committed-By: topquark12 --- pytec/autotune.py | 7 ++----- src/main.rs | 8 +++++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pytec/autotune.py b/pytec/autotune.py index f2e5de5..66bb351 100644 --- a/pytec/autotune.py +++ b/pytec/autotune.py @@ -243,11 +243,8 @@ def main(): lookback, noiseband, ch['interval']) for data in tec.report_mode(): - try: - ch = data[channel] - # Workaround for report_mode may yeild empty object - except KeyError: - continue + + ch = data[channel] temperature = ch['temperature'] diff --git a/src/main.rs b/src/main.rs index f7dd2fb..9a11b7d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -213,9 +213,11 @@ fn main() -> ! { socket.close() } else if socket.can_send() && socket.can_recv() { match socket.recv(|buf| session.feed(buf)) { - Ok(SessionInput::Nothing) => { - send_line(&mut socket, b"{}"); - } + // SessionInput::Nothing happens when the line reader parses a string of characters that is not + // followed by a newline character. Could be due to partial commands not terminated with newline, + // socket RX ring buffer wraps around, or when the command is sent as seperate TCP packets etc. + // Do nothing and feed more data to the line reader in the next loop cycle. + Ok(SessionInput::Nothing) => {} Ok(SessionInput::Command(command)) => match command { Command::Quit => socket.close(),