Merge remote-tracking branch 'OFW/dev' into dev

targets/f18/api_symbols.csv

@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,79.3,,
+Version,+,80.1,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/bt/bt_service/bt_keys_storage.h,,
 Header,+,applications/services/cli/cli.h,,

targets/f18/furi_hal/furi_hal_resources.h

@@ -2,6 +2,7 @@
 
 #include <furi.h>
 #include <furi_hal_adc.h>
+#include <furi_hal_pwm.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -40,6 +41,7 @@ typedef struct {
     const GpioPin* pin;
     const char* name;
     const FuriHalAdcChannel channel;
+    const FuriHalPwmOutputId pwm_output;
     const uint8_t number;
     const bool debug;
 } GpioPinRecord;

targets/f7/api_symbols.csv

@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,79.4,,
+Version,+,80.1,,
 Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/bt/bt_service/bt_keys_storage.h,,
@@ -2731,7 +2731,7 @@ Function,+,mf_ultralight_poller_read_page_from_sector,MfUltralightError,"MfUltra
 Function,+,mf_ultralight_poller_read_signature,MfUltralightError,"MfUltralightPoller*, MfUltralightSignature*"
 Function,+,mf_ultralight_poller_read_tearing_flag,MfUltralightError,"MfUltralightPoller*, uint8_t, MfUltralightTearingFlag*"
 Function,+,mf_ultralight_poller_read_version,MfUltralightError,"MfUltralightPoller*, MfUltralightVersion*"
-Function,+,mf_ultralight_poller_sync_read_card,MfUltralightError,"Nfc*, MfUltralightData*"
+Function,+,mf_ultralight_poller_sync_read_card,MfUltralightError,"Nfc*, MfUltralightData*, const MfUltralightPollerAuthContext*"
 Function,+,mf_ultralight_poller_sync_read_counter,MfUltralightError,"Nfc*, uint8_t, MfUltralightCounter*"
 Function,+,mf_ultralight_poller_sync_read_page,MfUltralightError,"Nfc*, uint16_t, MfUltralightPage*"
 Function,+,mf_ultralight_poller_sync_read_signature,MfUltralightError,"Nfc*, MfUltralightSignature*"

targets/f7/furi_hal/furi_hal_pwm.h

@@ -12,6 +12,7 @@ extern "C" {
 #include <stdbool.h>
 
 typedef enum {
+    FuriHalPwmOutputIdNone,
     FuriHalPwmOutputIdTim1PA7,
     FuriHalPwmOutputIdLptim2PA4,
 } FuriHalPwmOutputId;

targets/f7/furi_hal/furi_hal_resources.c

@@ -73,6 +73,7 @@ const GpioPinRecord gpio_pins[] = {
     {.pin = &gpio_ext_pa7,
      .name = "PA7",
      .channel = FuriHalAdcChannel12,
+     .pwm_output = FuriHalPwmOutputIdTim1PA7,
      .number = 2,
      .debug = false},
     {.pin = &gpio_ext_pa6,
@@ -83,6 +84,7 @@ const GpioPinRecord gpio_pins[] = {
     {.pin = &gpio_ext_pa4,
      .name = "PA4",
      .channel = FuriHalAdcChannel9,
+     .pwm_output = FuriHalPwmOutputIdLptim2PA4,
      .number = 4,
      .debug = false},
     {.pin = &gpio_ext_pb3,

targets/f7/furi_hal/furi_hal_resources.h

@@ -2,6 +2,7 @@
 
 #include <furi.h>
 #include <furi_hal_adc.h>
+#include <furi_hal_pwm.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -40,6 +41,7 @@ typedef struct {
     const GpioPin* pin;
     const char* name;
     const FuriHalAdcChannel channel;
+    const FuriHalPwmOutputId pwm_output;
     const uint8_t number;
     const bool debug;
 } GpioPinRecord;