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

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_enable_otg(power, true);
 }
 
 AccessorApp::~AccessorApp() {
-    furi_hal_power_disable_otg();
+    power_enable_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);
 }
 

applications/debug/accessor/accessor_app.h

@@ -7,6 +7,7 @@
 #include <one_wire/one_wire_host.h>
 #include <notification/notification_messages.h>
 #include <expansion/expansion.h>
+#include <power/power_service/power.h>
 
 class AccessorApp {
 public:
@@ -53,4 +54,5 @@ private:
 
     NotificationApp* notification;
     Expansion* expansion;
+    Power* power;
 };

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_enable_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_enable_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. */

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);

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;

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_enabled(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) {
-            if(!furi_hal_power_is_otg_enabled()) furi_hal_power_enable_otg();
+            power_enable_otg(app->power, true);
         } else if(event.event == GpioStartEventOtgOff) {
-            if(furi_hal_power_is_otg_enabled()) furi_hal_power_disable_otg();
+            power_enable_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);

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>
@@ -492,12 +492,12 @@ void infrared_set_tx_pin(InfraredApp* infrared, FuriHalInfraredTxPin tx_pin) {
 }
 
 void infrared_enable_otg(InfraredApp* infrared, bool enable) {
-    if(enable) {
-        if(!furi_hal_power_is_otg_enabled()) furi_hal_power_enable_otg();
-    } else {
-        if(furi_hal_power_is_otg_enabled()) furi_hal_power_disable_otg();
-    }
+    Power* power = furi_record_open(RECORD_POWER);
+
+    power_enable_otg(power, enable);
     infrared->app_state.is_otg_enabled = enable;
+
+    furi_record_close(RECORD_POWER);
 }
 
 static void infrared_load_settings(InfraredApp* infrared) {

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>
 
@@ -14,13 +16,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);
-    if(!furi_hal_power_is_otg_enabled()) furi_hal_power_enable_otg();
+    power_enable_otg(power, true);
 
     while(!done) {
         if(onewire_host_search(onewire, address, OneWireHostSearchModeNormal) != 1) {
@@ -37,8 +40,10 @@ static void onewire_cli_search(Cli* cli) {
         furi_delay_ms(100);
     }
 
-    if(furi_hal_power_is_otg_enabled()) furi_hal_power_disable_otg();
+    power_enable_otg(power, false);
+
     onewire_host_free(onewire);
+    furi_record_close(RECORD_POWER);
 }
 
 void onewire_cli(Cli* cli, FuriString* args, void* context) {

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) {
-                if(!furi_hal_power_is_otg_enabled()) furi_hal_power_enable_otg();
+                Power* power = furi_record_open(RECORD_POWER);
+                power_enable_otg(power, true);
+                furi_record_close(RECORD_POWER);
             } else if(command == ExpansionFrameControlCommandDisableOtg) {
-                if(furi_hal_power_is_otg_enabled()) furi_hal_power_disable_otg();
+                Power* power = furi_record_open(RECORD_POWER);
+                power_enable_otg(power, false);
+                furi_record_close(RECORD_POWER);
             } else {
                 break;
             }

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_enable_otg(power, false);
     } else if(!furi_string_cmp(args, "1")) {
-        furi_hal_power_enable_otg();
+        power_enable_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) {

applications/services/power/power_service/power.c

@@ -247,6 +247,7 @@ static bool power_update_info(Power* power) {
         .is_charging = furi_hal_power_is_charging(),
         .gauge_is_ok = furi_hal_power_gauge_is_ok(),
         .is_shutdown_requested = furi_hal_power_is_shutdown_requested(),
+        .is_otg_enabled = furi_hal_power_is_otg_enabled(),
         .charge = furi_hal_power_get_pct(),
         .health = furi_hal_power_get_bat_health_pct(),
         .capacity_remaining = furi_hal_power_get_battery_remaining_capacity(),
@@ -539,6 +540,30 @@ static void power_message_callback(FuriEventLoopObject* object, void* context) {
         power_settings_load(&power->settings);
         power_settings_apply(power);
         break;
+    case PowerMessageTypeSwitchOTG:
+        power->is_otg_requested = *msg.bool_param;
+        if(power->is_otg_requested) {
+            // Only try to enable if VBUS voltage is low, otherwise charger will refuse
+            if(power->info.voltage_vbus < 4.5f) {
+                size_t retries = 5;
+                while(retries-- > 0) {
+                    if(furi_hal_power_enable_otg()) {
+                        break;
+                    }
+                }
+                if(!retries) {
+                    FURI_LOG_W(TAG, "Failed to enable OTG, will try later");
+                }
+            } else {
+                FURI_LOG_W(
+                    TAG,
+                    "Postponing OTG enable: VBUS(%0.1f) >= 4.5v",
+                    (double)power->info.voltage_vbus);
+            }
+        } else {
+            furi_hal_power_disable_otg();
+        }
+        break;
     default:
         furi_crash();
     }
@@ -584,9 +609,18 @@ 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 &&
+       (!power->info.is_otg_enabled && power->info.voltage_vbus < 4.5f)) {
+        FURI_LOG_D(TAG, "OTG requested but not enabled, enabling OTG");
+        furi_hal_power_enable_otg();
     }
 }
 

