From f68f9fc8ccefa7eac1b91d681bc58fe418020dc8 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Mon, 6 Jun 2022 17:42:56 +0200 Subject: [PATCH] add possibility to write content unfitted --- FlippR-Driver/include/output/items/Display.h | 1 + FlippR-Driver/include/output/items/EightDigitDisplay.h | 2 -- FlippR-Driver/include/output/items/SevenDigitDisplay.h | 2 -- FlippR-Driver/networking/output/OutputRequestHandler.cpp | 4 ++++ cli/FlippR_Networking.py | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/FlippR-Driver/include/output/items/Display.h b/FlippR-Driver/include/output/items/Display.h index e119a6f..f769cdf 100644 --- a/FlippR-Driver/include/output/items/Display.h +++ b/FlippR-Driver/include/output/items/Display.h @@ -24,6 +24,7 @@ public: virtual ~Display() = default; virtual void write_score(uint64_t score) = 0; + virtual void write_content(std::string & content) = 0; }; } diff --git a/FlippR-Driver/include/output/items/EightDigitDisplay.h b/FlippR-Driver/include/output/items/EightDigitDisplay.h index 74cb1b2..8e72dbc 100644 --- a/FlippR-Driver/include/output/items/EightDigitDisplay.h +++ b/FlippR-Driver/include/output/items/EightDigitDisplay.h @@ -20,8 +20,6 @@ class EightDigitDisplay : public virtual Display { public: virtual ~EightDigitDisplay() = default; - - virtual void write_content(std::string content) = 0; }; } diff --git a/FlippR-Driver/include/output/items/SevenDigitDisplay.h b/FlippR-Driver/include/output/items/SevenDigitDisplay.h index d6146b3..16d8174 100644 --- a/FlippR-Driver/include/output/items/SevenDigitDisplay.h +++ b/FlippR-Driver/include/output/items/SevenDigitDisplay.h @@ -20,8 +20,6 @@ class SevenDigitDisplay : public virtual Display { public: virtual ~SevenDigitDisplay() = default; - - virtual void write_content(std::string & content) = 0; }; } diff --git a/FlippR-Driver/networking/output/OutputRequestHandler.cpp b/FlippR-Driver/networking/output/OutputRequestHandler.cpp index 134a48c..cb1fdc3 100644 --- a/FlippR-Driver/networking/output/OutputRequestHandler.cpp +++ b/FlippR-Driver/networking/output/OutputRequestHandler.cpp @@ -262,6 +262,10 @@ boost::optional OutputRequestHandler::parseDisplay(const std throw new Poco::InvalidArgumentException("Could not convert " + score + " to a number!\n" + e.what()); } } + else if(action == "write_content") + { + display->write_content(score); + } else { throw new Poco::NotFoundException("No Action with name \"" + action + "\" on sounds!"); diff --git a/cli/FlippR_Networking.py b/cli/FlippR_Networking.py index fd1c985..36e3173 100644 --- a/cli/FlippR_Networking.py +++ b/cli/FlippR_Networking.py @@ -45,7 +45,7 @@ class Networking: self.get("/flippers/" + name + "/activate") def deactivateFlipper(self, name): - self.get("/flippers/" + name + "deactivate") + self.get("/flippers/" + name + "/deactivate") def lampStatus(self, lamp): return json.loads(self.get("/lamps/" + lamp + "/status"))