Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/ClusterM/flipperzero-firmware.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSG <who.just.the.doctor@gmail.com>2021-05-04 16:21:16 +0300
committerGitHub <noreply@github.com>2021-05-04 16:21:16 +0300
commit46bc515c6a4e3bd7f6031e52f4b9f96a652d7d24 (patch)
treeb71aa3e9236837a7279435a79168930711e0e8cf /applications/ibutton
parentdd9bd224bebcb9b07f2b0d00fd23288f76d7ea95 (diff)
Low frequency RFID app [Read stage] (#385)
* App Lfrfid: init * HAL-resources: add external gpios * HAL-pwm: fix frequency calculation * App LFRFID: generic manchester decoder * App LFRFID: em-marine decoder * App iButton: fix dwt timing acquire * App LFRFID: rfid reader * App LFRFID: temporary read keys on read scene * App LFRFID: remove atomic bool init. * App LFRFID: add *.c to build * App LFRFID: unstable HID decoder * App LFRFID: HID-26 reading * HAL OS: disable sleep * App LFRFID: HID-26 reader: remove debug * App LFRFID: static data decoder-analyzer * App LFRFID: very raw Indala decoder * App LFRFID: multiprotocol reader * App LFRFID: more reliable HID decoder * App LFRFID: syntax fix * App LFRFID: simple read scene * Gui: force redraw on screen stream connect * HAL-OS: allow sleep * App LFRFID: notify api, tune view, tune scene * App LFRFID: simple rfid emulator * App LFRFID: more scenes, more reliable EM decoder. * App LFRFID: format fix * App LFRFID: warning fix * Api-hal-resources: add rfid pins, rename external pins * App LFRFID: remove unused emulator * App LFRFID: use new gpio hal api * App accessor: use new ext gpio name * App LFRFID: remove unused emulator * App LFRFID: remove debug gpio * Api-hal-resources: alternate functions init * Api-hal-rfid: new api * Api-hal-ibutton: new api * Api-hal: new headers * App LFRFID: use new api in reader subroutines * App LFRFID: use new api in emulator subroutines * App LFRFID: remove old app * App LFRFID, App iButton: fix memleak * Api-hal-rfid: comments * App LFRFID: pulse joiner helper, it combines pulses of different polarity into one pulse suitable for a timer * App LFRFID: pulse joiner, now can accept only ne pulse * App LFRFID: pulse joiner, fixes * App LFRFID: EM encoder and emulation * App LFRFID: format fixes * App LFRFID: emmarine encoder cleanup * App LFRFID: HID Encoder blank * App LFRFID: Indala Encoder blank
Diffstat (limited to 'applications/ibutton')
-rw-r--r--applications/ibutton/helpers/key-reader.cpp7
-rw-r--r--applications/ibutton/ibutton-app.cpp6
-rw-r--r--applications/ibutton/scene/ibutton-scene-generic.h1
3 files changed, 10 insertions, 4 deletions
diff --git a/applications/ibutton/helpers/key-reader.cpp b/applications/ibutton/helpers/key-reader.cpp
index a22cbb5a..8955c647 100644
--- a/applications/ibutton/helpers/key-reader.cpp
+++ b/applications/ibutton/helpers/key-reader.cpp
@@ -140,11 +140,10 @@ void KeyReader::comparator_trigger_callback(void* hcomp, void* comp_ctx) {
KeyReader* _this = static_cast<KeyReader*>(comp_ctx);
if(hcomp == &hcomp1) {
- _this->cyfral_decoder.process_front(
- hal_gpio_get_rfid_in_level(), DWT->CYCCNT - last_dwt_value);
+ uint32_t current_dwt_value = DWT->CYCCNT;
- _this->metakom_decoder.process_front(
- hal_gpio_get_rfid_in_level(), DWT->CYCCNT - last_dwt_value);
+ _this->cyfral_decoder.process_front(hal_gpio_get_rfid_in_level(), current_dwt_value);
+ _this->metakom_decoder.process_front(hal_gpio_get_rfid_in_level(), current_dwt_value);
last_dwt_value = DWT->CYCCNT;
}
diff --git a/applications/ibutton/ibutton-app.cpp b/applications/ibutton/ibutton-app.cpp
index 50a52197..ab90c168 100644
--- a/applications/ibutton/ibutton-app.cpp
+++ b/applications/ibutton/ibutton-app.cpp
@@ -197,6 +197,12 @@ iButtonApp::~iButtonApp() {
cli_delete_command(cli, "tm");
furi_record_close("cli");
osMessageQueueDelete(cli_event_result);
+
+ for(std::map<Scene, iButtonScene*>::iterator it = scenes.begin(); it != scenes.end(); ++it) {
+ delete it->second;
+ scenes.erase(it);
+ }
+
api_hal_power_insomnia_exit();
}
diff --git a/applications/ibutton/scene/ibutton-scene-generic.h b/applications/ibutton/scene/ibutton-scene-generic.h
index 07a23ff2..1c321142 100644
--- a/applications/ibutton/scene/ibutton-scene-generic.h
+++ b/applications/ibutton/scene/ibutton-scene-generic.h
@@ -8,6 +8,7 @@ public:
virtual void on_enter(iButtonApp* app) = 0;
virtual bool on_event(iButtonApp* app, iButtonEvent* event) = 0;
virtual void on_exit(iButtonApp* app) = 0;
+ virtual ~iButtonScene(){};
private:
};