From f1ae41b243e15397ebb406c441381a830cb5295c Mon Sep 17 00:00:00 2001 From: Johannes Wendel Date: Fri, 6 Dec 2019 00:28:33 +0100 Subject: [PATCH] python cl working now for inputs --- FlippR-Driver/networking/input/InputSocketHandler.cpp | 4 +--- cli/FlippR_Networking.py | 11 ++++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/FlippR-Driver/networking/input/InputSocketHandler.cpp b/FlippR-Driver/networking/input/InputSocketHandler.cpp index 8576f9f..376ecc0 100644 --- a/FlippR-Driver/networking/input/InputSocketHandler.cpp +++ b/FlippR-Driver/networking/input/InputSocketHandler.cpp @@ -40,10 +40,8 @@ void InputSocketHandler::run() return; } - std::string str = event.getJsonString(); + std::string str = event.getJsonString() + std::string(1, 0x02 ) ; - auto size = str.size(); - str = std::to_string(size) + std::string(1, 0x02) + str; this->socket().sendBytes(str.c_str(), str.size()); } diff --git a/cli/FlippR_Networking.py b/cli/FlippR_Networking.py index 5c365ed..eff4b07 100644 --- a/cli/FlippR_Networking.py +++ b/cli/FlippR_Networking.py @@ -46,11 +46,12 @@ class Networking: self.get("/displays" + display + "/write_score/" + str(score)) def getInputEvent(self): - header = bytearray() + header = list() while b'\x02' not in header: bla = self.input_socket.recv(1) header.append(bla) - - length = int(str(header[:-1])) - - return self.input_socket.recv(length) + s = "" + for x in header: + s += x.decode('utf8') + + return s