applications/services/power/power_service/power.h

@@ -39,6 +39,7 @@ typedef struct {
     bool gauge_is_ok;
     bool is_charging;
     bool is_shutdown_requested;
+    bool is_otg_enabled;
 
     float current_charger;
     float current_gauge;
@@ -108,6 +109,19 @@ void power_api_get_settings(Power* instance, PowerSettings* settings);
 // set settings from app to service
 void power_api_set_settings(Power* instance, const PowerSettings* settings);
 
+/** Enable or disable OTG
+ *
+ * @param power     Power instance
+ * @param enable    true - enable, false - disable
+ */
+void power_enable_otg(Power* power, bool enable);
+
+/** Check OTG status
+ * 
+ * @return          true if OTG  is requested
+ */
+bool power_is_otg_enabled(Power* power);
+
 #ifdef __cplusplus
 }
 #endif

applications/services/power/power_service/power_api.c

@@ -70,3 +70,22 @@ void power_enable_low_battery_level_notification(Power* power, bool enable) {
     furi_check(
         furi_message_queue_put(power->message_queue, &msg, FuriWaitForever) == FuriStatusOk);
 }
+
+void power_enable_otg(Power* power, bool enable) {
+    furi_check(power);
+
+    PowerMessage msg = {
+        .type = PowerMessageTypeSwitchOTG,
+        .bool_param = &enable,
+        .lock = api_lock_alloc_locked(),
+    };
+
+    furi_check(
+        furi_message_queue_put(power->message_queue, &msg, FuriWaitForever) == FuriStatusOk);
+    api_lock_wait_unlock_and_free(msg.lock);
+}
+
+bool power_is_otg_enabled(Power* power) {
+    furi_check(power);
+    return power->is_otg_requested;
+}

applications/services/power/power_service/power_i.h

@@ -34,6 +34,7 @@ struct Power {
     bool battery_low;
     bool show_battery_low_warning;
     uint8_t displayBatteryPercentage;
+    bool is_otg_requested;
     uint8_t battery_level;
     uint8_t power_off_timeout;
     PowerSettings settings;
@@ -58,6 +59,7 @@ typedef enum {
     PowerMessageTypeGetSettings,
     PowerMessageTypeSetSettings,
     PowerMessageTypeReloadSettings,
+    PowerMessageTypeSwitchOTG,
 } PowerMessageType;
 
 typedef struct {

applications/services/rpc/rpc_gpio.c

@@ -4,6 +4,7 @@
 #include <furi_hal_gpio.h>
 #include <furi_hal_power.h>
 #include <furi_hal_resources.h>
+#include <power/power_service/power.h>
 
 static const GpioPin* rpc_pin_to_hal_pin(PB_Gpio_GpioPin rpc_pin) {
     switch(rpc_pin) {
@@ -218,12 +219,16 @@ void rpc_system_gpio_set_otg_mode(const PB_Main* request, void* context) {
 
     const PB_Gpio_GpioOtgMode mode = request->content.gpio_set_otg_mode.mode;
 
+    Power* power = furi_record_open(RECORD_POWER);
+
     if(mode == PB_Gpio_GpioOtgMode_OFF) {
-        if(furi_hal_power_is_otg_enabled()) furi_hal_power_disable_otg();
+        power_enable_otg(power, false);
     } else {
-        if(!furi_hal_power_is_otg_enabled()) furi_hal_power_enable_otg();
+        power_enable_otg(power, true);
     }
 
+    furi_record_close(RECORD_POWER);
+
     rpc_send_and_release_empty(session, request->command_id, PB_CommandStatus_OK);
 }