Temp fix of broken ibutton emulation

Reverted lib changes and added old api

TODO: Find what causes that issue, issue also present in official dev branch

firmware/targets/f7/furi_hal/furi_hal_ibutton.c

@@ -89,6 +89,51 @@ void furi_hal_ibutton_emulate_stop() {
     }
 }
 
+void furi_hal_ibutton_start_drive() {
+    furi_hal_ibutton_pin_high();
+    furi_hal_gpio_init(&ibutton_gpio, GpioModeOutputOpenDrain, GpioPullNo, GpioSpeedLow);
+}
+
+void furi_hal_ibutton_start_drive_in_isr() {
+    furi_hal_gpio_init(&ibutton_gpio, GpioModeOutputOpenDrain, GpioPullNo, GpioSpeedLow);
+    LL_EXTI_ClearFlag_0_31(ibutton_gpio.pin);
+}
+
+void furi_hal_ibutton_start_interrupt() {
+    furi_hal_ibutton_pin_high();
+    furi_hal_gpio_init(&ibutton_gpio, GpioModeInterruptRiseFall, GpioPullNo, GpioSpeedLow);
+}
+
+void furi_hal_ibutton_start_interrupt_in_isr() {
+    furi_hal_gpio_init(&ibutton_gpio, GpioModeInterruptRiseFall, GpioPullNo, GpioSpeedLow);
+    LL_EXTI_ClearFlag_0_31(ibutton_gpio.pin);
+}
+
+void furi_hal_ibutton_stop() {
+    furi_hal_ibutton_pin_high();
+    furi_hal_gpio_init(&ibutton_gpio, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
+}
+
+void furi_hal_ibutton_add_interrupt(GpioExtiCallback cb, void* context) {
+    furi_hal_gpio_add_int_callback(&ibutton_gpio, cb, context);
+}
+
+void furi_hal_ibutton_remove_interrupt() {
+    furi_hal_gpio_remove_int_callback(&ibutton_gpio);
+}
+
+void furi_hal_ibutton_pin_low() {
+    furi_hal_gpio_write(&ibutton_gpio, false);
+}
+
+void furi_hal_ibutton_pin_high() {
+    furi_hal_gpio_write(&ibutton_gpio, true);
+}
+
+bool furi_hal_ibutton_pin_get_level() {
+    return furi_hal_gpio_read(&ibutton_gpio);
+}
+
 void furi_hal_ibutton_pin_configure() {
     furi_hal_gpio_write(&ibutton_gpio, true);
     furi_hal_gpio_init(&ibutton_gpio, GpioModeOutputOpenDrain, GpioPullNo, GpioSpeedLow);
@@ -101,4 +146,4 @@ void furi_hal_ibutton_pin_reset() {
 
 void furi_hal_ibutton_pin_write(const bool state) {
     furi_hal_gpio_write(&ibutton_gpio, state);
-}
+}

firmware/targets/f7/furi_hal/furi_hal_ibutton.h

@@ -7,6 +7,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include <furi_hal_gpio.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -17,28 +18,71 @@ typedef void (*FuriHalIbuttonEmulateCallback)(void* context);
 /** Initialize */
 void furi_hal_ibutton_init();
 
-/**
- * Start emulation timer
- * @param period timer period
- * @param callback timer callback
- * @param context callback context
- */
 void furi_hal_ibutton_emulate_start(
     uint32_t period,
     FuriHalIbuttonEmulateCallback callback,
     void* context);
 
-/**
- * Update emulation timer period
- * @param period new timer period
- */
 void furi_hal_ibutton_emulate_set_next(uint32_t period);
 
-/**
- * Stop emulation timer
- */
 void furi_hal_ibutton_emulate_stop();
 
+/**
+ * Sets the pin to normal mode (open collector), and sets it to float
+ */
+void furi_hal_ibutton_start_drive();
+
+/**
+ * Sets the pin to normal mode (open collector), and clears pin EXTI interrupt.
+ * Used in EXTI interrupt context.
+ */
+void furi_hal_ibutton_start_drive_in_isr();
+
+/**
+ * Sets the pin to interrupt mode (EXTI interrupt on rise or fall), and sets it to float
+ */
+void furi_hal_ibutton_start_interrupt();
+
+/**
+ * Sets the pin to interrupt mode (EXTI interrupt on rise or fall), and clears pin EXTI interrupt.
+ * Used in EXTI interrupt context.
+ */
+void furi_hal_ibutton_start_interrupt_in_isr();
+
+/**
+ * Sets the pin to analog mode, and sets it to float
+ */
+void furi_hal_ibutton_stop();
+
+/**
+ * Attach interrupt callback to iButton pin
+ * @param cb callback
+ * @param context context
+ */
+void furi_hal_ibutton_add_interrupt(GpioExtiCallback cb, void* context);
+
+/**
+ * Remove interrupt callback from iButton pin
+ */
+void furi_hal_ibutton_remove_interrupt();
+
+/**
+ * Sets the pin to low
+ */
+void furi_hal_ibutton_pin_low();
+
+/**
+ * Sets the pin to high (float in iButton pin modes)
+ */
+void furi_hal_ibutton_pin_high();
+
+/**
+ * Get pin level
+ * @return true if level is high
+ * @return false if level is low
+ */
+bool furi_hal_ibutton_pin_get_level();
+
 /**
  * Set the pin to normal mode (open collector), and sets it to float
  */

firmware/targets/f7/furi_hal/furi_hal_rfid.c

@@ -77,7 +77,7 @@ void furi_hal_rfid_init() {
 
 void furi_hal_rfid_pins_reset() {
     // ibutton bus disable
-    furi_hal_ibutton_pin_reset();
+    furi_hal_ibutton_stop();
 
     // pulldown rfid antenna
     furi_hal_gpio_init(&gpio_rfid_carrier_out, GpioModeOutputPushPull, GpioPullNo, GpioSpeedLow);
@@ -94,8 +94,8 @@ void furi_hal_rfid_pins_reset() {
 
 void furi_hal_rfid_pins_emulate() {
     // ibutton low
-    furi_hal_ibutton_pin_configure();
-    furi_hal_ibutton_pin_write(false);
+    furi_hal_ibutton_start_drive();
+    furi_hal_ibutton_pin_low();
 
     // pull pin to timer out
     furi_hal_gpio_init_ex(
@@ -115,8 +115,8 @@ void furi_hal_rfid_pins_emulate() {
 
 void furi_hal_rfid_pins_read() {
     // ibutton low
-    furi_hal_ibutton_pin_configure();
-    furi_hal_ibutton_pin_write(false);
+    furi_hal_ibutton_start_drive();
+    furi_hal_ibutton_pin_low();
 
     // dont pull rfid antenna
     furi_hal_gpio_init(&gpio_nfc_irq_rfid_pull, GpioModeOutputPushPull, GpioPullNo, GpioSpeedLow);