c64
/
pi1541
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added option to invert rotary encoder CLK/DATA pins to reverse operation for certain encoders (Issue#185)

This commit is contained in:
George Belmont 2020-08-14 08:14:06 -04:00
parent 4cf352d70e
commit 46381430e1
6 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
options.txt
View File

@ -132,9 +132,13 @@ GraphIEC = 1
//
// Please see dmRotary.h for full implementation details.
//
//RotaryEncoderEnable = 1
// Updated to address issue #185 and allow for inversion of rotary operation
// for certain encoders. - 08/13/2020 by Geo...
//
RotaryEncoderEnable = 1
RotaryEncoderInvert = 1
// This option will display the temperature of the Pi's CPU.
// It should be about 52°C anything above 65°C is bad and there is something wrong with your hardware
// It should be about 52<EFBFBD>C anything above 65<36>C is bad and there is something wrong with your hardware
//DisplayTemperature = 1

3
src/iec_bus.cpp
View File

@ -74,7 +74,8 @@ unsigned IEC_Bus::gplev0;
//ROTARY: Added for rotary encoder support - 09/05/2019 by Geo...
RotaryEncoder IEC_Bus::rotaryEncoder;
bool IEC_Bus::rotaryEncoderEnable;
//ROTARY: Added for rotary encoder inversion (Issue#185) - 08/13/2020 by Geo...
bool IEC_Bus::rotaryEncoderInvert;
void IEC_Bus::ReadGPIOUserInput( int buttonCount)
{

18
src/iec_bus.h
View File

@ -366,7 +366,15 @@ public:
//ROTARY: Added for rotary encoder support - 09/05/2019 by Geo...
if (IEC_Bus::rotaryEncoderEnable == true)
{
IEC_Bus::rotaryEncoder.Initialize(RPI_GPIO22, RPI_GPIO23, RPI_GPIO27);
//ROTARY: Added for rotary encoder inversion (Issue#185) - 08/13/2020 by Geo...
if (IEC_Bus::rotaryEncoderInvert == true)
{
IEC_Bus::rotaryEncoder.Initialize(RPI_GPIO23, RPI_GPIO22, RPI_GPIO27);
}
else
{
IEC_Bus::rotaryEncoder.Initialize(RPI_GPIO22, RPI_GPIO23, RPI_GPIO27);
}
}
}
@ -661,6 +669,12 @@ public:
rotaryEncoderEnable = value;
}
//ROTARY: Added for rotary encoder inversion (Issue#185) - 08/13/2020 by Geo...
static inline void SetRotaryEncoderInvert(bool value)
{
rotaryEncoderInvert = value;
}
// CA1 input ATN
// If CA1 is ever set to output
// - CA1 will start to drive pb7
@ -728,6 +742,8 @@ private:
//ROTARY: Added for rotary encoder support - 09/05/2019 by Geo...
static RotaryEncoder rotaryEncoder;
static bool rotaryEncoderEnable;
//ROTARY: Added for rotary encoder inversion (Issue#185) - 08/13/2020 by Geo...
static bool rotaryEncoderInvert;
};
#endif

2
src/main.cpp
View File

@ -1940,6 +1940,8 @@ extern "C"
IEC_Bus::SetIgnoreReset(options.IgnoreReset());
//ROTARY: Added for rotary encoder support - 09/05/2019 by Geo...
IEC_Bus::SetRotaryEncoderEnable(options.RotaryEncoderEnable());
//ROTARY: Added for rotary encoder inversion (Issue#185) - 08/13/2020 by Geo...
IEC_Bus::SetRotaryEncoderInvert(options.RotaryEncoderInvert());
#if not defined(EXPERIMENTALZERO)
if (!options.SoundOnGPIO())
{

3
src/options.cpp
View File

@ -159,7 +159,7 @@ Options::Options(void)
, buttonBack(4)
, buttonInsert(5)
, rotaryEncoderEnable(0) //ROTARY:
, rotaryEncoderInvert(0) //ROTARY:
{
autoMountImageName[0] = 0;
strcpy(ROMFontName, "chargen");
@ -251,6 +251,7 @@ void Options::Process(char* buffer)
ELSE_CHECK_DECIMAL_OPTION(buttonBack)
ELSE_CHECK_DECIMAL_OPTION(buttonInsert)
ELSE_CHECK_DECIMAL_OPTION(rotaryEncoderEnable) //ROTARY:
ELSE_CHECK_DECIMAL_OPTION(rotaryEncoderInvert) //ROTARY:
else if ((strcasecmp(pOption, "AutoBaseName") == 0))
{
strncpy(autoBaseName, pValue, 255);

4
src/options.h
View File

@ -109,6 +109,8 @@ public:
//ROTARY: Added for rotary encoder support - 09/05/2019 by Geo...
inline unsigned int RotaryEncoderEnable() const { return rotaryEncoderEnable; }
//ROTARY: Added for rotary encoder inversion (Issue#185) - 08/13/2020 by Geo...
inline unsigned int RotaryEncoderInvert() const { return rotaryEncoderInvert; }
// Page up and down will jump a different amount based on the maximum number rows displayed.
// Perhaps we should use some keyboard modifier to the the other screen?
@ -191,6 +193,8 @@ private:
//ROTARY: Added for rotary encoder support - 09/05/2019 by Geo...
unsigned int rotaryEncoderEnable;
//ROTARY: Added for rotary encoder inversion (Issue#185) - 08/13/2020 by Geo...
unsigned int rotaryEncoderInvert;
};
#endif