A Hardware Hacking Tool with Web-Based CLI That Speaks Every Protocol
C arduinobluetoothcan-busdebuggingeepromesp32flipperzerogpiohardware-hackingi2cjtagopenocdprotocolspwmradiorfidspisubghzuartwifi
improve write id/sp for 1wire
Geo475f5dd28bfa
diff --git a/src/Controllers/OneWireController.cpp b/src/Controllers/OneWireController.cppindex 8e3ba778..ba7ae4fa 100644--- a/src/Controllers/OneWireController.cpp+++ b/src/Controllers/OneWireController.cpp@@ -105,7 +105,6 @@ void OneWireController::handleRead() {}}-/*ID Read*/@@ -172,32 +171,37 @@ Writevoid OneWireController::handleWrite(const TerminalCommand& cmd) {std::string sub = cmd.getSubcommand();- if (sub == "id") {- std::vector<uint8_t> idBytes = argTransformer.parseByteList(cmd.getArgs());+ if (sub == "id" || sub == "sp") {+ std::vector<uint8_t> bytes;- if (idBytes.size() != 8) {- terminalView.println("OneWire Write: ID must be exactly 8 bytes.");- return;- }+ // Bytes are given in command line+ if (!cmd.getArgs().empty()) {+ bytes = argTransformer.parseByteList(cmd.getArgs());+ } else {+ // Interactive input if no arguments are given+ std::string prompt = "Enter 8-byte (28 FF AA...) ";- handleIdWrite(idBytes);- }-- else if (sub == "sp") {- std::vector<uint8_t> spBytes = argTransformer.parseByteList(cmd.getArgs());+ std::string input = userInputManager.readValidatedHexString(prompt, 8, false);+ bytes = argTransformer.parseHexList(input);+ }- if (spBytes.size() != 8) {- terminalView.println("OneWire Write: Scratchpad must be exactly 8 bytes.");+ // Length check+ if (bytes.size() != 8) {+ terminalView.println("OneWire Write: Must be exactly 8 bytes.");return;}- handleScratchpadWrite(spBytes);+ if (sub == "id") {+ handleIdWrite(bytes);+ } else {+ handleScratchpadWrite(bytes);+ }}else {terminalView.println("OneWire Write: Invalid syntax. Use:");- terminalView.println(" write id <8 bytes>");- terminalView.println(" write sp <8 bytes>");+ terminalView.println(" write id [8 bytes]");+ terminalView.println(" write sp [8 bytes]");}}@@ -555,8 +559,8 @@ void OneWireController::handleHelp() {terminalView.println(" ping");terminalView.println(" sniff");terminalView.println(" read");- terminalView.println(" write id <8 bytes>");- terminalView.println(" write sp <8 bytes>");+ terminalView.println(" write id [8 bytes]");+ terminalView.println(" write sp [8 bytes]");terminalView.println(" copy ibutton");terminalView.println(" temp");terminalView.println(" config");diff --git a/src/Controllers/UtilityController.cpp b/src/Controllers/UtilityController.cppindex 32cd0ba8..51273e56 100644--- a/src/Controllers/UtilityController.cpp+++ b/src/Controllers/UtilityController.cpp@@ -276,8 +276,8 @@ void UtilityController::handleHelp() {terminalView.println(" ping - Ping 1-Wire device");terminalView.println(" sniff - View 1-Wire traffic");terminalView.println(" read - Read ID + SP");- terminalView.println(" write id <8 bytes> - Write ibutton ID");- terminalView.println(" write sp <8 bytes> - Write scratchpad");+ terminalView.println(" write id [8 bytes] - Write ibutton ID");+ terminalView.println(" write sp [8 bytes] - Write scratchpad");terminalView.println(" temp - Read temperature");terminalView.println(" copy ibutton - Copy ibutton tag");terminalView.println(" config - Configure settings");