Merge branch 'ofw-dev' into dev

applications/examples/example_thermo/README.md

@@ -18,7 +18,7 @@ Before launching the application, connect the sensor to Flipper's external GPIO
 In order to launch this demo, follow the steps below:
 1. Make sure your Flipper has an SD card installed.
 2. Connect your Flipper to the computer via a USB cable.
-3. Run `./fbt launch_app APPSRC=example_thermo` in your terminal emulator of choice.
+3. Run `./fbt launch APPSRC=example_thermo` in your terminal emulator of choice.
 
 ## Changing the data pin
 It is possible to use other GPIO pin as a 1-Wire data pin. In order to change it, set the `THERMO_GPIO_PIN` macro to any of the options listed below:

applications/services/power/power_service/power.c

@@ -300,6 +300,7 @@ static bool power_update_info(Power* power) {
 
     info.is_charging = furi_hal_power_is_charging();
     info.gauge_is_ok = furi_hal_power_gauge_is_ok();
+    info.is_shutdown_requested = furi_hal_power_is_shutdown_requested();
     info.charge = furi_hal_power_get_pct();
     info.health = furi_hal_power_get_bat_health_pct();
     info.capacity_remaining = furi_hal_power_get_battery_remaining_capacity();
@@ -328,7 +329,7 @@ static void power_check_low_battery(Power* power) {
     }
 
     // Check battery charge and vbus voltage
-    if((power->info.charge == 0) && (power->info.voltage_vbus < 4.0f) &&
+    if((power->info.is_shutdown_requested) && (power->info.voltage_vbus < 4.0f) &&
        power->show_low_bat_level_message) {
         if(!power->battery_low) {
             view_dispatcher_send_to_front(power->view_dispatcher);

applications/services/power/power_service/power.h

@@ -37,6 +37,7 @@ typedef struct {
 typedef struct {
     bool gauge_is_ok;
     bool is_charging;
+    bool is_shutdown_requested;
 
     float current_charger;
     float current_gauge;

applications/settings/power_settings_app/views/battery_info.c

@@ -54,8 +54,7 @@ static void draw_battery(Canvas* canvas, BatteryInfoModel* data, int x, int y) {
             (uint32_t)(data->vbus_voltage * 10) % 10,
             current);
     } else if(current < -5) {
-        // Often gauge reports anything in the range 1~5ma as 5ma
-        // That brings confusion, so we'll treat it as Napping
+        // 0-5ma deadband
         snprintf(
             emote,
             sizeof(emote),