remove support for viewtech touchscreens

shanteacontrols · Oct 15, 2023 · 69d2c38 · 69d2c38
1 parent 0998be0
commit 69d2c38
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 248 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ The following components are supported:
 * Potentiometers
 * FSRs (force-sensitive resistors)
 * LCD/OLED displays
-* Touchscreen displays (Nextion and Viewtech/Stone)
+* Touchscreen displays (Nextion)
 
 OpenDeck supports sending of both 7-bit and 14-bit Non-Registered Part Numbers (NRPN), latching messages on buttons, various encoding modes for quadrature encoders, LED control using MIDI In, configurable MIDI channels for each component individually, Bluetooth MIDI etc. Full list of supported features can be found [here](https://github.com/shanteacontrols/OpenDeck/wiki/Configurable-features).
 

diff --git a/src/firmware/application/CMakeLists.txt b/src/firmware/application/CMakeLists.txt
@@ -50,7 +50,6 @@ if(NOT "PROJECT_TARGET_USB_OVER_SERIAL_HOST" IN_LIST PROJECT_TARGET_DEFINES)
     target_sources(application
         PRIVATE
         ${CMAKE_CURRENT_LIST_DIR}/io/buttons/Buttons.cpp
-        ${CMAKE_CURRENT_LIST_DIR}/io/touchscreen/model/viewtech/Viewtech.cpp
         ${CMAKE_CURRENT_LIST_DIR}/io/touchscreen/model/Builder.cpp
         ${CMAKE_CURRENT_LIST_DIR}/io/touchscreen/model/nextion/Nextion.cpp
         ${CMAKE_CURRENT_LIST_DIR}/io/touchscreen/Touchscreen.cpp

diff --git a/src/firmware/application/io/touchscreen/Touchscreen.h b/src/firmware/application/io/touchscreen/Touchscreen.h
@@ -102,7 +102,6 @@ namespace io
         enum class model_t : uint8_t
         {
             NEXTION,
-            VIEWTECH,
             AMOUNT
         };
 

diff --git a/src/firmware/application/io/touchscreen/model/Builder.cpp b/src/firmware/application/io/touchscreen/model/Builder.cpp
@@ -24,7 +24,6 @@ using namespace io;
 
 TouchscreenModelBuilder::TouchscreenModelBuilder(Touchscreen::HWA& hwa)
     : _nextion(hwa)
-    , _viewtech(hwa)
 {}
 
 uint8_t Touchscreen::Model::_rxBuffer[Touchscreen::Model::BUFFER_SIZE];

diff --git a/src/firmware/application/io/touchscreen/model/Builder.h b/src/firmware/application/io/touchscreen/model/Builder.h
@@ -23,7 +23,6 @@ limitations under the License.
 #ifdef PROJECT_TARGET_SUPPORT_TOUCHSCREEN
 
 #include "nextion/Nextion.h"
-#include "viewtech/Viewtech.h"
 
 namespace io
 {
@@ -33,8 +32,7 @@ namespace io
         TouchscreenModelBuilder(Touchscreen::HWA& hwa);
 
         private:
-        Nextion  _nextion;
-        Viewtech _viewtech;
+        Nextion _nextion;
     };
 }    // namespace io
 #else

diff --git a/src/firmware/application/io/touchscreen/model/viewtech/README.md b/src/firmware/application/io/touchscreen/model/viewtech/README.md
diff --git a/src/firmware/application/io/touchscreen/model/viewtech/Viewtech.cpp b/src/firmware/application/io/touchscreen/model/viewtech/Viewtech.cpp
diff --git a/src/firmware/application/io/touchscreen/model/viewtech/Viewtech.h b/src/firmware/application/io/touchscreen/model/viewtech/Viewtech.h
diff --git a/src/firmware/application/io/touchscreen/stub/Touchscreen.h b/src/firmware/application/io/touchscreen/stub/Touchscreen.h
@@ -92,7 +92,6 @@ namespace io
         enum class model_t : uint8_t
         {
             NEXTION,
-            VIEWTECH,
             AMOUNT
         };
 

diff --git a/tests/src/system/CMakeLists.txt b/tests/src/system/CMakeLists.txt
@@ -20,7 +20,6 @@ if(NOT "PROJECT_TARGET_USB_OVER_SERIAL_HOST" IN_LIST PROJECT_TARGET_DEFINES)
         ${PROJECT_ROOT}/src/firmware/application/io/touchscreen/Touchscreen.cpp
         ${PROJECT_ROOT}/src/firmware/application/io/touchscreen/model/Builder.cpp
         ${PROJECT_ROOT}/src/firmware/application/io/touchscreen/model/nextion/Nextion.cpp
-        ${PROJECT_ROOT}/src/firmware/application/io/touchscreen/model/viewtech/Viewtech.cpp
     )
 
     target_compile_definitions(system
-Original file line number
+Diff line change
@@ Expand Up / @@ -102,7 +102,6 @@ namespace io @@
             enum class model_t : uint8_t
             {
                 NEXTION,
-                VIEWTECH,
                 AMOUNT
             };
@@ Expand Down @@