From 0a1dc68749b22c65f38c1d7742d2601468a55dc2 Mon Sep 17 00:00:00 2001
From: Kevin <68612569+diyelectromusic@users.noreply.github.com>
Date: Mon, 21 Oct 2024 18:53:28 +0100
Subject: [PATCH] Move button config into uibuttons rather than
userinterface.cpp
---
src/uibuttons.cpp | 80 +++++++++++++++++++------------------------
src/uibuttons.h | 17 ++-------
src/userinterface.cpp | 32 +----------------
3 files changed, 40 insertions(+), 89 deletions(-)
diff --git a/src/uibuttons.cpp b/src/uibuttons.cpp
index 0e361ae..ba5e2a2 100644
--- a/src/uibuttons.cpp
+++ b/src/uibuttons.cpp
@@ -257,50 +257,8 @@ CUIButton::BtnTrigger CUIButton::triggerTypeFromString(const char* triggerString
}
-CUIButtons::CUIButtons (
- unsigned prevPin, const char *prevAction,
- unsigned nextPin, const char *nextAction,
- unsigned backPin, const char *backAction,
- unsigned selectPin, const char *selectAction,
- unsigned homePin, const char *homeAction,
- unsigned pgmUpPin, const char *pgmUpAction,
- unsigned pgmDownPin, const char *pgmDownAction,
- unsigned TGUpPin, const char *TGUpAction,
- unsigned TGDownPin, const char *TGDownAction,
- unsigned doubleClickTimeout, unsigned longPressTimeout,
- unsigned notesMidi, unsigned prevMidi, unsigned nextMidi, unsigned backMidi, unsigned selectMidi, unsigned homeMidi,
- unsigned pgmUpMidi, unsigned pgmDownMidi, unsigned TGUpMidi, unsigned TGDownMidi
-)
-: m_doubleClickTimeout(doubleClickTimeout),
- m_longPressTimeout(longPressTimeout),
- m_prevPin(prevPin),
- m_prevAction(CUIButton::triggerTypeFromString(prevAction)),
- m_nextPin(nextPin),
- m_nextAction(CUIButton::triggerTypeFromString(nextAction)),
- m_backPin(backPin),
- m_backAction(CUIButton::triggerTypeFromString(backAction)),
- m_selectPin(selectPin),
- m_selectAction(CUIButton::triggerTypeFromString(selectAction)),
- m_homePin(homePin),
- m_homeAction(CUIButton::triggerTypeFromString(homeAction)),
- m_pgmUpPin(pgmUpPin),
- m_pgmUpAction(CUIButton::triggerTypeFromString(pgmUpAction)),
- m_pgmDownPin(pgmDownPin),
- m_pgmDownAction(CUIButton::triggerTypeFromString(pgmDownAction)),
- m_TGUpPin(TGUpPin),
- m_TGUpAction(CUIButton::triggerTypeFromString(TGUpAction)),
- m_TGDownPin(TGDownPin),
- m_TGDownAction(CUIButton::triggerTypeFromString(TGDownAction)),
- m_notesMidi(notesMidi),
- m_prevMidi(ccToMidiPin(prevMidi)),
- m_nextMidi(ccToMidiPin(nextMidi)),
- m_backMidi(ccToMidiPin(backMidi)),
- m_selectMidi(ccToMidiPin(selectMidi)),
- m_homeMidi(ccToMidiPin(homeMidi)),
- m_pgmUpMidi(ccToMidiPin(pgmUpMidi)),
- m_pgmDownMidi(ccToMidiPin(pgmDownMidi)),
- m_TGUpMidi(ccToMidiPin(TGUpMidi)),
- m_TGDownMidi(ccToMidiPin(TGDownMidi)),
+CUIButtons::CUIButtons (CConfig *pConfig)
+: m_pConfig(pConfig),
m_eventHandler (0),
m_lastTick (0)
{
@@ -312,6 +270,40 @@ CUIButtons::~CUIButtons (void)
boolean CUIButtons::Initialize (void)
{
+ assert (m_pConfig);
+
+ // Read the button configuration
+ m_doubleClickTimeout = m_pConfig->GetDoubleClickTimeout ();
+ m_longPressTimeout = m_pConfig->GetLongPressTimeout ();
+ m_prevPin = m_pConfig->GetButtonPinPrev ();
+ m_prevAction = CUIButton::triggerTypeFromString( m_pConfig->GetButtonActionPrev ());
+ m_nextPin = m_pConfig->GetButtonPinNext ();
+ m_nextAction = CUIButton::triggerTypeFromString( m_pConfig->GetButtonActionNext ());
+ m_backPin = m_pConfig->GetButtonPinBack ();
+ m_backAction = CUIButton::triggerTypeFromString( m_pConfig->GetButtonActionBack ());
+ m_selectPin = m_pConfig->GetButtonPinSelect ();
+ m_selectAction = CUIButton::triggerTypeFromString( m_pConfig->GetButtonActionSelect ());
+ m_homePin = m_pConfig->GetButtonPinHome ();
+ m_homeAction = CUIButton::triggerTypeFromString( m_pConfig->GetButtonActionHome ());
+ m_pgmUpPin = m_pConfig->GetButtonPinPgmUp ();
+ m_pgmUpAction = CUIButton::triggerTypeFromString( m_pConfig->GetButtonActionPgmUp ());
+ m_pgmDownPin = m_pConfig->GetButtonPinPgmDown ();
+ m_pgmDownAction = CUIButton::triggerTypeFromString( m_pConfig->GetButtonActionPgmDown ());
+ m_TGUpPin = m_pConfig->GetButtonPinTGUp ();
+ m_TGUpAction = CUIButton::triggerTypeFromString( m_pConfig->GetButtonActionTGUp ());
+ m_TGDownPin = m_pConfig->GetButtonPinTGDown ();
+ m_TGDownAction = CUIButton::triggerTypeFromString( m_pConfig->GetButtonActionTGDown ());
+ m_notesMidi = m_pConfig->GetMIDIButtonNotes ();
+ m_prevMidi = m_pConfig->GetMIDIButtonPrev ();
+ m_nextMidi = m_pConfig->GetMIDIButtonNext ();
+ m_backMidi = m_pConfig->GetMIDIButtonBack ();
+ m_selectMidi = m_pConfig->GetMIDIButtonSelect ();
+ m_homeMidi = m_pConfig->GetMIDIButtonHome ();
+ m_pgmUpMidi = m_pConfig->GetMIDIButtonPgmUp ();
+ m_pgmDownMidi = m_pConfig->GetMIDIButtonPgmDown ();
+ m_TGUpMidi = m_pConfig->GetMIDIButtonTGUp ();
+ m_TGDownMidi = m_pConfig->GetMIDIButtonTGDown ();
+
// First sanity check and convert the timeouts:
// Internally values are in tenths of a millisecond, but config values
// are in milliseconds
diff --git a/src/uibuttons.h b/src/uibuttons.h
index 44dcca0..8a18ebc 100644
--- a/src/uibuttons.h
+++ b/src/uibuttons.h
@@ -111,20 +111,7 @@ public:
typedef void BtnEventHandler (CUIButton::BtnEvent Event, void *param);
public:
- CUIButtons (
- unsigned prevPin, const char *prevAction,
- unsigned nextPin, const char *nextAction,
- unsigned backPin, const char *backAction,
- unsigned selectPin, const char *selectAction,
- unsigned homePin, const char *homeAction,
- unsigned pgmUpPin, const char *pgmUpAction,
- unsigned pgmDownPin, const char *pgmDownAction,
- unsigned TGUpPin, const char *TGUpAction,
- unsigned TGDownPin, const char *TGDownAction,
- unsigned doubleClickTimeout, unsigned longPressTimeout,
- unsigned notesMidi, unsigned prevMidi, unsigned nextMidi, unsigned backMidi, unsigned selectMidi, unsigned homeMidi,
- unsigned pgmUpMidi, unsigned pgmDownMidi, unsigned TGUpMidi, unsigned TGDownMidi
- );
+ CUIButtons (CConfig *pConfig);
~CUIButtons (void);
boolean Initialize (void);
@@ -138,6 +125,8 @@ public:
void BtnMIDICmdHandler (unsigned nMidiCmd, unsigned nMidiData1, unsigned nMidiData2);
private:
+ CConfig *m_pConfig;
+
// Array of normal GPIO buttons and "MIDI buttons"
CUIButton m_buttons[MAX_BUTTONS];
diff --git a/src/userinterface.cpp b/src/userinterface.cpp
index aa46f9e..7aac0e7 100644
--- a/src/userinterface.cpp
+++ b/src/userinterface.cpp
@@ -162,37 +162,7 @@ bool CUserInterface::Initialize (void)
LOGDBG ("LCD initialized");
}
- m_pUIButtons = new CUIButtons ( m_pConfig->GetButtonPinPrev (),
- m_pConfig->GetButtonActionPrev (),
- m_pConfig->GetButtonPinNext (),
- m_pConfig->GetButtonActionNext (),
- m_pConfig->GetButtonPinBack (),
- m_pConfig->GetButtonActionBack (),
- m_pConfig->GetButtonPinSelect (),
- m_pConfig->GetButtonActionSelect (),
- m_pConfig->GetButtonPinHome (),
- m_pConfig->GetButtonActionHome (),
- m_pConfig->GetButtonPinPgmUp (),
- m_pConfig->GetButtonActionPgmUp (),
- m_pConfig->GetButtonPinPgmDown (),
- m_pConfig->GetButtonActionPgmDown (),
- m_pConfig->GetButtonPinTGUp (),
- m_pConfig->GetButtonActionTGUp (),
- m_pConfig->GetButtonPinTGDown (),
- m_pConfig->GetButtonActionTGDown (),
- m_pConfig->GetDoubleClickTimeout (),
- m_pConfig->GetLongPressTimeout (),
- m_pConfig->GetMIDIButtonNotes (),
- m_pConfig->GetMIDIButtonPrev (),
- m_pConfig->GetMIDIButtonNext (),
- m_pConfig->GetMIDIButtonBack (),
- m_pConfig->GetMIDIButtonSelect (),
- m_pConfig->GetMIDIButtonHome (),
- m_pConfig->GetMIDIButtonPgmUp (),
- m_pConfig->GetMIDIButtonPgmDown (),
- m_pConfig->GetMIDIButtonTGUp (),
- m_pConfig->GetMIDIButtonTGDown ()
- );
+ m_pUIButtons = new CUIButtons ( m_pConfig );
assert (m_pUIButtons);
if (!m_pUIButtons->Initialize ())