Skip to content

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

minor fix on subghz replay

Geo9464df816a8e
diff --git a/src/Controllers/SubGhzController.cpp b/src/Controllers/SubGhzController.cpp
index ab025df4..0d98463b 100644
--- a/src/Controllers/SubGhzController.cpp
+++ b/src/Controllers/SubGhzController.cpp
@@ -232,7 +232,7 @@ void SubGhzController::handleReplay(const TerminalCommand&) {
}
delay(3);
}
- confirm = userInputManager.readYesNo("SUBGHZ Replay: Done. Run again?", false);
+ confirm = userInputManager.readYesNo("SUBGHZ Replay: Done. Run again?", true);
}
terminalView.println(okAll ? "SUBGHZ Replay Done without error.\n" : "SUBGHZ Replay: Done with errors.\n");
diff --git a/src/Services/SubGhzService.cpp b/src/Services/SubGhzService.cpp
index c13686c0..d059ca3d 100644
--- a/src/Services/SubGhzService.cpp
+++ b/src/Services/SubGhzService.cpp
@@ -211,31 +211,32 @@ std::vector<rmt_item32_t> SubGhzService::readRawFrame() {
return frame;
}
-bool SubGhzService::sendRawFrame(int pin, const std::vector<rmt_item32_t>& items, uint32_t tick_per_us) {
+bool SubGhzService::sendRawFrame(int pin, const std::vector<rmt_item32_t>& items, uint32_t /*tick_per_us_ignored*/) {
if (!isConfigured_ || items.empty()) return false;
- // Output
- if (!startTxBitBang()) return false;
- // tick to us
- auto ticks_to_us = [tick_per_us](uint32_t ticks) -> uint32_t {
- if (!tick_per_us) return 0;
- return (ticks + (tick_per_us/2)) / tick_per_us;
- };
+ if (!startTxBitBang()) return false; // configure gdo0_
+
+ // Stabilisation
+ gpio_set_level((gpio_num_t)pin, 0);
+ esp_rom_delay_us(200);
- // Bit bang seq
for (const auto& it : items) {
+ // phase 0
gpio_set_level((gpio_num_t)pin, it.level0 ? 1 : 0);
- uint32_t us0 = ticks_to_us(it.duration0);
+ uint32_t us0 = it.duration0;
if (us0) esp_rom_delay_us(us0);
+ // phase 1
gpio_set_level((gpio_num_t)pin, it.level1 ? 1 : 0);
- uint32_t us1 = ticks_to_us(it.duration1);
+ uint32_t us1 = it.duration1;
if (us1) esp_rom_delay_us(us1);
}
- // Reset
+ // Stop
gpio_set_level((gpio_num_t)pin, 0);
+ esp_rom_delay_us(200);
+
return true;
}