Move OTG controls to the power service

Astrrra · Astrrra · commit aa6455b27c8f · 2025-02-07T19:53:44.000+09:00
diff --git a/applications/debug/accessor/accessor_app.cpp b/applications/debug/accessor/accessor_app.cpp
@@ -2,6 +2,7 @@
 #include <furi.h>
 #include <furi_hal.h>
 #include <stdarg.h>
+#include <power/power_service/power.h>
 
 void AccessorApp::run(void) {
     AccessorEvent event;
@@ -35,16 +36,18 @@ AccessorApp::AccessorApp()
     : text_store{0} {
     notification = static_cast<NotificationApp*>(furi_record_open(RECORD_NOTIFICATION));
     expansion = static_cast<Expansion*>(furi_record_open(RECORD_EXPANSION));
+    power = static_cast<Power*>(furi_record_open(RECORD_POWER));
     onewire_host = onewire_host_alloc(&gpio_ibutton);
     expansion_disable(expansion);
-    furi_hal_power_enable_otg();
+    power_switch_otg(power, true);
 }
 
 AccessorApp::~AccessorApp() {
-    furi_hal_power_disable_otg();
+    power_switch_otg(power, false);
     expansion_enable(expansion);
     furi_record_close(RECORD_EXPANSION);
     furi_record_close(RECORD_NOTIFICATION);
+    furi_record_close(RECORD_POWER);
     onewire_host_free(onewire_host);
 }
 
diff --git a/applications/debug/accessor/accessor_app.h b/applications/debug/accessor/accessor_app.h
@@ -53,4 +53,5 @@ class AccessorApp {
 
     NotificationApp* notification;
     Expansion* expansion;
+    Power* power;
 };
diff --git a/applications/examples/example_thermo/example_thermo.c b/applications/examples/example_thermo/example_thermo.c
@@ -22,7 +22,7 @@
 #include <one_wire/maxim_crc.h>
 #include <one_wire/one_wire_host.h>
 
-#include <furi_hal_power.h>
+#include <power/power_service/power.h>
 
 #define UPDATE_PERIOD_MS 1000UL
 #define TEXT_STORE_SIZE  64U
@@ -76,6 +76,7 @@ typedef struct {
     FuriThread* reader_thread;
     FuriMessageQueue* event_queue;
     OneWireHost* onewire;
+    Power* power;
     float temp_celsius;
     bool has_device;
 } ExampleThermoContext;
@@ -273,7 +274,7 @@ static void example_thermo_input_callback(InputEvent* event, void* ctx) {
 /* Starts the reader thread and handles the input */
 static void example_thermo_run(ExampleThermoContext* context) {
     /* Enable power on external pins */
-    furi_hal_power_enable_otg();
+    power_switch_otg(context->power, true);
 
     /* Configure the hardware in host mode */
     onewire_host_start(context->onewire);
@@ -309,7 +310,7 @@ static void example_thermo_run(ExampleThermoContext* context) {
     onewire_host_stop(context->onewire);
 
     /* Disable power on external pins */
-    furi_hal_power_disable_otg();
+    power_switch_otg(context->power, false);
 }
 
 /******************** Initialisation & startup *****************************/
@@ -334,6 +335,8 @@ static ExampleThermoContext* example_thermo_context_alloc(void) {
 
     context->onewire = onewire_host_alloc(&THERMO_GPIO_PIN);
 
+    context->power = furi_record_open(RECORD_POWER);
+
     return context;
 }
 
@@ -348,6 +351,7 @@ static void example_thermo_context_free(ExampleThermoContext* context) {
     view_port_free(context->view_port);
 
     furi_record_close(RECORD_GUI);
+    furi_record_close(RECORD_POWER);
 }
 
 /* The application's entry point. Execution starts from here. */
diff --git a/applications/main/gpio/gpio_app.c b/applications/main/gpio/gpio_app.c
@@ -30,6 +30,8 @@ GpioApp* gpio_app_alloc(void) {
     app->gui = furi_record_open(RECORD_GUI);
     app->gpio_items = gpio_items_alloc();
 
+    app->power = furi_record_open(RECORD_POWER);
+
     app->view_dispatcher = view_dispatcher_alloc();
     app->scene_manager = scene_manager_alloc(&gpio_scene_handlers, app);
     view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
@@ -100,6 +102,7 @@ void gpio_app_free(GpioApp* app) {
     // Close records
     furi_record_close(RECORD_GUI);
     furi_record_close(RECORD_NOTIFICATION);
+    furi_record_close(RECORD_POWER);
 
     expansion_enable(app->expansion);
     furi_record_close(RECORD_EXPANSION);
diff --git a/applications/main/gpio/gpio_app_i.h b/applications/main/gpio/gpio_app_i.h
@@ -5,6 +5,7 @@
 #include "scenes/gpio_scene.h"
 #include "gpio_custom_event.h"
 #include "usb_uart_bridge.h"
+#include <power/power_service/power.h>
 
 #include <gui/gui.h>
 #include <gui/view_dispatcher.h>
@@ -27,6 +28,7 @@ struct GpioApp {
     SceneManager* scene_manager;
     Widget* widget;
     DialogEx* dialog;
+    Power* power;
 
     VariableItemList* var_item_list;
     VariableItem* var_item_flow;
diff --git a/applications/main/gpio/scenes/gpio_scene_start.c b/applications/main/gpio/scenes/gpio_scene_start.c
@@ -60,7 +60,7 @@ void gpio_scene_start_on_enter(void* context) {
         GpioOtgSettingsNum,
         gpio_scene_start_var_list_change_callback,
         app);
-    if(furi_hal_power_is_otg_enabled()) {
+    if(power_is_otg_requested(app->power)) {
         variable_item_set_current_value_index(item, GpioOtgOn);
         variable_item_set_current_value_text(item, gpio_otg_text[GpioOtgOn]);
     } else {
@@ -80,9 +80,9 @@ bool gpio_scene_start_on_event(void* context, SceneManagerEvent event) {
 
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == GpioStartEventOtgOn) {
-            furi_hal_power_enable_otg();
+            power_switch_otg(app->power, true);
         } else if(event.event == GpioStartEventOtgOff) {
-            furi_hal_power_disable_otg();
+            power_switch_otg(app->power, false);
         } else if(event.event == GpioStartEventManualControl) {
             scene_manager_set_scene_state(app->scene_manager, GpioSceneStart, GpioItemTest);
             scene_manager_next_scene(app->scene_manager, GpioSceneTest);
diff --git a/applications/main/infrared/infrared_app.c b/applications/main/infrared/infrared_app.c
@@ -1,6 +1,6 @@
 #include "infrared_app_i.h"
 
-#include <furi_hal_power.h>
+#include <power/power_service/power.h>
 
 #include <string.h>
 #include <toolbox/path.h>
@@ -501,12 +501,16 @@ void infrared_set_tx_pin(InfraredApp* infrared, FuriHalInfraredTxPin tx_pin) {
 }
 
 void infrared_enable_otg(InfraredApp* infrared, bool enable) {
+    Power* power = furi_record_open(RECORD_POWER);
+
     if(enable) {
-        furi_hal_power_enable_otg();
+        power_switch_otg(power, true);
     } else {
-        furi_hal_power_disable_otg();
+        power_switch_otg(power, false);
     }
     infrared->app_state.is_otg_enabled = enable;
+
+    furi_record_close(RECORD_POWER);
 }
 
 static void infrared_load_settings(InfraredApp* infrared) {
diff --git a/applications/main/onewire/onewire_cli.c b/applications/main/onewire/onewire_cli.c
@@ -1,6 +1,8 @@
 #include <furi.h>
 #include <furi_hal.h>
 
+#include <power/power_service/power.h>
+
 #include <cli/cli.h>
 #include <toolbox/args.h>
 
@@ -26,13 +28,14 @@ static void onewire_cli_print_usage(void) {
 static void onewire_cli_search(Cli* cli) {
     UNUSED(cli);
     OneWireHost* onewire = onewire_host_alloc(&gpio_ibutton);
+    Power* power = furi_record_open(RECORD_POWER);
     uint8_t address[8];
     bool done = false;
 
     printf("Search started\r\n");
 
     onewire_host_start(onewire);
-    furi_hal_power_enable_otg();
+    power_switch_otg(power, true);
 
     while(!done) {
         if(onewire_host_search(onewire, address, OneWireHostSearchModeNormal) != 1) {
@@ -49,8 +52,10 @@ static void onewire_cli_search(Cli* cli) {
         furi_delay_ms(100);
     }
 
-    furi_hal_power_disable_otg();
+    power_switch_otg(power, false);
+
     onewire_host_free(onewire);
+    furi_record_close(RECORD_POWER);
 }
 
 void onewire_cli(Cli* cli, FuriString* args, void* context) {
diff --git a/applications/main/subghz/helpers/subghz_txrx.c b/applications/main/subghz/helpers/subghz_txrx.c
@@ -4,13 +4,18 @@
 #include <applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h>
 #include <lib/subghz/devices/cc1101_int/cc1101_int_interconnect.h>
 
+#include <power/power_service/power.h>
+
 #define TAG "SubGhz"
 
 static void subghz_txrx_radio_device_power_on(SubGhzTxRx* instance) {
     UNUSED(instance);
+    Power* power = furi_record_open(RECORD_POWER);
+
     uint8_t attempts = 5;
     while(--attempts > 0) {
-        if(furi_hal_power_enable_otg()) break;
+        power_switch_otg(power, true);
+        if(furi_hal_power_is_otg_enabled()) break;
     }
     if(attempts == 0) {
         if(furi_hal_power_get_usb_voltage() < 4.5f) {
@@ -20,11 +25,15 @@ static void subghz_txrx_radio_device_power_on(SubGhzTxRx* instance) {
                 furi_hal_power_check_otg_fault() ? 1 : 0);
         }
     }
+
+    furi_record_close(RECORD_POWER);
 }
 
 static void subghz_txrx_radio_device_power_off(SubGhzTxRx* instance) {
     UNUSED(instance);
-    if(furi_hal_power_is_otg_enabled()) furi_hal_power_disable_otg();
+    Power* power = furi_record_open(RECORD_POWER);
+    if(power_is_otg_requested(power)) power_switch_otg(power, false);
+    furi_record_close(RECORD_POWER);
 }
 
 SubGhzTxRx* subghz_txrx_alloc(void) {
diff --git a/applications/main/subghz/subghz_cli.c b/applications/main/subghz/subghz_cli.c
@@ -28,9 +28,12 @@
 #define TAG "SubGhzCli"
 
 static void subghz_cli_radio_device_power_on(void) {
+    Power* power = furi_record_open(RECORD_POWER);
+
     uint8_t attempts = 5;
     while(--attempts > 0) {
-        if(furi_hal_power_enable_otg()) break;
+        power_switch_otg(power, true);
+        if(furi_hal_power_is_otg_enabled()) break;
     }
     if(attempts == 0) {
         if(furi_hal_power_get_usb_voltage() < 4.5f) {
@@ -40,10 +43,14 @@ static void subghz_cli_radio_device_power_on(void) {
                 furi_hal_power_check_otg_fault() ? 1 : 0);
         }
     }
+
+    furi_record_close(RECORD_POWER);
 }
 
 static void subghz_cli_radio_device_power_off(void) {
-    if(furi_hal_power_is_otg_enabled()) furi_hal_power_disable_otg();
+    Power* power = furi_record_open(RECORD_POWER);
+    if(power_is_otg_requested(power)) power_switch_otg(power, false);
+    furi_record_close(RECORD_POWER);
 }
 
 static SubGhzEnvironment* subghz_cli_environment_init(void) {
diff --git a/applications/main/subghz/subghz_i.h b/applications/main/subghz/subghz_i.h
@@ -28,6 +28,8 @@
 
 #include "rpc/rpc_app.h"
 
+#include <power/power_service/power.h>
+
 #include "helpers/subghz_threshold_rssi.h"
 
 #include "helpers/subghz_txrx.h"
diff --git a/applications/services/expansion/expansion_worker.c b/applications/services/expansion/expansion_worker.c
@@ -1,6 +1,8 @@
 #include "expansion_worker.h"
 
+#include <power/power_service/power.h>
 #include <furi_hal_power.h>
+
 #include <furi_hal_serial.h>
 #include <furi_hal_serial_control.h>
 
@@ -250,9 +252,13 @@ static bool expansion_worker_handle_state_connected(
                 if(!expansion_worker_rpc_session_open(instance)) break;
                 instance->state = ExpansionWorkerStateRpcActive;
             } else if(command == ExpansionFrameControlCommandEnableOtg) {
-                furi_hal_power_enable_otg();
+                Power* power = furi_record_open(RECORD_POWER);
+                power_switch_otg(power, true);
+                furi_record_close(RECORD_POWER);
             } else if(command == ExpansionFrameControlCommandDisableOtg) {
-                furi_hal_power_disable_otg();
+                Power* power = furi_record_open(RECORD_POWER);
+                power_switch_otg(power, false);
+                furi_record_close(RECORD_POWER);
             } else {
                 break;
             }
diff --git a/applications/services/power/power_cli.c b/applications/services/power/power_cli.c
@@ -30,13 +30,16 @@ void power_cli_reboot2dfu(Cli* cli, FuriString* args) {
 
 void power_cli_5v(Cli* cli, FuriString* args) {
     UNUSED(cli);
+    Power* power = furi_record_open(RECORD_POWER);
     if(!furi_string_cmp(args, "0")) {
-        furi_hal_power_disable_otg();
+        power_switch_otg(power, false);
     } else if(!furi_string_cmp(args, "1")) {
-        furi_hal_power_enable_otg();
+        power_switch_otg(power, true);
     } else {
         cli_print_usage("power_otg", "<1|0>", furi_string_get_cstr(args));
     }
+
+    furi_record_close(RECORD_POWER);
 }
 
 void power_cli_3v3(Cli* cli, FuriString* args) {
diff --git a/applications/services/power/power_service/power.c b/applications/services/power/power_service/power.c
@@ -216,6 +216,14 @@ static void power_message_callback(FuriEventLoopObject* object, void* context) {
     case PowerMessageTypeShowBatteryLowWarning:
         power->show_battery_low_warning = *msg.bool_param;
         break;
+    case PowerMessageTypeSwitchOTG:
+        power->is_otg_requested = *msg.bool_param;
+        if(*msg.bool_param) {
+            furi_hal_power_enable_otg();
+        } else {
+            furi_hal_power_disable_otg();
+        }
+        break;
     default:
         furi_crash();
     }
@@ -241,9 +249,20 @@ static void power_tick_callback(void* context) {
     if(need_refresh) {
         view_port_update(power->battery_view_port);
     }
-    // Check OTG status and disable it in case of fault
-    if(furi_hal_power_is_otg_enabled()) {
-        furi_hal_power_check_otg_status();
+    // Check OTG status, disable in case of a fault
+    if(furi_hal_power_check_otg_fault()) {
+        FURI_LOG_E(TAG, "OTG fault detected, disabling OTG");
+        furi_hal_power_disable_otg();
+        power->is_otg_requested = false;
+    }
+
+    // Change OTG state if needed (i.e. after disconnecting USB power)
+    if(power->is_otg_requested && !furi_hal_power_is_otg_enabled()) {
+        FURI_LOG_D(TAG, "OTG requested but not enabled, enabling OTG");
+        furi_hal_power_enable_otg();
+    } else if(!power->is_otg_requested && furi_hal_power_is_otg_enabled()) {
+        FURI_LOG_D(TAG, "OTG not requested but enabled, disabling OTG");
+        furi_hal_power_disable_otg();
     }
 }
 
diff --git a/applications/services/power/power_service/power.h b/applications/services/power/power_service/power.h
@@ -96,6 +96,19 @@ bool power_is_battery_healthy(Power* power);
  */
 void power_enable_low_battery_level_notification(Power* power, bool enable);
 
+/** Enable or disable OTG
+ *
+ * @param power     Power instance
+ * @param enable    true - enable, false - disable
+ */
+void power_switch_otg(Power* power, bool enable);
+
+/** Check OTG status
+ * 
+ * @return          true if OTG  is requested
+ */
+bool power_is_otg_requested(Power* power);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/applications/services/power/power_service/power_api.c b/applications/services/power/power_service/power_api.c
diff --git a/applications/services/power/power_service/power_i.h b/applications/services/power/power_service/power_i.h
diff --git a/applications/services/rpc/rpc_gpio.c b/applications/services/rpc/rpc_gpio.c
diff --git a/lib/ibutton/ibutton_worker_modes.c b/lib/ibutton/ibutton_worker_modes.c
diff --git a/targets/f18/api_symbols.csv b/targets/f18/api_symbols.csv
diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,12 @@`
`28`	`28`	`#define TAG "SubGhzCli"`
`29`	`29`
`30`	`30`	`static void subghz_cli_radio_device_power_on(void) {`
	`31`	`+ Power* power = furi_record_open(RECORD_POWER);`
	`32`	`+`
`31`	`33`	`uint8_t attempts = 5;`
`32`	`34`	`while(--attempts > 0) {`
`33`		`- if(furi_hal_power_enable_otg()) break;`
	`35`	`+ power_switch_otg(power, true);`
	`36`	`+ if(furi_hal_power_is_otg_enabled()) break;`
`34`	`37`	`}`
`35`	`38`	`if(attempts == 0) {`
`36`	`39`	`if(furi_hal_power_get_usb_voltage() < 4.5f) {`
`@@ -40,10 +43,14 @@ static void subghz_cli_radio_device_power_on(void) {`
`40`	`43`	`furi_hal_power_check_otg_fault() ? 1 : 0);`
`41`	`44`	`}`
`42`	`45`	`}`
	`46`	`+`
	`47`	`+ furi_record_close(RECORD_POWER);`
`43`	`48`	`}`
`44`	`49`
`45`	`50`	`static void subghz_cli_radio_device_power_off(void) {`
`46`		`- if(furi_hal_power_is_otg_enabled()) furi_hal_power_disable_otg();`
	`51`	`+ Power* power = furi_record_open(RECORD_POWER);`
	`52`	`+ if(power_is_otg_requested(power)) power_switch_otg(power, false);`
	`53`	`+ furi_record_close(RECORD_POWER);`
`47`	`54`	`}`
`48`	`55`
`49`	`56`	`static SubGhzEnvironment* subghz_cli_environment_init(void) {`