rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-30 06:31:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into nice-threads

Browse Source
This commit is contained in:
Thomas Göttgens
2022-12-30 20:18:19 +01:00
committed by GitHub
parent 8364c2b147 74e6eb34bd
commit 8a9af37d82
95 changed files with 1167 additions and 1072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/input/RotaryEncoderInterruptBase.cpp
View File

@@ -28,7 +28,7 @@ void RotaryEncoderInterruptBase::init(
this->rotaryLevelA = digitalRead(this->_pinA);
this->rotaryLevelB = digitalRead(this->_pinB);
DEBUG_MSG("Rotary initialized (%d, %d, %d)\n", this->_pinA, this->_pinB, pinPress);
LOG_INFO("Rotary initialized (%d, %d, %d)\n", this->_pinA, this->_pinB, pinPress);
}
int32_t RotaryEncoderInterruptBase::runOnce()
@@ -38,13 +38,13 @@ int32_t RotaryEncoderInterruptBase::runOnce()
e.source = this->_originName;
if (this->action == ROTARY_ACTION_PRESSED) {
DEBUG_MSG("Rotary event Press\n");
LOG_DEBUG("Rotary event Press\n");
e.inputEvent = this->_eventPressed;
} else if (this->action == ROTARY_ACTION_CW) {
DEBUG_MSG("Rotary event CW\n");
LOG_DEBUG("Rotary event CW\n");
e.inputEvent = this->_eventCw;
} else if (this->action == ROTARY_ACTION_CCW) {
DEBUG_MSG("Rotary event CCW\n");
LOG_DEBUG("Rotary event CCW\n");
e.inputEvent = this->_eventCcw;
}
@@ -104,7 +104,7 @@ RotaryEncoderInterruptBaseStateType RotaryEncoderInterruptBase::intHandler(bool
newState = ROTARY_EVENT_OCCURRED;
if ((this->action != ROTARY_ACTION_PRESSED) && (this->action != action)) {
this->action = action;
DEBUG_MSG("Rotary action\n");
LOG_DEBUG("Rotary action\n");
}
}
} else if (!actualPinRaising && (otherPinLevel == HIGH)) {

8
src/input/UpDownInterruptBase.cpp
View File

@@ -26,7 +26,7 @@ void UpDownInterruptBase::init(
attachInterrupt(this->_pinDown, onIntDown, RISING);
attachInterrupt(this->_pinUp, onIntUp, RISING);
DEBUG_MSG("GPIO initialized (%d, %d, %d)\n",
LOG_DEBUG("GPIO initialized (%d, %d, %d)\n",
this->_pinDown, this->_pinUp, pinPress);
}
@@ -34,7 +34,7 @@ void UpDownInterruptBase::intPressHandler()
{
InputEvent e;
e.source = this->_originName;
DEBUG_MSG("GPIO event Press\n");
LOG_DEBUG("GPIO event Press\n");
e.inputEvent = this->_eventPressed;
this->notifyObservers(&e);
}
@@ -43,7 +43,7 @@ void UpDownInterruptBase::intDownHandler()
{
InputEvent e;
e.source = this->_originName;
DEBUG_MSG("GPIO event Down\n");
LOG_DEBUG("GPIO event Down\n");
e.inputEvent = this->_eventDown;
this->notifyObservers(&e);
}
@@ -52,7 +52,7 @@ void UpDownInterruptBase::intUpHandler()
{
InputEvent e;
e.source = this->_originName;
DEBUG_MSG("GPIO event Up\n");
LOG_DEBUG("GPIO event Up\n");
e.inputEvent = this->_eventUp;
this->notifyObservers(&e);
}

2
src/input/kbI2cBase.cpp
View File

@@ -56,7 +56,7 @@ int32_t KbI2cBase::runOnce()
}
}
if (PrintDataBuf != 0) {
DEBUG_MSG("RAK14004 key 0x%x pressed\n", PrintDataBuf);
LOG_DEBUG("RAK14004 key 0x%x pressed\n", PrintDataBuf);
InputEvent e;
e.inputEvent = MATRIXKEY;
e.source = this->_originName;