Skip to content

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

rework onewire write id

Geo89a54946d872
diff --git a/src/Controllers/OneWireController.cpp b/src/Controllers/OneWireController.cpp
index 4f65fda1..0ed830a8 100644
--- a/src/Controllers/OneWireController.cpp
+++ b/src/Controllers/OneWireController.cpp
@@ -227,13 +227,13 @@ void OneWireController::handleIdWrite(std::vector<uint8_t> idBytes) {
int attempt = 0;
bool success = false;
- terminalView.println("OneWire ID Write: waiting for device...");
+ terminalView.println("OneWire ID Write: Waiting for device... Press ENTER to stop");
// Wait detection
while (!oneWireService.reset()) {
- delay(100);
+ delay(1);
if (terminalInput.readChar() == '\n') {
- terminalView.println("Aborted by user.");
+ terminalView.println("OneWire Write: Aborted by user.");
return;
}
}
@@ -245,8 +245,8 @@ void OneWireController::handleIdWrite(std::vector<uint8_t> idBytes) {
// Ecriture
oneWireService.writeRw1990(state.getOneWirePin(), idBytes.data(), idBytes.size());
+ delay(50);
- delay(100);
// Read ID
uint8_t buffer[8];
if (!oneWireService.reset()) continue;
@@ -280,18 +280,66 @@ void OneWireController::handleIdWrite(std::vector<uint8_t> idBytes) {
Scratchpad Write
*/
void OneWireController::handleScratchpadWrite(std::vector<uint8_t> scratchpadBytes) {
- if (!oneWireService.reset()) {
- terminalView.println("OneWire Write: No device found.");
- return;
+ const int maxRetries = 3;
+ int attempt = 0;
+ bool success = false;
+
+ terminalView.println("OneWire Write: Waiting for device... Press ENTER to stop");
+
+ // Wait for device presence
+ while (!oneWireService.reset()) {
+ delay(1);
+ auto c = terminalInput.readChar();
+ if (c == '\n' || c == '\r') {
+ terminalView.println("Aborted by user.");
+ return;
+ }
}
- oneWireService.skip();
- oneWireService.write(0x0F); // Scratchpad write command
- delayMicroseconds(20);
- oneWireService.writeBytes(scratchpadBytes.data(), 8);
- oneWireService.reset();
+ // Try up to 3 times
+ while (attempt < maxRetries && !success) {
+ attempt++;
+ terminalView.println("Attempt " + std::to_string(attempt) + "...");
+
+ if (!oneWireService.reset()) continue;
+
+ oneWireService.skip();
+ oneWireService.write(0x0F); // Scratchpad write command
+ delayMicroseconds(20);
+ oneWireService.writeBytes(scratchpadBytes.data(), 8);
+ delay(50);
+
+ // Verify by reading back
+ if (!oneWireService.reset()) continue;
+
+ oneWireService.skip();
+ oneWireService.write(0xAA); // Read Scratchpad
+ delayMicroseconds(20);
+
+ uint8_t readback[8];
+ oneWireService.readBytes(readback, 8);
- terminalView.println("OneWire Write: Scratchpad write completed.");
+ // Missmatch
+ if (memcmp(readback, scratchpadBytes.data(), 8) != 0) {
+ terminalView.println("Mismatch in scratchpad data.");
+ continue;
+ }
+
+ // CRC error
+ uint8_t crc = oneWireService.crc8(readback, 8);
+ if (crc != readback[7]) {
+ terminalView.println("CRC error on scratchpad.");
+ continue;
+ }
+
+ success = true;
+ }
+
+ if (success) {
+ terminalView.println("OneWire Write: Scratchpad write successful.");
+ } else {
+ terminalView.println("OneWire Write: Failed after 3 attempts.");
+ }
}
/*
diff --git a/src/Services/OneWireService.cpp b/src/Services/OneWireService.cpp
index 15b348ad..abc7e4cb 100644
--- a/src/Services/OneWireService.cpp
+++ b/src/Services/OneWireService.cpp
@@ -1,5 +1,3 @@
-// OneWireService.cpp
-
#include "OneWireService.h"
OneWireService::OneWireService() {}
@@ -25,72 +23,23 @@ void OneWireService::writeBytes(const uint8_t* data, uint8_t len) {
if (oneWire) oneWire->write_bytes(data, len);
}
-void OneWireService::writeByteRw1990(uint8_t pin, uint8_t data) {
- int data_bit;
- for (data_bit = 0; data_bit < 8; data_bit++) {
- if (data & 1) {
- digitalWrite(pin, LOW);
- pinMode(pin, OUTPUT);
- delayMicroseconds(60);
- pinMode(pin, INPUT);
- digitalWrite(pin, HIGH);
- } else {
- digitalWrite(pin, LOW);
- pinMode(pin, OUTPUT);
- pinMode(pin, INPUT);
- digitalWrite(pin, HIGH);
- }
- delay(10);
- data = data >> 1;
- }
-}
-
void OneWireService::writeRw1990(uint8_t pin, uint8_t* data, size_t len) {
- if (!reset()) return;
-
- // Prepare
- oneWire->skip();
- oneWire->reset();
- oneWire->write(0x33); // Read ROM
-
- // Write mode
- oneWire->skip();
+ // Reset + Write Serial
oneWire->reset();
- oneWire->write(0x3C); // Set write mode for some models
- delay(50);
-
- // Write Command ?
- oneWire->skip();
- oneWire->reset();
- oneWire->write(0xD1); // Write command
- delay(50);
-
- // Write don't work without this code
- digitalWrite(pin, LOW);
- pinMode(pin, OUTPUT);
- delayMicroseconds(60);
- pinMode(pin, INPUT);
- digitalWrite(pin, HIGH);
- delay(10);
-
- oneWire->skip();
- oneWire->reset();
- oneWire->write(0xD5); // Enter write mode
- delay(50);
-
- // Write
- for (size_t i = 0; i < len; ++i) {
- writeByteRw1990(pin, data[i]);
- delayMicroseconds(25);
+ oneWire->write(0xD5);
+
+ // Write each byte with 10ms delay to power the eeprom
+ for (uint8_t i = 0; i < 8; i++) {
+ uint8_t b = data[i];
+ for (uint8_t bit = 0; bit < 8; bit++) {
+ bool v = b & 0x01;
+ oneWire->write(v ? 0xFF : 0x00);
+ delay(10);
+ b >>= 1;
+ }
}
- oneWire->reset(); // Reset bus
- oneWire->skip();
-
- // Finalise
- oneWire->write(0xD1); // End of write command
- delayMicroseconds(16);
- oneWire->reset(); // Reset bus
+ oneWire->reset();
}
uint8_t OneWireService::read() {
diff --git a/src/Services/OneWireService.h b/src/Services/OneWireService.h
index acf30bfc..d722f89f 100644
--- a/src/Services/OneWireService.h
+++ b/src/Services/OneWireService.h
@@ -12,7 +12,6 @@ public:
bool reset();
void write(uint8_t data);
void writeBytes(const uint8_t* data, uint8_t len);
- void writeByteRw1990(uint8_t pin, uint8_t data);
void writeRw1990(uint8_t pin, uint8_t* data, size_t len);
uint8_t read();
void readBytes(uint8_t* buffer, uint8_t length);
diff --git a/src/main.cpp b/src/main.cpp
index 3b8aea75..76f653ca 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -70,7 +70,7 @@ void setup() {
WebTerminalView webView(wsServer);
WebTerminalInput webInput(wsServer);
deviceView.loading();
- delay(2000); // let the server begin
+ delay(3000); // let the server begin
// Setup routes for index and ws
httpServer.setupRoutes();