diff --git a/.ci_files/anims_ofw.txt b/.ci_files/anims_ofw.txt index a6c7ca694..7f03d6595 100644 --- a/.ci_files/anims_ofw.txt +++ b/.ci_files/anims_ofw.txt @@ -36,19 +36,12 @@ Min level: 1 Max level: 1 Weight: 3 -Name: L2_Furippa2_128x64 +Name: L2_Wake_up_128x64 Min butthurt: 0 -Max butthurt: 6 +Max butthurt: 12 Min level: 2 -Max level: 2 -Weight: 3 - -Name: L3_Furippa3_128x64 -Min butthurt: 0 -Max butthurt: 6 -Min level: 3 Max level: 3 -Weight: 3 +Weight: 4 Name: L1_Read_books_128x64 Min butthurt: 0 @@ -57,13 +50,6 @@ Min level: 1 Max level: 1 Weight: 3 -Name: L2_Hacking_pc_128x64 -Min butthurt: 0 -Max butthurt: 8 -Min level: 2 -Max level: 2 -Weight: 3 - Name: L1_Cry_128x64 Min butthurt: 8 Max butthurt: 13 @@ -90,14 +76,49 @@ Min butthurt: 0 Max butthurt: 9 Min level: 1 Max level: 3 -Weight: 5 +Weight: 4 Name: L1_Painting_128x64 Min butthurt: 0 Max butthurt: 7 Min level: 1 Max level: 3 -Weight: 4 +Weight: 3 + +Name: L1_Leaving_sad_128x64 +Min butthurt: 14 +Max butthurt: 14 +Min level: 1 +Max level: 3 +Weight: 3 + +Name: L2_Furippa2_128x64 +Min butthurt: 0 +Max butthurt: 6 +Min level: 2 +Max level: 2 +Weight: 3 + +Name: L2_Hacking_pc_128x64 +Min butthurt: 0 +Max butthurt: 8 +Min level: 2 +Max level: 2 +Weight: 3 + +Name: L2_Soldering_128x64 +Min butthurt: 0 +Max butthurt: 10 +Min level: 2 +Max level: 2 +Weight: 3 + +Name: L3_Furippa3_128x64 +Min butthurt: 0 +Max butthurt: 6 +Min level: 3 +Max level: 3 +Weight: 3 Name: L3_Hijack_radio_128x64 Min butthurt: 0 @@ -112,17 +133,3 @@ Max butthurt: 10 Min level: 3 Max level: 3 Weight: 3 - -Name: L2_Soldering_128x64 -Min butthurt: 0 -Max butthurt: 10 -Min level: 2 -Max level: 2 -Weight: 3 - -Name: L1_Leaving_sad_128x64 -Min butthurt: 14 -Max butthurt: 14 -Min level: 1 -Max level: 3 -Weight: 3 diff --git a/applications/plugins/usbkeyboard/LICENSE.md b/applications/plugins/usbkeyboard/LICENSE.md new file mode 100644 index 000000000..53475eb61 --- /dev/null +++ b/applications/plugins/usbkeyboard/LICENSE.md @@ -0,0 +1,24 @@ +BSD 2-Clause License + +Copyright (c) 2022, Gabriel Cirlig + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/applications/services/power/power_service/power.c b/applications/services/power/power_service/power.c index ee47e14dc..8b1c36423 100644 --- a/applications/services/power/power_service/power.c +++ b/applications/services/power/power_service/power.c @@ -63,6 +63,22 @@ void power_draw_battery_callback(Canvas* canvas, void* context) { canvas_draw_box(canvas, 2, 2, (power->info.charge + 4) / 5, 4); } + // TODO: Verify if it displays correctly with custom battery skins !!! + if(power->info.voltage_battery_charging < 4.2) { + // Battery charging voltage is modified, indicate with cross pattern + canvas_invert_color(canvas); + uint8_t battery_bar_width = (power->info.charge + 4) / 5; + bool cross_odd = false; + // Start 1 further in from the battery bar's x position + for(uint8_t x = 3; x <= battery_bar_width; x++) { + // Cross pattern is from the center of the battery bar + // y = 2 + 1 (inset) + 1 (for every other) + canvas_draw_dot(canvas, x, 3 + (uint8_t)cross_odd); + cross_odd = !cross_odd; + } + canvas_invert_color(canvas); + } + if(power->state == PowerStateCharging) { canvas_set_bitmap_mode(canvas, 1); // TODO: replace -1 magic for uint8_t with re-framing diff --git a/assets/dolphin/external/manifest.txt b/assets/dolphin/external/manifest.txt index 6f2b1e3ed..b970cb263 100644 --- a/assets/dolphin/external/manifest.txt +++ b/assets/dolphin/external/manifest.txt @@ -106,34 +106,6 @@ Min level: 2 Max level: 2 Weight: 3 -Name: L1_New_year_128x64 -Min butthurt: 0 -Max butthurt: 10 -Min level: 1 -Max level: 3 -Weight: 7 - -Name: L3_Fireplace_128x64 -Min butthurt: 0 -Max butthurt: 13 -Min level: 2 -Max level: 3 -Weight: 3 - -Name: L2_FlipperCity_128x64 -Min butthurt: 0 -Max butthurt: 13 -Min level: 2 -Max level: 3 -Weight: 3 - -Name: L3_FlipperMustache_128x64 -Min butthurt: 0 -Max butthurt: 10 -Min level: 3 -Max level: 3 -Weight: 2 - Name: L2_Soldering_128x64 Min butthurt: 0 Max butthurt: 10 @@ -161,3 +133,31 @@ Max butthurt: 10 Min level: 3 Max level: 3 Weight: 3 + +Name: L1_New_year_128x64 +Min butthurt: 0 +Max butthurt: 10 +Min level: 1 +Max level: 3 +Weight: 7 + +Name: L3_Fireplace_128x64 +Min butthurt: 0 +Max butthurt: 13 +Min level: 2 +Max level: 3 +Weight: 3 + +Name: L2_FlipperCity_128x64 +Min butthurt: 0 +Max butthurt: 13 +Min level: 2 +Max level: 3 +Weight: 3 + +Name: L3_FlipperMustache_128x64 +Min butthurt: 0 +Max butthurt: 10 +Min level: 3 +Max level: 3 +Weight: 2