|
@@ -33,15 +33,15 @@ struct Nfc {
|
|
|
FuriRecordSubscriber* gui_record;
|
|
FuriRecordSubscriber* gui_record;
|
|
|
FuriRecordSubscriber* menu_record;
|
|
FuriRecordSubscriber* menu_record;
|
|
|
rfalNfcDiscoverParam* disParams;
|
|
rfalNfcDiscoverParam* disParams;
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
osThreadAttr_t worker_attr;
|
|
osThreadAttr_t worker_attr;
|
|
|
osThreadId_t worker;
|
|
osThreadId_t worker;
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
uint8_t screen;
|
|
uint8_t screen;
|
|
|
uint8_t ret;
|
|
uint8_t ret;
|
|
|
uint8_t devCnt;
|
|
uint8_t devCnt;
|
|
|
uint8_t ticker;
|
|
uint8_t ticker;
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
char* current;
|
|
char* current;
|
|
|
};
|
|
};
|
|
|
|
|
|
|
@@ -147,7 +147,7 @@ void nfc_draw_callback(CanvasApi* canvas, void* context) {
|
|
|
canvas->set_color(canvas, ColorBlack);
|
|
canvas->set_color(canvas, ColorBlack);
|
|
|
canvas->set_font(canvas, FontPrimary);
|
|
canvas->set_font(canvas, FontPrimary);
|
|
|
|
|
|
|
|
- if (nfc->screen == 0) {
|
|
|
|
|
|
|
+ if(nfc->screen == 0) {
|
|
|
char status[128 / 8];
|
|
char status[128 / 8];
|
|
|
if(nfc->ret == ERR_WRONG_STATE)
|
|
if(nfc->ret == ERR_WRONG_STATE)
|
|
|
canvas->draw_str(canvas, 2, 16, "NFC Wrong State");
|
|
canvas->draw_str(canvas, 2, 16, "NFC Wrong State");
|
|
@@ -170,7 +170,6 @@ void nfc_draw_callback(CanvasApi* canvas, void* context) {
|
|
|
canvas->draw_str(canvas, 2, 16, "Not implemented");
|
|
canvas->draw_str(canvas, 2, 16, "Not implemented");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
dispatcher_unlock(nfc->dispatcher);
|
|
dispatcher_unlock(nfc->dispatcher);
|
|
|
}
|
|
}
|
|
|
|
|
|