[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:
@@ -1,15 +1,22 @@
|
||||
#include "ibutton_scene_write.h"
|
||||
#include "../ibutton_app.h"
|
||||
#include "../ibutton_view_manager.h"
|
||||
#include "../ibutton_event.h"
|
||||
#include "../ibutton_key.h"
|
||||
|
||||
static void ibutton_worker_write_cb(void* context, iButtonWorkerWriteResult result) {
|
||||
iButtonApp* app = static_cast<iButtonApp*>(context);
|
||||
iButtonEvent event;
|
||||
event.type = iButtonEvent::Type::EventTypeWorkerWrite;
|
||||
event.payload.worker_write_result = result;
|
||||
|
||||
app->get_view_manager()->send_event(&event);
|
||||
}
|
||||
|
||||
void iButtonSceneWrite::on_enter(iButtonApp* app) {
|
||||
iButtonAppViewManager* view_manager = app->get_view_manager();
|
||||
Popup* popup = view_manager->get_popup();
|
||||
iButtonKey* key = app->get_key();
|
||||
uint8_t* key_data = key->get_data();
|
||||
const char* key_name = key->get_name();
|
||||
iButtonWorker* worker = app->get_key_worker();
|
||||
const uint8_t* key_data = ibutton_key_get_data_p(key);
|
||||
const char* key_name = ibutton_key_get_name_p(key);
|
||||
uint8_t line_count = 2;
|
||||
|
||||
// check that stored key has name
|
||||
@@ -18,8 +25,8 @@ void iButtonSceneWrite::on_enter(iButtonApp* app) {
|
||||
line_count = 2;
|
||||
} else {
|
||||
// if not, show key data
|
||||
switch(key->get_key_type()) {
|
||||
case iButtonKeyType::KeyDallas:
|
||||
switch(ibutton_key_get_type(key)) {
|
||||
case iButtonKeyDS1990:
|
||||
app->set_text_store(
|
||||
"writing\n%02X %02X %02X %02X\n%02X %02X %02X %02X",
|
||||
key_data[0],
|
||||
@@ -32,11 +39,11 @@ void iButtonSceneWrite::on_enter(iButtonApp* app) {
|
||||
key_data[7]);
|
||||
line_count = 3;
|
||||
break;
|
||||
case iButtonKeyType::KeyCyfral:
|
||||
case iButtonKeyCyfral:
|
||||
app->set_text_store("writing\n%02X %02X", key_data[0], key_data[1]);
|
||||
line_count = 2;
|
||||
break;
|
||||
case iButtonKeyType::KeyMetakom:
|
||||
case iButtonKeyMetakom:
|
||||
app->set_text_store(
|
||||
"writing\n%02X %02X %02X %02X", key_data[0], key_data[1], key_data[2], key_data[3]);
|
||||
line_count = 2;
|
||||
@@ -60,27 +67,34 @@ void iButtonSceneWrite::on_enter(iButtonApp* app) {
|
||||
|
||||
view_manager->switch_to(iButtonAppViewManager::Type::iButtonAppViewPopup);
|
||||
|
||||
app->get_key_worker()->start_write();
|
||||
blink_yellow = false;
|
||||
ibutton_worker_write_set_callback(worker, ibutton_worker_write_cb, app);
|
||||
ibutton_worker_write_start(worker, key);
|
||||
}
|
||||
|
||||
bool iButtonSceneWrite::on_event(iButtonApp* app, iButtonEvent* event) {
|
||||
bool consumed = false;
|
||||
|
||||
if(event->type == iButtonEvent::Type::EventTypeTick) {
|
||||
if(event->type == iButtonEvent::Type::EventTypeWorkerWrite) {
|
||||
consumed = true;
|
||||
KeyWriter::Error result = app->get_key_worker()->write(app->get_key());
|
||||
|
||||
switch(result) {
|
||||
case KeyWriter::Error::SAME_KEY:
|
||||
case KeyWriter::Error::OK:
|
||||
switch(event->payload.worker_write_result) {
|
||||
case iButtonWorkerWriteOK:
|
||||
case iButtonWorkerWriteSameKey:
|
||||
app->switch_to_next_scene(iButtonApp::Scene::SceneWriteSuccess);
|
||||
break;
|
||||
case KeyWriter::Error::NO_DETECT:
|
||||
app->notify_red_blink();
|
||||
case iButtonWorkerWriteNoDetect:
|
||||
blink_yellow = false;
|
||||
break;
|
||||
case KeyWriter::Error::CANNOT_WRITE:
|
||||
case iButtonWorkerWriteCannotWrite:
|
||||
blink_yellow = true;
|
||||
break;
|
||||
}
|
||||
} else if(event->type == iButtonEvent::Type::EventTypeTick) {
|
||||
if(blink_yellow) {
|
||||
app->notify_yellow_blink();
|
||||
break;
|
||||
} else {
|
||||
app->notify_red_blink();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -89,10 +103,8 @@ bool iButtonSceneWrite::on_event(iButtonApp* app, iButtonEvent* event) {
|
||||
|
||||
void iButtonSceneWrite::on_exit(iButtonApp* app) {
|
||||
Popup* popup = app->get_view_manager()->get_popup();
|
||||
|
||||
ibutton_worker_stop(app->get_key_worker());
|
||||
popup_set_header(popup, NULL, 0, 0, AlignCenter, AlignBottom);
|
||||
popup_set_text(popup, NULL, 0, 0, AlignCenter, AlignTop);
|
||||
popup_set_icon(popup, 0, 0, NULL);
|
||||
|
||||
app->get_key_worker()->stop_write();
|
||||
}
|
||||
Reference in New Issue
Block a user