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

lib/app-scened-template/generic_scene.hpp

@@ -4,7 +4,7 @@ public:
     virtual void on_enter(TApp* app, bool need_restore) = 0;
     virtual bool on_event(TApp* app, typename TApp::Event* event) = 0;
     virtual void on_exit(TApp* app) = 0;
-    virtual ~GenericScene(){};
+    virtual ~GenericScene() {};
 
 private:
 };

lib/app-scened-template/scene_controller.hpp

@@ -175,7 +175,8 @@ public:
     bool switch_to_previous_scene(uint8_t count = 1) {
         auto previous_scene_index = TApp::SceneType::Start;
 
-        for(uint8_t i = 0; i < count; i++) previous_scene_index = get_previous_scene_index();
+        for(uint8_t i = 0; i < count; i++)
+            previous_scene_index = get_previous_scene_index();
 
         if(previous_scene_index == TApp::SceneType::Exit) return true;
 
@@ -198,7 +199,8 @@ public:
      * 
      */
     ~SceneController() {
-        for(auto& it : scenes) delete it.second;
+        for(auto& it : scenes)
+            delete it.second;
     }
 
 private:

lib/app-scened-template/view_modules/generic_view_module.h

@@ -3,8 +3,8 @@
 
 class GenericViewModule {
 public:
-    GenericViewModule(){};
-    virtual ~GenericViewModule(){};
+    GenericViewModule() {};
+    virtual ~GenericViewModule() {};
     virtual View* get_view() = 0;
     virtual void clean() = 0;
 };

lib/bit_lib/bit_lib.h

@@ -7,7 +7,7 @@
 extern "C" {
 #endif
 
-#define TOPBIT(X) (1 << ((X)-1))
+#define TOPBIT(X) (1 << ((X) - 1))
 
 typedef enum {
     BitLibParityEven,

lib/lfrfid/protocols/protocol_pac_stanley.c

@@ -137,7 +137,8 @@ bool protocol_pac_stanley_encoder_start(ProtocolPACStanley* protocol) {
     uint8_to_hex_chars(protocol->data, &idbytes[2], 8);
 
     // insert start and stop bits
-    for(size_t i = 0; i < 16; i++) protocol->encoded_data[i] = 0x40 >> ((i + 3) % 5 * 2);
+    for(size_t i = 0; i < 16; i++)
+        protocol->encoded_data[i] = 0x40 >> ((i + 3) % 5 * 2);
 
     protocol->encoded_data[0] = 0xFF; // mark + stop
     protocol->encoded_data[1] = 0x20; // start + reflect8(STX)

lib/lfrfid/protocols/protocol_pyramid.c

@@ -126,7 +126,8 @@ bool protocol_pyramid_decoder_feed(ProtocolPyramid* protocol, bool level, uint32
 
 bool protocol_pyramid_get_parity(const uint8_t* bits, uint8_t type, int length) {
     int x;
-    for(x = 0; length > 0; --length) x += bit_lib_get_bit(bits, length - 1);
+    for(x = 0; length > 0; --length)
+        x += bit_lib_get_bit(bits, length - 1);
     x %= 2;
     return x ^ type;
 }

lib/nfc/helpers/crypto1.c

@@ -84,7 +84,8 @@ uint32_t crypto1_word(Crypto1* crypto1, uint32_t in, int is_encrypted) {
 
 uint32_t prng_successor(uint32_t x, uint32_t n) {
     SWAPENDIAN(x);
-    while(n--) x = x >> 1 | (x >> 16 ^ x >> 18 ^ x >> 19 ^ x >> 21) << 31;
+    while(n--)
+        x = x >> 1 | (x >> 16 ^ x >> 18 ^ x >> 19 ^ x >> 21) << 31;
 
     return SWAPENDIAN(x);
 }

lib/nfc/nfc_poller.c

@@ -190,7 +190,8 @@ void nfc_poller_start_ex(NfcPoller* instance, NfcGenericCallbackEx callback, voi
     NfcProtocol parent_protocol = nfc_protocol_get_parent(instance->protocol);
     if(parent_protocol != NfcProtocolInvalid) {
         NfcPollerListElement* iter = instance->list.head;
-        while(iter->protocol != parent_protocol) iter = iter->child;
+        while(iter->protocol != parent_protocol)
+            iter = iter->child;
 
         iter->poller_api->set_callback(iter->poller, nfc_poller_start_ex_tail_callback, instance);
     }
@@ -254,7 +255,8 @@ bool nfc_poller_detect(NfcPoller* instance) {
     NfcPollerListElement* iter = instance->list.head;
 
     if(tail_poller != instance->list.head) {
-        while(iter->child != tail_poller) iter = iter->child;
+        while(iter->child != tail_poller)
+            iter = iter->child;
         iter->poller_api->set_callback(iter->poller, nfc_poller_detect_tail_callback, instance);
     }
 

lib/nfc/protocols/mf_ultralight/mf_ultralight_listener_i.c

@@ -155,7 +155,8 @@ static void mf_ultralight_format_mirror_data(
     FuriString* str,
     const uint8_t* const data,
     const uint8_t data_len) {
-    for(uint8_t i = 0; i < data_len; i++) furi_string_cat_printf(str, "%02X", data[i]);
+    for(uint8_t i = 0; i < data_len; i++)
+        furi_string_cat_printf(str, "%02X", data[i]);
 }
 
 void mf_ultralight_mirror_read_prepare(uint8_t start_page, MfUltralightListener* instance) {

lib/one_wire/one_wire_host.c

@@ -224,7 +224,8 @@ void onewire_host_target_search(OneWireHost* host, uint8_t family_code) {
     furi_check(host);
 
     host->saved_rom[0] = family_code;
-    for(uint8_t i = 1; i < 8; i++) host->saved_rom[i] = 0;
+    for(uint8_t i = 1; i < 8; i++)
+        host->saved_rom[i] = 0;
     host->last_discrepancy = 64;
     host->last_family_discrepancy = 0;
     host->last_device_flag = false;
@@ -341,7 +342,8 @@ bool onewire_host_search(OneWireHost* host, uint8_t* new_addr, OneWireHostSearch
         host->last_family_discrepancy = 0;
         search_result = false;
     } else {
-        for(int i = 0; i < 8; i++) new_addr[i] = host->saved_rom[i];
+        for(int i = 0; i < 8; i++)
+            new_addr[i] = host->saved_rom[i];
     }
 
     return search_result;

lib/print/printf_tiny.c

@@ -616,7 +616,8 @@ static size_t _etoa(
             FLAGS_ZEROPAD | FLAGS_PLUS);
         // might need to right-pad spaces
         if(flags & FLAGS_LEFT) {
-            while(idx - start_idx < width) out(' ', buffer, idx++, maxlen);
+            while(idx - start_idx < width)
+                out(' ', buffer, idx++, maxlen);
         }
     }
     return idx;

lib/toolbox/keys_dict.c

@@ -176,7 +176,8 @@ static bool keys_dict_get_next_key_str(KeysDict* instance, FuriString* key) {
 
     furi_string_reset(key);
 
-    while(!key_read && !is_endfile) key_read = keys_dict_read_key_line(instance, key, &is_endfile);
+    while(!key_read && !is_endfile)
+        key_read = keys_dict_read_key_line(instance, key, &is_endfile);
 
     return key_read;
 }

lib/u8g2/u8x8_byte.c

@@ -584,7 +584,8 @@ void i2c_transfer(u8x8_t* u8x8, uint8_t adr, uint8_t cnt, uint8_t* data) {
     uint8_t i;
     i2c_start(u8x8);
     i2c_write_byte(u8x8, adr);
-    for(i = 0; i < cnt; i++) i2c_write_byte(u8x8, data[i]);
+    for(i = 0; i < cnt; i++)
+        i2c_write_byte(u8x8, data[i]);
     i2c_stop(u8x8);
 }
 

lib/u8g2/u8x8_setup.c

@@ -109,7 +109,8 @@ void u8x8_SetupDefaults(u8x8_t* u8x8) {
 #ifdef U8X8_USE_PINS
     {
         uint8_t i;
-        for(i = 0; i < U8X8_PIN_CNT; i++) u8x8->pins[i] = U8X8_PIN_NONE;
+        for(i = 0; i < U8X8_PIN_CNT; i++)
+            u8x8->pins[i] = U8X8_PIN_NONE;
     }
 #endif
 }