diff --git a/src/config.cpp b/src/config.cpp index c96c450..5211cf2 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -81,7 +81,6 @@ void CConfig::Load (void) m_nLCDPinData7 = m_Properties.GetNumber ("LCDPinData7", 25); m_nLCDI2CAddress = m_Properties.GetNumber ("LCDI2CAddress", 0); - m_bButtonEnabled = m_Properties.GetNumber ("ButtonEnabled", 0) != 0; m_nButtonPinPrev = m_Properties.GetNumber ("ButtonPinPrev", NOPIN); m_nButtonPinNext = m_Properties.GetNumber ("ButtonPinNext", NOPIN); m_nButtonPinBack = m_Properties.GetNumber ("ButtonPinBack", NOPIN); @@ -187,11 +186,6 @@ unsigned CConfig::GetLCDI2CAddress (void) const return m_nLCDI2CAddress; } -bool CConfig::GetButtonEnabled (void) const -{ - return m_bButtonEnabled; -} - unsigned CConfig::GetButtonPinPrev (void) const { return m_nButtonPinPrev; diff --git a/src/config.h b/src/config.h index 7b7cbdf..44d5ba5 100644 --- a/src/config.h +++ b/src/config.h @@ -93,7 +93,6 @@ public: // GPIO Button Navigation // GPIO pin numbers are chip numbers, not header positions - bool GetButtonEnabled (void) const; unsigned GetButtonPinPrev (void) const; unsigned GetButtonPinNext (void) const; unsigned GetButtonPinBack (void) const; @@ -135,7 +134,6 @@ private: unsigned m_nLCDPinData7; unsigned m_nLCDI2CAddress; - bool m_bButtonEnabled; unsigned m_nButtonPinPrev; unsigned m_nButtonPinNext; unsigned m_nButtonPinBack; diff --git a/src/minidexed.ini b/src/minidexed.ini index 74a6f4d..80fded9 100644 --- a/src/minidexed.ini +++ b/src/minidexed.ini @@ -34,7 +34,6 @@ LCDI2CAddress=0x00 # # Although actually any buttons set to 255 will be ignored # -ButtonEnabled=1 ButtonPinPrev=16 ButtonPinNext=20 ButtonPinBack=5 diff --git a/src/userinterface.cpp b/src/userinterface.cpp index 3e25426..e70bf36 100644 --- a/src/userinterface.cpp +++ b/src/userinterface.cpp @@ -87,24 +87,21 @@ bool CUserInterface::Initialize (void) LOGDBG ("LCD initialized"); } - if (m_pConfig->GetButtonEnabled ()) + m_pUIButtons = new CUIButtons ( m_pConfig->GetButtonPinPrev (), + m_pConfig->GetButtonPinNext (), + m_pConfig->GetButtonPinBack (), + m_pConfig->GetButtonPinSelect (), + m_pConfig->GetButtonPinHome ()); + assert (m_pUIButtons); + + if (!m_pUIButtons->Initialize ()) { - m_pUIButtons = new CUIButtons ( m_pConfig->GetButtonPinPrev (), - m_pConfig->GetButtonPinNext (), - m_pConfig->GetButtonPinBack (), - m_pConfig->GetButtonPinSelect (), - m_pConfig->GetButtonPinHome ()); - assert (m_pUIButtons); - - if (!m_pUIButtons->Initialize ()) - { - return false; - } + return false; + } - m_pUIButtons->RegisterEventHandler (UIButtonsEventStub, this); + m_pUIButtons->RegisterEventHandler (UIButtonsEventStub, this); - LOGDBG ("Button User Interface initialized"); - } + LOGDBG ("Button User Interface initialized"); if (m_pConfig->GetEncoderEnabled ()) {