2 lat temu · 56c42d1d30
--- a/README.md
+++ b/README.md
@@ -1,17 +1,8 @@
 
				-# magspoof_flipper by Zachary Weiss
			
 
				+# magspoof_flipper
			
 
				 WIP of MagSpoof for the Flipper Zero. Basic TX of saved files confirmed working against an MSR90 with an external H-bridge module mirroring Samy Kamkar's design. RFID coil output weaker; able to be picked up/detected by more compact mag readers such as Square, but yet to have success with it being decoded/parsed properly. Additional investigation into alternate internal TX options (CC1101, ST25R3916, piezo) underway; tentatively, RFID coil + speaker (`LF + P` config setting) results in the strongest internal TX tested to date but still weaker than a dedicated external module or an actual card swipe (and sounds like a dial-up modem from hell). Sample files with test data are included in `assets` for anyone wishing to experiment.
			
 
				 
			
 
				 Disclaimer: use responsibly, and at your own risk. While in my testing, I've seen no reason to believe this could damage the RFID (or other) hardware, this is inherently driving the coil in ways it was not designed or intended for; I take no responsibility for fried/bricked Flippers. Similarly, please only use this with magstripe cards and mag readers you own — this is solely meant as a proof of concept for educational purposes. I neither condone nor am sympathetic to malicious uses of my code.
			
 
				 
			
 
				-## Hummus's Fork
			
 
				-I made this fork initially to add reading capability using UART magnetic card readers.
			
 
				-
			
 
				-Things that changed in this fork:
			
 
				-- Added a basic card reading ability
			
 
				-- Added a function to parse a new MagDevice from a Card String (%Track1?;Track2;Track3?;)
			
 
				-- Swapped the pins between A6 to A7 on the card that I'm using, might add this to configuration scene later on
			
 
				-- Adapted some of the APIs to the most recent firmware changes.
			
 
				-
			
 
				 ## Optional GPIO TX Module
			
 
				 For those desiring better TX than the internal RFID coil can offer, one can build the module below, consisting of an H-bridge, a capacitor, and a coil.
			
 
				 
			
