Просмотр исходного кода

Merge commit 'refs/pull/8/head' of https://github.com/frux-c/uhf_rfid into dev

Chaka 2 лет назад
Родитель
Сommit
0e5f31a036
2 измененных файлов с 28 добавлено и 4 удалено
  1. 26 2
      README.md
  2. 2 2
      scenes/uhf_scene_save_name.c

+ 26 - 2
README.md

@@ -1,11 +1,35 @@
 # [UHF]RFID App for FlipperZero
 # [UHF]RFID App for FlipperZero
 
 
-![FlipperZero](assets/img/uhf_demo_app2.jpg)
+<div style="
+display: flex;
+flex-direction: row;
+justify-content: space-evenly;
+align-items: center;
+">
+  <img style="
+  border-radius: 10px;
+  margin: 10px;
+  width: 350px;
+  height: 350px;
+  object-fit: cover;"
+  src="assets/img/uhf_demo_app2.jpg">
+  <img style="border-radius: 10px;
+  margin: 10px;
+  width: 350px;
+  height: 350px;
+  object-fit: cover;"
+  src="assets/img/uhf_demo_app.jpg">
+</div>
 
 
 ## Overview
 ## Overview
 
 
 This repository contains a UHF RFID application developed for FlipperZero, a versatile multi-tool device. The app leverages the YRM100 module to enable UHF RFID functionality.
 This repository contains a UHF RFID application developed for FlipperZero, a versatile multi-tool device. The app leverages the YRM100 module to enable UHF RFID functionality.
 
 
+## What's Ongoing
+
+Working on the settings page to allow for changing of the module's settings.
+Adding options like settings the access password, baud rate, rf power, channel, etc.
+
 ## What's Changed
 ## What's Changed
 
 
 - A complete refractor from the concept code to covert to a framework. So that it's easy to refractor for different possible module's. See [module.h](uhf_module.h) for more info.
 - A complete refractor from the concept code to covert to a framework. So that it's easy to refractor for different possible module's. See [module.h](uhf_module.h) for more info.
@@ -73,7 +97,7 @@ As this app is still in the development stage, I welcome contributions to this p
 - [MagicRF M100&QM100_Firmware_manual_en.pdf](assets/res/MagicRF_M100&QM100_Firmware_manual_en.pdf)
 - [MagicRF M100&QM100_Firmware_manual_en.pdf](assets/res/MagicRF_M100&QM100_Firmware_manual_en.pdf)
 - [TDS_1_9_Standard.pdf](assets/res/TDS_1_9_Standard.pdf)
 - [TDS_1_9_Standard.pdf](assets/res/TDS_1_9_Standard.pdf)
 - [M5Stack Docs](https://docs.m5stack.com/en/unit/uhf_rfid)
 - [M5Stack Docs](https://docs.m5stack.com/en/unit/uhf_rfid)
-- [MagicRF Chip Datasheet](http://www.magicrf.com/product_en.htm)
+- [MagicRF Chip DS](http://www.magicrf.com/product_en.htm)
 
 
 ## Contact
 ## Contact
 
 

+ 2 - 2
scenes/uhf_scene_save_name.c

@@ -1,5 +1,5 @@
 #include "../uhf_app_i.h"
 #include "../uhf_app_i.h"
-#include <lib/toolbox/random_name.h>
+#include <lib/toolbox/name_generator.h>
 #include <gui/modules/validators.h>
 #include <gui/modules/validators.h>
 #include <toolbox/path.h>
 #include <toolbox/path.h>
 
 
@@ -14,7 +14,7 @@ void uhf_scene_save_name_on_enter(void* context) {
 
 
     // Setup view
     // Setup view
     TextInput* text_input = uhf_app->text_input;
     TextInput* text_input = uhf_app->text_input;
-    set_random_name(uhf_app->text_store, sizeof(uhf_app->text_store));
+    name_generator_make_random(uhf_app->text_store, sizeof(uhf_app->text_store));
     text_input_set_header_text(text_input, "Name the tag");
     text_input_set_header_text(text_input, "Name the tag");
     text_input_set_result_callback(
     text_input_set_result_callback(
         text_input,
         text_input,