Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-13 15:18:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

Magspoof gpio and power fixes by @xMasterX

Browse Source
This commit is contained in:
Willy-JL
2023-08-04 21:13:54 +02:00
parent 939b572f04
commit bf1d08f782
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
applications/external/magspoof/helpers/mag_helpers.c vendored
View File

@@ -126,8 +126,6 @@ void play_track(uint8_t* bits_manchester, uint16_t n_bits, MagSetting* setting,
void tx_init_rfid() { void tx_init_rfid() {
// initialize RFID system for TX // 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_pin_configure();
// furi_hal_ibutton_start_drive(); // furi_hal_ibutton_start_drive();
@@ -155,7 +153,6 @@ void tx_deinit_rfid() {
furi_hal_gpio_write(RFID_PIN_OUT, 0); furi_hal_gpio_write(RFID_PIN_OUT, 0);
furi_hal_rfid_pins_reset(); furi_hal_rfid_pins_reset();
furi_hal_power_disable_otg();
} }
void tx_init_rf(int hz) { void tx_init_rf(int hz) {
@@ -189,7 +186,6 @@ bool tx_init(MagSetting* setting) {
tx_init_rfid(); tx_init_rfid();
break; break;
case MagTxStateGPIO: case MagTxStateGPIO:
furi_hal_power_enable_otg();
// gpio_item_configure_all_pins(GpioModeOutputPushPull); // gpio_item_configure_all_pins(GpioModeOutputPushPull);
furi_hal_gpio_init(GPIO_PIN_A, GpioModeOutputPushPull, GpioPullNo, GpioSpeedLow); furi_hal_gpio_init(GPIO_PIN_A, GpioModeOutputPushPull, GpioPullNo, GpioSpeedLow);
furi_hal_gpio_init(GPIO_PIN_B, 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_B, 0);
furi_hal_gpio_write(GPIO_PIN_ENABLE, 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); //gpio_item_configure_all_pins(GpioModeAnalog);
furi_hal_power_disable_otg();
break; break;
case MagTxStatePiezo: case MagTxStatePiezo:
tx_deinit_piezo(); tx_deinit_piezo();

2
applications/external/magspoof/scenes/mag_scene_saved_menu.c vendored
View File

@@ -17,8 +17,6 @@ void mag_scene_saved_menu_on_enter(void* context) {
Mag* mag = context; Mag* mag = context;
Submenu* submenu = mag->submenu; Submenu* submenu = mag->submenu;
notification_message(mag->notifications, &sequence_blink_cyan_10);
// messy code to quickly check which tracks are available for emulation/display // 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... // 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); bool is_empty_t1 = furi_string_empty(mag->mag_dev->dev_data.track[0].str);