From dbea0d49555faa2b45a100765358e323fd0e7612 Mon Sep 17 00:00:00 2001 From: Dan Date: Fri, 6 Dec 2024 01:54:30 -0800 Subject: [PATCH] Fixes for editor connection and serial --- VortexEngine/src/Menus/MenuList/EditorConnection.cpp | 4 ++-- VortexEngine/src/Menus/MenuList/EditorConnection.h | 11 ++--------- VortexEngine/src/Serial/Serial.cpp | 1 - 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/VortexEngine/src/Menus/MenuList/EditorConnection.cpp b/VortexEngine/src/Menus/MenuList/EditorConnection.cpp index b3cf598761..72d8f6646d 100644 --- a/VortexEngine/src/Menus/MenuList/EditorConnection.cpp +++ b/VortexEngine/src/Menus/MenuList/EditorConnection.cpp @@ -352,7 +352,7 @@ void EditorConnection::listenModeVL() m_state = STATE_LISTEN_MODE_VL; } -void EditorConnection::onShortClickM() +void EditorConnection::onShortClick() { // if the device has received any commands do not reset! if (!m_allowReset) { @@ -366,7 +366,7 @@ void EditorConnection::onShortClickM() m_allowReset = false; } -void EditorConnection::onLongClickM() +void EditorConnection::onLongClick() { leaveMenu(true); } diff --git a/VortexEngine/src/Menus/MenuList/EditorConnection.h b/VortexEngine/src/Menus/MenuList/EditorConnection.h index e73e724cfc..443ff4050c 100644 --- a/VortexEngine/src/Menus/MenuList/EditorConnection.h +++ b/VortexEngine/src/Menus/MenuList/EditorConnection.h @@ -19,16 +19,9 @@ class EditorConnection : public Menu void sendCurModeVL(); void listenModeVL(); - // pull/push through the chromalink - bool pullHeaderChromalink(); - bool pushHeaderChromalink(); - bool pullModeChromalink(); - bool pushModeChromalink(); - bool writeDuoFirmware(); - // handlers for clicks - void onShortClickM() override; - void onLongClickM() override; + void onShortClick() override; + void onLongClick() override; // menu conn void leaveMenu(bool doSave = false) override; diff --git a/VortexEngine/src/Serial/Serial.cpp b/VortexEngine/src/Serial/Serial.cpp index fdc261a406..efd96fc9a6 100644 --- a/VortexEngine/src/Serial/Serial.cpp +++ b/VortexEngine/src/Serial/Serial.cpp @@ -4,7 +4,6 @@ #include "../Time/TimeControl.h" #include "../Time/Timings.h" #include "../Modes/Modes.h" -#include "../Menus/MainMenu.h" #include "../Menus/Menus.h" #include "../Log/Log.h"