From 93076a490cbb706f880279a0e6d6fdcf2da661ea Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <daniel@brunner.ninja>
Date: Sun, 24 May 2020 14:45:08 +0200
Subject: [PATCH] Implemented back interface for other displays

---
 src/displays/calibratedisplay.h  | 8 ++++++++
 src/displays/dualgraphdisplay.h  | 2 +-
 src/displays/gameoflifedisplay.h | 2 +-
 src/displays/graphdisplay.h      | 2 +-
 src/displays/metersdisplay.h     | 2 +-
 src/displays/pingpongdisplay.h   | 2 +-
 src/displays/spirodisplay.h      | 2 +-
 src/displays/starfielddisplay.h  | 2 +-
 8 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/displays/calibratedisplay.h b/src/displays/calibratedisplay.h
index 7b93b7a..b45d85c 100644
--- a/src/displays/calibratedisplay.h
+++ b/src/displays/calibratedisplay.h
@@ -31,6 +31,8 @@ public:
     void redraw() override;
     void stop() override;
 
+    void back() override;
+
     void triggered() override;
 
 private:
@@ -97,6 +99,12 @@ void CalibrateDisplay::stop()
         currentMode = m_oldMode;
 }
 
+void CalibrateDisplay::back()
+{
+    if (!m_bootup)
+        switchScreen<BoardcomputerHardwareSettingsMenu>();
+}
+
 void CalibrateDisplay::triggered()
 {
     if (m_bootup)
diff --git a/src/displays/dualgraphdisplay.h b/src/displays/dualgraphdisplay.h
index fe4de7f..1bddc63 100644
--- a/src/displays/dualgraphdisplay.h
+++ b/src/displays/dualgraphdisplay.h
@@ -13,7 +13,7 @@ class GraphsMenu;
 }
 
 namespace {
-class DualGraphDisplay : public DemoDisplay, public SwitchScreenAction<GraphsMenu>
+class DualGraphDisplay : public DemoDisplay, public SwitchScreenAction<GraphsMenu>, public BackActionInterface<SwitchScreenAction<GraphsMenu>>
 {
     using Base = DemoDisplay;
 
diff --git a/src/displays/gameoflifedisplay.h b/src/displays/gameoflifedisplay.h
index e88daaf..4c72b00 100644
--- a/src/displays/gameoflifedisplay.h
+++ b/src/displays/gameoflifedisplay.h
@@ -14,7 +14,7 @@ class DemosMenu;
 }
 
 namespace {
-class GameOfLifeDisplay : public DemoDisplay, public SwitchScreenAction<DemosMenu>
+class GameOfLifeDisplay : public DemoDisplay, public SwitchScreenAction<DemosMenu>, public BackActionInterface<SwitchScreenAction<DemosMenu>>
 {
     using Base = DemoDisplay;
 
diff --git a/src/displays/graphdisplay.h b/src/displays/graphdisplay.h
index 8d735c2..40bb1b7 100644
--- a/src/displays/graphdisplay.h
+++ b/src/displays/graphdisplay.h
@@ -30,7 +30,7 @@ public:
 };
 
 template<size_t COUNT>
-class GraphDisplay : public DemoDisplay, public SwitchScreenAction<GraphsMenu>, public virtual TextInterface, public virtual MultiStatisticsInterface<COUNT>
+class GraphDisplay : public DemoDisplay, public SwitchScreenAction<GraphsMenu>, public virtual TextInterface, public BackActionInterface<SwitchScreenAction<GraphsMenu>>, public virtual MultiStatisticsInterface<COUNT>
 {
     using Base = DemoDisplay;
 
diff --git a/src/displays/metersdisplay.h b/src/displays/metersdisplay.h
index b390c76..f815c74 100644
--- a/src/displays/metersdisplay.h
+++ b/src/displays/metersdisplay.h
@@ -16,7 +16,7 @@ class BmsDisplay;
 }
 
 namespace {
-class MetersDisplay : public DemoDisplay, public SwitchScreenAction<MainMenu>
+class MetersDisplay : public DemoDisplay, public SwitchScreenAction<MainMenu>, public BackActionInterface<SwitchScreenAction<MainMenu>>
 {
     using Base = DemoDisplay;
 
diff --git a/src/displays/pingpongdisplay.h b/src/displays/pingpongdisplay.h
index 192ef6f..1c76c02 100644
--- a/src/displays/pingpongdisplay.h
+++ b/src/displays/pingpongdisplay.h
@@ -13,7 +13,7 @@ class DemosMenu;
 }
 
 namespace {
-class PingPongDisplay : public DemoDisplay, public SwitchScreenAction<DemosMenu>
+class PingPongDisplay : public DemoDisplay, public SwitchScreenAction<DemosMenu>, public BackActionInterface<SwitchScreenAction<DemosMenu>>
 {
     using Base = DemoDisplay;
 
diff --git a/src/displays/spirodisplay.h b/src/displays/spirodisplay.h
index efce4ea..6c33556 100644
--- a/src/displays/spirodisplay.h
+++ b/src/displays/spirodisplay.h
@@ -13,7 +13,7 @@ class DemosMenu;
 }
 
 namespace {
-class SpiroDisplay : public DemoDisplay, public SwitchScreenAction<DemosMenu>
+class SpiroDisplay : public DemoDisplay, public SwitchScreenAction<DemosMenu>, public BackActionInterface<SwitchScreenAction<DemosMenu>>
 {
     using Base = DemoDisplay;
 
diff --git a/src/displays/starfielddisplay.h b/src/displays/starfielddisplay.h
index f3f478a..b996e07 100644
--- a/src/displays/starfielddisplay.h
+++ b/src/displays/starfielddisplay.h
@@ -13,7 +13,7 @@ class DemosMenu;
 }
 
 namespace {
-class StarfieldDisplay : public DemoDisplay, public SwitchScreenAction<DemosMenu>
+class StarfieldDisplay : public DemoDisplay, public SwitchScreenAction<DemosMenu>, public BackActionInterface<SwitchScreenAction<DemosMenu>>
 {
     using Base = DemoDisplay;