[FL-2393][FL-2381] iButton, OneWire: move to plain C (#1068)
* iButton: getting started on the worker concept * Hal delay: added global instructions_per_us variable * iButton: one wire slave * iButton: ibutton key setter * iButton: one wire host, use ibutton_hal * iButton\RFID: common pulse decoder concept * iButton: cyfral decoder * iButton: worker thread concept * iButton: metakom decoder * iButton: write key through worker * iButton: worker mode holder * iButton: worker improvements * iButton: Cyfral encoder * iButton: Metakom encoder * lib: pulse protocol helpers * iButton: Metakom decoder * iButton: Cyfral decoder * iButton worker: separate modes * iButton: libs documentation * HAL: iButton gpio modes * iButton worker: rename modes file * iButton worker, hal: move to LL * iButton CLI: worker for reading and emulation commands * iButton HAL: correct init and emulation sequence * iButton cli: moved to plain C * iButton: move to worker, small step to plain C * Libs, one wire: move to plain C * Libs: added forgotten files to compilation * iButton writer: get rid of manual disable/enable irq
This commit is contained in:
@@ -9,7 +9,7 @@ void AccessorApp::run(void) {
|
||||
bool exit = false;
|
||||
|
||||
wiegand.begin();
|
||||
onewire_master.start();
|
||||
onewire_host_start(onewire_host);
|
||||
|
||||
scenes[current_scene]->on_enter(this);
|
||||
|
||||
@@ -28,19 +28,20 @@ void AccessorApp::run(void) {
|
||||
scenes[current_scene]->on_exit(this);
|
||||
|
||||
wiegand.end();
|
||||
onewire_master.stop();
|
||||
onewire_host_stop(onewire_host);
|
||||
}
|
||||
|
||||
AccessorApp::AccessorApp()
|
||||
: onewire_master{&ibutton_gpio} {
|
||||
AccessorApp::AccessorApp() {
|
||||
furi_hal_power_insomnia_enter();
|
||||
notification = static_cast<NotificationApp*>(furi_record_open("notification"));
|
||||
onewire_host = onewire_host_alloc();
|
||||
furi_hal_power_enable_otg();
|
||||
}
|
||||
|
||||
AccessorApp::~AccessorApp() {
|
||||
furi_hal_power_disable_otg();
|
||||
furi_record_close("notification");
|
||||
onewire_host_free(onewire_host);
|
||||
furi_hal_power_insomnia_exit();
|
||||
}
|
||||
|
||||
@@ -136,6 +137,6 @@ WIEGAND* AccessorApp::get_wiegand() {
|
||||
return &wiegand;
|
||||
}
|
||||
|
||||
OneWireMaster* AccessorApp::get_one_wire() {
|
||||
return &onewire_master;
|
||||
OneWireHost* AccessorApp::get_one_wire() {
|
||||
return onewire_host;
|
||||
}
|
@@ -2,13 +2,9 @@
|
||||
#include <map>
|
||||
#include <list>
|
||||
#include "accessor_view_manager.h"
|
||||
|
||||
#include "scene/accessor_scene_start.h"
|
||||
|
||||
#include "helpers/wiegand.h"
|
||||
|
||||
#include <one_wire_master.h>
|
||||
|
||||
#include <one_wire/one_wire_host.h>
|
||||
#include <notification/notification_messages.h>
|
||||
|
||||
class AccessorApp {
|
||||
@@ -37,7 +33,7 @@ public:
|
||||
void set_text_store(const char* text...);
|
||||
|
||||
WIEGAND* get_wiegand();
|
||||
OneWireMaster* get_one_wire();
|
||||
OneWireHost* get_one_wire();
|
||||
|
||||
private:
|
||||
std::list<Scene> previous_scenes_list = {Scene::Exit};
|
||||
@@ -52,7 +48,7 @@ private:
|
||||
char text_store[text_store_size + 1];
|
||||
|
||||
WIEGAND wiegand;
|
||||
OneWireMaster onewire_master;
|
||||
OneWireHost* onewire_host;
|
||||
|
||||
NotificationApp* notification;
|
||||
};
|
@@ -21,7 +21,7 @@ bool AccessorSceneStart::on_event(AccessorApp* app, AccessorEvent* event) {
|
||||
if(event->type == AccessorEvent::Type::Tick) {
|
||||
WIEGAND* wiegand = app->get_wiegand();
|
||||
Popup* popup = app->get_view_manager()->get_popup();
|
||||
OneWireMaster* onewire = app->get_one_wire();
|
||||
OneWireHost* onewire_host = app->get_one_wire();
|
||||
|
||||
uint8_t data[8] = {0, 0, 0, 0, 0, 0, 0, 0};
|
||||
uint8_t type = 0;
|
||||
@@ -38,11 +38,11 @@ bool AccessorSceneStart::on_event(AccessorApp* app, AccessorEvent* event) {
|
||||
}
|
||||
} else {
|
||||
FURI_CRITICAL_ENTER();
|
||||
if(onewire->reset()) {
|
||||
if(onewire_host_reset(onewire_host)) {
|
||||
type = 255;
|
||||
onewire->write(0x33);
|
||||
onewire_host_write(onewire_host, 0x33);
|
||||
for(uint8_t i = 0; i < 8; i++) {
|
||||
data[i] = onewire->read();
|
||||
data[i] = onewire_host_read(onewire_host);
|
||||
}
|
||||
|
||||
for(uint8_t i = 0; i < 7; i++) {
|
||||
|
Reference in New Issue
Block a user