--- a/helpers/mag_helpers.c
+++ b/helpers/mag_helpers.c
@@ -126,8 +126,6 @@ void play_track(uint8_t* bits_manchester, uint16_t n_bits, MagSetting* setting,
 
				 void tx_init_rfid() {
			
 
				     // initialize RFID system for TX
			
 
				 
			
 
				-    // OTG needed for RFID? Or just legacy from GPIO?
			
 
				-    // furi_hal_power_enable_otg();
			
 
				     furi_hal_ibutton_pin_configure();
			
 
				 
			
 
				     // furi_hal_ibutton_start_drive();
			
@@ -155,7 +153,6 @@ void tx_deinit_rfid() {
 
				     furi_hal_gpio_write(RFID_PIN_OUT, 0);
			
 
				 
			
 
				     furi_hal_rfid_pins_reset();
			
 
				-    furi_hal_power_disable_otg();
			
 
				 }
			
 
				 
			
 
				 void tx_init_rf(int hz) {
			
@@ -189,7 +186,6 @@ bool tx_init(MagSetting* setting) {
 
				         tx_init_rfid();
			
 
				         break;
			
 
				     case MagTxStateGPIO:
			
 
				-        furi_hal_power_enable_otg();
			
 
				         // gpio_item_configure_all_pins(GpioModeOutputPushPull);
			
 
				         furi_hal_gpio_init(GPIO_PIN_A, GpioModeOutputPushPull, GpioPullNo, GpioSpeedLow);
			
 
				         furi_hal_gpio_init(GPIO_PIN_B, GpioModeOutputPushPull, GpioPullNo, GpioSpeedLow);
			
@@ -234,9 +230,12 @@ bool tx_deinit(MagSetting* setting) {
 
				         furi_hal_gpio_write(GPIO_PIN_B, 0);
			
 
				         furi_hal_gpio_write(GPIO_PIN_ENABLE, 0);
			
 
				 
			
 
				-        // set back to analog output mode?
			
 
				+        // set back to analog output mode? - YES
			
 
				+        furi_hal_gpio_init(GPIO_PIN_A, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
			
 
				+        furi_hal_gpio_init(GPIO_PIN_B, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
			
 
				+        furi_hal_gpio_init(GPIO_PIN_ENABLE, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
			
 
				+
			
 
				         //gpio_item_configure_all_pins(GpioModeAnalog);
			
 
				-        furi_hal_power_disable_otg();
			
 
				         break;
			
 
				     case MagTxStatePiezo:
			
 
				         tx_deinit_piezo();
			
--- a/mag.c
+++ b/mag.c
@@ -179,11 +179,24 @@ int32_t mag_app(void* p) {
 
				 
			
 
				     mag_make_app_folder(mag);
			
 
				 
			
 
				+    // Enable 5v power, multiple attempts to avoid issues with power chip protection false triggering
			
 
				+    uint8_t attempts = 0;
			
 
				+    bool otg_was_enabled = furi_hal_power_is_otg_enabled();
			
 
				+    while(!furi_hal_power_is_otg_enabled() && attempts++ < 5) {
			
 
				+        furi_hal_power_enable_otg();
			
 
				+        furi_delay_ms(10);
			
 
				+    }
			
 
				+
			
 
				     view_dispatcher_attach_to_gui(mag->view_dispatcher, mag->gui, ViewDispatcherTypeFullscreen);
			
 
				     scene_manager_next_scene(mag->scene_manager, MagSceneStart);
			
 
				 
			
 
				     view_dispatcher_run(mag->view_dispatcher);
			
 
				 
			
 
				+    // Disable 5v power
			
 
				+    if(furi_hal_power_is_otg_enabled() && !otg_was_enabled) {
			
 
				+        furi_hal_power_disable_otg();
			
 
				+    }
			
 
				+
			
 
				     mag_free(mag);
			
 
				 
			
 
				     return 0;
			
--- a/scenes/mag_scene_input_name.c
+++ b/scenes/mag_scene_input_name.c
@@ -1,4 +1,4 @@
 
				-#include <lib/toolbox/random_name.h>
			
 
				+#include <toolbox/name_generator.h>
			
 
				 #include "../mag_i.h"
			
 
				 
			
 
				 void mag_scene_input_name_on_enter(void* context) {
			
@@ -13,7 +13,7 @@ void mag_scene_input_name_on_enter(void* context) {
 
				 
			
 
				     if(name_is_empty) {
			
 
				         furi_string_set(mag->file_path, MAG_APP_FOLDER);
			
 
				-        set_random_name(mag->text_store, MAG_TEXT_STORE_SIZE);
			
 
				+        name_generator_make_auto(mag->text_store, MAG_TEXT_STORE_SIZE, "Mag");
			
 
				         furi_string_set(folder_path, MAG_APP_FOLDER);
			
 
				     } else {
			
 
				         // TODO: compatible types etc
			
--- a/scenes/mag_scene_read.c
+++ b/scenes/mag_scene_read.c
@@ -182,4 +182,4 @@ void mag_scene_read_on_exit(void* context) {
 
				     // furi_hal_console_enable();
			
 
				 
			
 
				     notification_message(mag->notifications, &sequence_blink_stop);
			
 
				-}
			
 
				+}
			
--- a/scenes/mag_scene_saved_menu.c
+++ b/scenes/mag_scene_saved_menu.c
@@ -17,8 +17,6 @@ void mag_scene_saved_menu_on_enter(void* context) {
 
				     Mag* mag = context;
			
 
				     Submenu* submenu = mag->submenu;
			
 
				 
			
 
				-    notification_message(mag->notifications, &sequence_blink_cyan_10);
			
 
				-
			
 
				     // messy code to quickly check which tracks are available for emulation/display
			
 
				     // there's likely a better spot to do this, but the MagDevice functions don't have access to the full mag struct...
			
 
				     bool is_empty_t1 = furi_string_empty(mag->mag_dev->dev_data.track[0].str);