Skip to content

A Hardware Hacking Tool with Web-Based CLI That Speaks Every Protocol

Some modification to correct sniff in DIO clearing pullup/pulldown

fdufnews1e5daaaf6490
diff --git a/src/Controllers/DioController.cpp b/src/Controllers/DioController.cpp
index efe3d7fb..11de199e 100644
--- a/src/Controllers/DioController.cpp
+++ b/src/Controllers/DioController.cpp
@@ -131,7 +131,24 @@ void DioController::handleSniff(const TerminalCommand& cmd) {
uint8_t pin = argTransformer.toUint8(cmd.getSubcommand());
if (!isPinAllowed(pin, "Sniff")) return;
- pinService.setInput(pin);
+ PinService::pullType pull = pinService.getPullType(pin);
+
+ switch (pull)
+ {
+ case PinService::NOPULL:
+ pinService.setInput(pin);
+ break;
+ case PinService::PULL_UP:
+ pinService.setInputPullup(pin);
+ break;
+ case PinService::PULL_DOWN:
+ pinService.setInputPullDown(pin);
+ break;
+
+ default:
+ break;
+ }
+
terminalView.println("DIO Sniff: Pin " + std::to_string(pin) + "... Press [ENTER] to stop");
diff --git a/src/Services/PinService.cpp b/src/Services/PinService.cpp
index b03ed4ca..3af43968 100644
--- a/src/Services/PinService.cpp
+++ b/src/Services/PinService.cpp
@@ -3,14 +3,17 @@
void PinService::setInput(uint8_t pin) {
pinMode(pin, INPUT);
+ pullState[pin] = NOPULL;
}
void PinService::setInputPullup(uint8_t pin) {
pinMode(pin, INPUT_PULLUP);
+ pullState[pin] = PULL_UP;
}
void PinService::setInputPullDown(uint8_t pin) {
pinMode(pin, INPUT_PULLDOWN);
+ pullState[pin] = PULL_DOWN;
}
void PinService::setOutput(uint8_t pin) {
@@ -32,14 +35,22 @@ bool PinService::read(uint8_t pin) {
}
void PinService::togglePullup(uint8_t pin) {
- bool enabled = pullupState[pin]; // default false if not set
+ pullType enabled = pullState[pin];
- if (enabled) {
+ if (enabled == PULL_UP) {
setInput(pin);
- pullupState[pin] = false;
} else {
setInputPullup(pin);
- pullupState[pin] = true;
+ }
+}
+
+void PinService::togglePullDown(uint8_t pin) {
+ pullType enabled = pullState[pin];
+
+ if (enabled == PULL_DOWN) {
+ setInput(pin);
+ } else {
+ setInputPullDown(pin);
}
}
@@ -106,4 +117,8 @@ bool PinService::isPwmFeasible(uint32_t freq, uint8_t resolutionBits) {
uint32_t divParam = (uint32_t)(baseClkHz / denom);
return (divParam >= 1 && divParam <= maxDivParam);
+}
+
+PinService::pullType PinService::getPullType(uint8_t pin){
+ return(pullState[pin]);
}
\ No newline at end of file
diff --git a/src/Services/PinService.h b/src/Services/PinService.h
index aa2a3085..1fec36b6 100644
--- a/src/Services/PinService.h
+++ b/src/Services/PinService.h
@@ -13,10 +13,13 @@ public:
void setLow(uint8_t pin);
bool read(uint8_t pin);
void togglePullup(uint8_t pin);
+ void togglePullDown(uint8_t pin);
int readAnalog(uint8_t pin);
bool setupPwm(uint8_t pin, uint32_t freq, uint8_t dutyPercent);
void setServoAngle(uint8_t pin, uint8_t angle);
+ typedef enum pullType { NOPULL = 0, PULL_UP, PULL_DOWN} pullType;
+ pullType getPullType(uint8_t pin);
private:
bool isPwmFeasible(uint32_t freq, uint8_t resolutionBits);
- std::unordered_map<uint8_t, bool> pullupState; // true = INPUT_PULLUP, false = INPUT
+ std::unordered_map<uint8_t, pullType> pullState;
};