From 2eaf1ffc95fcd3fa99eaebbdefc7c450f3d19ee8 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Mon, 15 Jul 2024 22:32:17 +0100 Subject: [PATCH] New formatting --- .../drivers/subghz/cc1101_ext/cc1101_ext.c | 2 +- applications/external | 2 +- applications/main/bad_kb/bad_kb_paths.h | 6 +- applications/main/bad_kb/helpers/ble_hid.c | 8 +- .../main/bad_kb/helpers/ble_hid_svc.c | 12 +- .../main/bad_kb/helpers/ble_hid_svc.h | 2 +- .../main/gpio/gpio_i2c_scanner_control.h | 4 +- applications/main/gpio/gpio_i2c_sfp_control.h | 6 +- .../main/gpio/scenes/gpio_scene_start.c | 2 +- applications/main/infrared/infrared_app.h | 4 +- applications/main/lfrfid/lfrfid_i.h | 2 +- .../momentum_app_scene_protocols_gpio.c | 6 +- .../helpers/protocol_support/emv/emv_render.h | 2 +- .../main/nfc/plugins/supported_cards/bip.c | 8 +- .../nfc/plugins/supported_cards/charliecard.c | 6 +- .../main/nfc/plugins/supported_cards/csc.c | 2 +- .../main/nfc/plugins/supported_cards/emv.c | 2 +- .../main/nfc/plugins/supported_cards/kazan.c | 2 +- .../nfc/plugins/supported_cards/metromoney.c | 2 +- .../main/nfc/plugins/supported_cards/mykey.c | 2 +- .../main/nfc/plugins/supported_cards/ndef.c | 20 +- .../plugins/supported_cards/zolotaya_korona.c | 6 +- .../supported_cards/zolotaya_korona_online.c | 2 +- .../subghz_frequency_analyzer_worker.h | 2 +- .../helpers/subghz_txrx_create_protocol_key.c | 2 +- .../main/subghz/scenes/subghz_scene_config.h | 2 +- .../main/subghz/scenes/subghz_scene_set_fix.c | 2 +- .../subghz/scenes/subghz_scene_show_gps.c | 2 +- applications/main/subghz/subghz_i.h | 2 +- .../main/subghz/subghz_last_settings.c | 30 +- .../main/subghz/subghz_last_settings.h | 6 +- applications/main/u2f/u2f_data.h | 8 +- applications/services/cli/cli_i.h | 2 +- applications/services/gui/view_dispatcher.c | 2 +- applications/services/gui/view_dispatcher_i.h | 2 +- applications/services/power/power_settings.h | 2 +- applications/services/storage/storage_glue.c | 2 +- .../settings/power_settings_app/about.c | 2 +- .../power_settings_scene_shutdown_idle.c | 2 +- .../scenes/storage_settings_scene_config.h | 2 +- applications/system/findmy/findmy.c | 2 +- applications/system/findmy/findmy_state.h | 12 +- applications/system/findmy/helpers/base64.c | 2 +- applications/system/findmy/helpers/base64.h | 2 +- .../system/findmy/scenes/findmy_scene.c | 2 +- .../system/findmy/scenes/findmy_scene.h | 2 +- .../findmy/scenes/findmy_scene_config.c | 2 +- .../scenes/findmy_scene_config_import.c | 2 +- .../findmy/scenes/findmy_scene_config_mac.c | 2 +- .../scenes/findmy_scene_config_packet.c | 2 +- .../scenes/findmy_scene_config_tagtype.c | 2 +- .../system/findmy/scenes/findmy_scene_main.c | 2 +- .../system/findmy/views/findmy_main.c | 2 +- .../system/findmy/views/findmy_main.h | 2 +- .../system/hid_app/views/hid_numpad.c | 12 +- .../system/hid_app/views/hid_ptt_menu.h | 2 +- .../system/js_app/modules/js_blebeacon.c | 2 +- applications/system/js_app/modules/js_gpio.c | 2 +- .../system/js_app/modules/js_keyboard.c | 2 +- .../modules/js_subghz/radio_device_loader.c | 2 +- .../modules/js_subghz/radio_device_loader.h | 2 +- .../modules/js_usbdisk/mass_storage_scsi.c | 16 +- .../modules/js_usbdisk/mass_storage_scsi.h | 6 +- .../modules/js_usbdisk/mass_storage_usb.c | 10 +- .../modules/js_vgm/ICM42688P/ICM42688P.h | 2 +- .../modules/js_vgm/ICM42688P/ICM42688P_regs.h | 288 +++++++++--------- .../system/js_app/modules/js_vgm/imu.c | 6 +- .../system/js_app/modules/js_vgm/imu.h | 2 +- lib/drivers/SK6805.c | 2 +- lib/drivers/rgb_backlight.c | 4 +- lib/lfrfid/protocols/protocol_insta_fob.c | 38 +-- lib/lfrfid/protocols/protocol_insta_fob.h | 2 +- lib/momentum/momentum.h | 6 +- lib/momentum/namespoof.h | 4 +- lib/momentum/settings.c | 12 +- lib/nfc/helpers/iso14443_4_layer.c | 12 +- lib/nfc/protocols/emv/emv.c | 2 +- lib/nfc/protocols/emv/emv.h | 58 ++-- lib/nfc/protocols/emv/emv_poller.c | 2 +- lib/nfc/protocols/emv/emv_poller.h | 2 +- lib/nfc/protocols/emv/emv_poller_defs.h | 2 +- lib/subghz/blocks/custom_btn.h | 8 +- lib/subghz/blocks/custom_btn_i.h | 6 +- lib/subghz/blocks/generic_i.h | 2 +- lib/subghz/devices/cc1101_configs.c | 2 +- lib/subghz/protocols/acurite_592txr.h | 2 +- lib/subghz/protocols/ambient_weather.c | 4 +- lib/subghz/protocols/lacrosse_tx.c | 10 +- lib/subghz/protocols/oregon2.c | 58 ++-- lib/subghz/protocols/oregon3.c | 6 +- lib/subghz/protocols/pcsg_generic.h | 2 +- lib/subghz/protocols/pocsag.c | 14 +- lib/subghz/protocols/schrader_gg4.c | 2 +- lib/subghz/protocols/tpms_generic.c | 2 +- lib/subghz/protocols/tpms_generic.h | 2 +- lib/subghz/protocols/ws_generic.c | 2 +- lib/subghz/protocols/ws_generic.h | 12 +- lib/subghz/subghz_setting.h | 2 +- targets/f7/furi_hal/furi_hal_subghz.c | 2 +- targets/f7/furi_hal/furi_hal_subghz_i.h | 2 +- targets/furi_hal_include/furi_hal_region.h | 2 +- 101 files changed, 431 insertions(+), 431 deletions(-) diff --git a/applications/drivers/subghz/cc1101_ext/cc1101_ext.c b/applications/drivers/subghz/cc1101_ext/cc1101_ext.c index bf9756b12..f093b9f28 100644 --- a/applications/drivers/subghz/cc1101_ext/cc1101_ext.c +++ b/applications/drivers/subghz/cc1101_ext/cc1101_ext.c @@ -20,7 +20,7 @@ #define TAG "SubGhzDeviceCc1101Ext" -#define SUBGHZ_DEVICE_CC1101_EXT_TX_GPIO (&gpio_ext_pb2) +#define SUBGHZ_DEVICE_CC1101_EXT_TX_GPIO (&gpio_ext_pb2) #define SUBGHZ_DEVICE_CC1101_EXT_E07M20S_AMP_GPIO &gpio_ext_pc3 #define SUBGHZ_DEVICE_CC1101_CONFIG_VER 1 diff --git a/applications/external b/applications/external index 9ac3220fa..fe2077c82 160000 --- a/applications/external +++ b/applications/external @@ -1 +1 @@ -Subproject commit 9ac3220fadf8565615edddfcc8763955e575d8f3 +Subproject commit fe2077c82e843e2d4f407a2b0b157d8e558f89ad diff --git a/applications/main/bad_kb/bad_kb_paths.h b/applications/main/bad_kb/bad_kb_paths.h index 4ba1bbbab..ff569f015 100644 --- a/applications/main/bad_kb/bad_kb_paths.h +++ b/applications/main/bad_kb/bad_kb_paths.h @@ -2,7 +2,7 @@ #include -#define BAD_KB_APP_BASE_FOLDER EXT_PATH("badusb") -#define BAD_KB_KEYS_PATH BAD_KB_APP_BASE_FOLDER "/.badkb.keys" -#define BAD_KB_SETTINGS_PATH BAD_KB_APP_BASE_FOLDER "/.badkb.settings" +#define BAD_KB_APP_BASE_FOLDER EXT_PATH("badusb") +#define BAD_KB_KEYS_PATH BAD_KB_APP_BASE_FOLDER "/.badkb.keys" +#define BAD_KB_SETTINGS_PATH BAD_KB_APP_BASE_FOLDER "/.badkb.settings" #define BAD_KB_APP_PATH_LAYOUT_FOLDER BAD_KB_APP_BASE_FOLDER "/assets/layouts" diff --git a/applications/main/bad_kb/helpers/ble_hid.c b/applications/main/bad_kb/helpers/ble_hid.c index 2d9cb8a38..2240bca35 100644 --- a/applications/main/bad_kb/helpers/ble_hid.c +++ b/applications/main/bad_kb/helpers/ble_hid.c @@ -9,12 +9,12 @@ #include #include -#define HID_INFO_BASE_USB_SPECIFICATION (0x0101) -#define HID_INFO_COUNTRY_CODE (0x00) -#define BLE_PROFILE_HID_INFO_FLAG_REMOTE_WAKE_MSK (0x01) +#define HID_INFO_BASE_USB_SPECIFICATION (0x0101) +#define HID_INFO_COUNTRY_CODE (0x00) +#define BLE_PROFILE_HID_INFO_FLAG_REMOTE_WAKE_MSK (0x01) #define BLE_PROFILE_HID_INFO_FLAG_NORMALLY_CONNECTABLE_MSK (0x02) -#define BLE_PROFILE_HID_KB_MAX_KEYS (6) +#define BLE_PROFILE_HID_KB_MAX_KEYS (6) #define BLE_PROFILE_CONSUMER_MAX_KEYS (1) // Report ids cant be 0 diff --git a/applications/main/bad_kb/helpers/ble_hid_svc.c b/applications/main/bad_kb/helpers/ble_hid_svc.c index 71270e155..2f0910252 100644 --- a/applications/main/bad_kb/helpers/ble_hid_svc.c +++ b/applications/main/bad_kb/helpers/ble_hid_svc.c @@ -10,13 +10,13 @@ #define TAG "BleHid" #define BLE_SVC_HID_REPORT_MAP_MAX_LEN (255) -#define BLE_SVC_HID_REPORT_MAX_LEN (255) -#define BLE_SVC_HID_REPORT_REF_LEN (2) -#define BLE_SVC_HID_INFO_LEN (4) -#define BLE_SVC_HID_CONTROL_POINT_LEN (1) +#define BLE_SVC_HID_REPORT_MAX_LEN (255) +#define BLE_SVC_HID_REPORT_REF_LEN (2) +#define BLE_SVC_HID_INFO_LEN (4) +#define BLE_SVC_HID_CONTROL_POINT_LEN (1) -#define BLE_SVC_HID_INPUT_REPORT_COUNT (3) -#define BLE_SVC_HID_OUTPUT_REPORT_COUNT (0) +#define BLE_SVC_HID_INPUT_REPORT_COUNT (3) +#define BLE_SVC_HID_OUTPUT_REPORT_COUNT (0) #define BLE_SVC_HID_FEATURE_REPORT_COUNT (0) #define BLE_SVC_HID_REPORT_COUNT \ (BLE_SVC_HID_INPUT_REPORT_COUNT + BLE_SVC_HID_OUTPUT_REPORT_COUNT + \ diff --git a/applications/main/bad_kb/helpers/ble_hid_svc.h b/applications/main/bad_kb/helpers/ble_hid_svc.h index 8e9cc2975..c6e3059cd 100644 --- a/applications/main/bad_kb/helpers/ble_hid_svc.h +++ b/applications/main/bad_kb/helpers/ble_hid_svc.h @@ -26,4 +26,4 @@ bool ble_svc_hid_update_info(BleServiceHid* service, uint8_t* data); #ifdef __cplusplus } -#endif \ No newline at end of file +#endif diff --git a/applications/main/gpio/gpio_i2c_scanner_control.h b/applications/main/gpio/gpio_i2c_scanner_control.h index 011f8aa36..30d95e21c 100644 --- a/applications/main/gpio/gpio_i2c_scanner_control.h +++ b/applications/main/gpio/gpio_i2c_scanner_control.h @@ -5,8 +5,8 @@ #include -#define FIRST_NON_RESERVED_I2C_ADDRESS 8 -#define HIGHEST_I2C_ADDRESS 127 +#define FIRST_NON_RESERVED_I2C_ADDRESS 8 +#define HIGHEST_I2C_ADDRESS 127 #define AVAILABLE_NONRESVERED_I2C_ADDRESSES 120 typedef struct { diff --git a/applications/main/gpio/gpio_i2c_sfp_control.h b/applications/main/gpio/gpio_i2c_sfp_control.h index 7a9f4bcbe..edc00ac34 100644 --- a/applications/main/gpio/gpio_i2c_sfp_control.h +++ b/applications/main/gpio/gpio_i2c_sfp_control.h @@ -5,10 +5,10 @@ #include -#define FIRST_NON_RESERVED_I2C_ADDRESS 8 -#define HIGHEST_I2C_ADDRESS 127 +#define FIRST_NON_RESERVED_I2C_ADDRESS 8 +#define HIGHEST_I2C_ADDRESS 127 #define AVAILABLE_NONRESVERED_I2C_ADDRESSES 120 -#define SFP_I2C_ADDRESS 0x50 +#define SFP_I2C_ADDRESS 0x50 typedef struct { char vendor[32]; diff --git a/applications/main/gpio/scenes/gpio_scene_start.c b/applications/main/gpio/scenes/gpio_scene_start.c index 3c35b8652..f28b58b23 100644 --- a/applications/main/gpio/scenes/gpio_scene_start.c +++ b/applications/main/gpio/scenes/gpio_scene_start.c @@ -125,4 +125,4 @@ void gpio_scene_start_on_exit(void* context) { variable_item_list_reset(app->var_item_list); } -#endif // __GPIO_SCENE_START_H__ \ No newline at end of file +#endif // __GPIO_SCENE_START_H__ diff --git a/applications/main/infrared/infrared_app.h b/applications/main/infrared/infrared_app.h index 6b7b8821a..545fada9f 100644 --- a/applications/main/infrared/infrared_app.h +++ b/applications/main/infrared/infrared_app.h @@ -17,9 +17,9 @@ typedef struct InfraredApp InfraredApp; #include #include -#define INFRARED_SETTINGS_PATH EXT_PATH("infrared/.infrared.settings") +#define INFRARED_SETTINGS_PATH EXT_PATH("infrared/.infrared.settings") #define INFRARED_SETTINGS_VERSION (1) -#define INFRARED_SETTINGS_MAGIC (0x1F) +#define INFRARED_SETTINGS_MAGIC (0x1F) typedef struct { FuriHalInfraredTxPin tx_pin; diff --git a/applications/main/lfrfid/lfrfid_i.h b/applications/main/lfrfid/lfrfid_i.h index 376c76b05..e8f2593a8 100644 --- a/applications/main/lfrfid/lfrfid_i.h +++ b/applications/main/lfrfid/lfrfid_i.h @@ -157,4 +157,4 @@ void lfrfid_widget_callback(GuiButtonType result, InputType type, void* context) void lfrfid_text_input_callback(void* context); -const uint32_t* lfrfid_get_t5577_default_passwords(uint8_t* len); \ No newline at end of file +const uint32_t* lfrfid_get_t5577_default_passwords(uint8_t* len); diff --git a/applications/main/momentum_app/scenes/momentum_app_scene_protocols_gpio.c b/applications/main/momentum_app/scenes/momentum_app_scene_protocols_gpio.c index ae561ae6e..0a0815c79 100644 --- a/applications/main/momentum_app/scenes/momentum_app_scene_protocols_gpio.c +++ b/applications/main/momentum_app/scenes/momentum_app_scene_protocols_gpio.c @@ -8,10 +8,10 @@ enum VarItemListIndex { VarItemListIndexUartGeneralChannel, }; -#define SPI_DEFAULT "Default 4" -#define SPI_EXTRA "Extra 7" +#define SPI_DEFAULT "Default 4" +#define SPI_EXTRA "Extra 7" #define UART_DEFAULT "Default 13,14" -#define UART_EXTRA "Extra 15,16" +#define UART_EXTRA "Extra 15,16" void momentum_app_scene_protocols_gpio_var_item_list_callback(void* context, uint32_t index) { MomentumApp* app = context; diff --git a/applications/main/nfc/helpers/protocol_support/emv/emv_render.h b/applications/main/nfc/helpers/protocol_support/emv/emv_render.h index 4f1e9bb09..de2e20ebb 100644 --- a/applications/main/nfc/helpers/protocol_support/emv/emv_render.h +++ b/applications/main/nfc/helpers/protocol_support/emv/emv_render.h @@ -27,4 +27,4 @@ void nfc_render_emv_transactions(const EmvApplication* data, FuriString* str); void nfc_render_emv_uid(const uint8_t* uid, const uint8_t uid_len, FuriString* str); -void nfc_render_emv_header(FuriString* str); \ No newline at end of file +void nfc_render_emv_header(FuriString* str); diff --git a/applications/main/nfc/plugins/supported_cards/bip.c b/applications/main/nfc/plugins/supported_cards/bip.c index 43acd0947..6bc586bc6 100644 --- a/applications/main/nfc/plugins/supported_cards/bip.c +++ b/applications/main/nfc/plugins/supported_cards/bip.c @@ -9,11 +9,11 @@ #define TAG "Bip" -#define BIP_CARD_ID_SECTOR_NUMBER (0) -#define BIP_BALANCE_SECTOR_NUMBER (8) +#define BIP_CARD_ID_SECTOR_NUMBER (0) +#define BIP_BALANCE_SECTOR_NUMBER (8) #define BIP_TRIP_TIME_WINDOW_SECTOR_NUMBER (5) -#define BIP_LAST_TOP_UPS_SECTOR_NUMBER (10) -#define BIP_TRIPS_INFO_SECTOR_NUMBER (11) +#define BIP_LAST_TOP_UPS_SECTOR_NUMBER (10) +#define BIP_TRIPS_INFO_SECTOR_NUMBER (11) typedef struct { DateTime datetime; diff --git a/applications/main/nfc/plugins/supported_cards/charliecard.c b/applications/main/nfc/plugins/supported_cards/charliecard.c index 9880ca3ad..da29dbfe6 100644 --- a/applications/main/nfc/plugins/supported_cards/charliecard.c +++ b/applications/main/nfc/plugins/supported_cards/charliecard.c @@ -92,10 +92,10 @@ 0, 0, 0, 1, 1, 2003, 4 \ } // timestep is one minute -#define CHARLIE_TIME_DELTA_SECS 60 -#define CHARLIE_END_VALID_DELTA_SECS 60 * 8 +#define CHARLIE_TIME_DELTA_SECS 60 +#define CHARLIE_END_VALID_DELTA_SECS 60 * 8 #define CHARLIE_N_TRANSACTION_HISTORY 10 -#define CHARLIE_N_PASSES 4 +#define CHARLIE_N_PASSES 4 typedef struct { uint64_t a; diff --git a/applications/main/nfc/plugins/supported_cards/csc.c b/applications/main/nfc/plugins/supported_cards/csc.c index 08a8de7f3..a96d74007 100644 --- a/applications/main/nfc/plugins/supported_cards/csc.c +++ b/applications/main/nfc/plugins/supported_cards/csc.c @@ -146,4 +146,4 @@ static const FlipperAppPluginDescriptor csc_plugin_descriptor = { /* Plugin entry point - must return a pointer to const descriptor */ const FlipperAppPluginDescriptor* csc_plugin_ep(void) { return &csc_plugin_descriptor; -} \ No newline at end of file +} diff --git a/applications/main/nfc/plugins/supported_cards/emv.c b/applications/main/nfc/plugins/supported_cards/emv.c index 2c3ae8945..2f5b84790 100644 --- a/applications/main/nfc/plugins/supported_cards/emv.c +++ b/applications/main/nfc/plugins/supported_cards/emv.c @@ -201,4 +201,4 @@ static const FlipperAppPluginDescriptor emv_plugin_descriptor = { /* Plugin entry point - must return a pointer to const descriptor */ const FlipperAppPluginDescriptor* emv_plugin_ep(void) { return &emv_plugin_descriptor; -} \ No newline at end of file +} diff --git a/applications/main/nfc/plugins/supported_cards/kazan.c b/applications/main/nfc/plugins/supported_cards/kazan.c index 5939ef268..65838e25c 100644 --- a/applications/main/nfc/plugins/supported_cards/kazan.c +++ b/applications/main/nfc/plugins/supported_cards/kazan.c @@ -411,4 +411,4 @@ static const FlipperAppPluginDescriptor kazan_plugin_descriptor = { /* Plugin entry point - must return a pointer to const descriptor */ const FlipperAppPluginDescriptor* kazan_plugin_ep(void) { return &kazan_plugin_descriptor; -} \ No newline at end of file +} diff --git a/applications/main/nfc/plugins/supported_cards/metromoney.c b/applications/main/nfc/plugins/supported_cards/metromoney.c index 03acfd2ea..089bb48bd 100644 --- a/applications/main/nfc/plugins/supported_cards/metromoney.c +++ b/applications/main/nfc/plugins/supported_cards/metromoney.c @@ -187,4 +187,4 @@ static const FlipperAppPluginDescriptor metromoney_plugin_descriptor = { /* Plugin entry point - must return a pointer to const descriptor */ const FlipperAppPluginDescriptor* metromoney_plugin_ep(void) { return &metromoney_plugin_descriptor; -} \ No newline at end of file +} diff --git a/applications/main/nfc/plugins/supported_cards/mykey.c b/applications/main/nfc/plugins/supported_cards/mykey.c index 40a647b32..cb7092fce 100644 --- a/applications/main/nfc/plugins/supported_cards/mykey.c +++ b/applications/main/nfc/plugins/supported_cards/mykey.c @@ -154,4 +154,4 @@ static const FlipperAppPluginDescriptor mykey_plugin_descriptor = { /* Plugin entry point - must return a pointer to const descriptor */ const FlipperAppPluginDescriptor* mykey_plugin_ep(void) { return &mykey_plugin_descriptor; -} \ No newline at end of file +} diff --git a/applications/main/nfc/plugins/supported_cards/ndef.c b/applications/main/nfc/plugins/supported_cards/ndef.c index 54719eae5..6ed0894a2 100644 --- a/applications/main/nfc/plugins/supported_cards/ndef.c +++ b/applications/main/nfc/plugins/supported_cards/ndef.c @@ -148,16 +148,16 @@ static void parse_ndef_vcard(FuriString* str, const uint8_t* payload, uint32_t p static void parse_ndef_wifi(FuriString* str, const uint8_t* payload, uint32_t payload_len) { // https://android.googlesource.com/platform/packages/apps/Nfc/+/refs/heads/main/src/com/android/nfc/NfcWifiProtectedSetup.java -#define CREDENTIAL_FIELD_ID (0x100E) -#define SSID_FIELD_ID (0x1045) -#define NETWORK_KEY_FIELD_ID (0x1027) -#define AUTH_TYPE_FIELD_ID (0x1003) -#define AUTH_TYPE_EXPECTED_SIZE (2) -#define AUTH_TYPE_OPEN (0x0001) -#define AUTH_TYPE_WPA_PSK (0x0002) -#define AUTH_TYPE_WPA_EAP (0x0008) -#define AUTH_TYPE_WPA2_EAP (0x0010) -#define AUTH_TYPE_WPA2_PSK (0x0020) +#define CREDENTIAL_FIELD_ID (0x100E) +#define SSID_FIELD_ID (0x1045) +#define NETWORK_KEY_FIELD_ID (0x1027) +#define AUTH_TYPE_FIELD_ID (0x1003) +#define AUTH_TYPE_EXPECTED_SIZE (2) +#define AUTH_TYPE_OPEN (0x0001) +#define AUTH_TYPE_WPA_PSK (0x0002) +#define AUTH_TYPE_WPA_EAP (0x0008) +#define AUTH_TYPE_WPA2_EAP (0x0010) +#define AUTH_TYPE_WPA2_PSK (0x0020) #define AUTH_TYPE_WPA_AND_WPA2_PSK (0x0022) #define MAX_NETWORK_KEY_SIZE_BYTES (64) diff --git a/applications/main/nfc/plugins/supported_cards/zolotaya_korona.c b/applications/main/nfc/plugins/supported_cards/zolotaya_korona.c index f94d2d35c..8ba36605b 100644 --- a/applications/main/nfc/plugins/supported_cards/zolotaya_korona.c +++ b/applications/main/nfc/plugins/supported_cards/zolotaya_korona.c @@ -29,9 +29,9 @@ #define TAG "Zolotaya Korona" -#define TRIP_SECTOR_NUM (4) +#define TRIP_SECTOR_NUM (4) #define PURSE_SECTOR_NUM (6) -#define INFO_SECTOR_NUM (15) +#define INFO_SECTOR_NUM (15) // Sector 15 data. Byte [11] contains the mistake. If byte [11] was 0xEF, bytes [1-18] means "ЗАО Золотая Корона" static const uint8_t info_sector_signature[] = {0xE2, 0x87, 0x80, 0x8E, 0x20, 0x87, 0xAE, @@ -211,4 +211,4 @@ static const FlipperAppPluginDescriptor zolotaya_korona_plugin_descriptor = { /* Plugin entry point - must return a pointer to const descriptor */ const FlipperAppPluginDescriptor* zolotaya_korona_plugin_ep(void) { return &zolotaya_korona_plugin_descriptor; -} \ No newline at end of file +} diff --git a/applications/main/nfc/plugins/supported_cards/zolotaya_korona_online.c b/applications/main/nfc/plugins/supported_cards/zolotaya_korona_online.c index 2abc5be67..0e39b8a58 100644 --- a/applications/main/nfc/plugins/supported_cards/zolotaya_korona_online.c +++ b/applications/main/nfc/plugins/supported_cards/zolotaya_korona_online.c @@ -141,4 +141,4 @@ static const FlipperAppPluginDescriptor zolotaya_korona_online_plugin_descriptor /* Plugin entry point - must return a pointer to const descriptor */ const FlipperAppPluginDescriptor* zolotaya_korona_online_plugin_ep(void) { return &zolotaya_korona_online_plugin_descriptor; -} \ No newline at end of file +} diff --git a/applications/main/subghz/helpers/subghz_frequency_analyzer_worker.h b/applications/main/subghz/helpers/subghz_frequency_analyzer_worker.h index eeb1804d9..1b21c39e9 100644 --- a/applications/main/subghz/helpers/subghz_frequency_analyzer_worker.h +++ b/applications/main/subghz/helpers/subghz_frequency_analyzer_worker.h @@ -77,4 +77,4 @@ void subghz_frequency_analyzer_worker_set_trigger_level( * @param instance SubGhzFrequencyAnalyzerWorker instance * @return RSSI trigger level */ -float subghz_frequency_analyzer_worker_get_trigger_level(SubGhzFrequencyAnalyzerWorker* instance); \ No newline at end of file +float subghz_frequency_analyzer_worker_get_trigger_level(SubGhzFrequencyAnalyzerWorker* instance); diff --git a/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c b/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c index 42e91a330..724da6b87 100644 --- a/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c +++ b/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c @@ -381,4 +381,4 @@ bool subghz_txrx_gen_secplus_v1_protocol( ret = true; } return ret; -} \ No newline at end of file +} diff --git a/applications/main/subghz/scenes/subghz_scene_config.h b/applications/main/subghz/scenes/subghz_scene_config.h index 9530b86ef..cbb43f56e 100644 --- a/applications/main/subghz/scenes/subghz_scene_config.h +++ b/applications/main/subghz/scenes/subghz_scene_config.h @@ -23,4 +23,4 @@ ADD_SCENE(subghz, decode_raw, DecodeRAW) ADD_SCENE(subghz, delete_raw, DeleteRAW) ADD_SCENE(subghz, need_saving, NeedSaving) ADD_SCENE(subghz, rpc, Rpc) -ADD_SCENE(subghz, show_gps, ShowGps) \ No newline at end of file +ADD_SCENE(subghz, show_gps, ShowGps) diff --git a/applications/main/subghz/scenes/subghz_scene_set_fix.c b/applications/main/subghz/scenes/subghz_scene_set_fix.c index 7564fb24d..93df4e54d 100644 --- a/applications/main/subghz/scenes/subghz_scene_set_fix.c +++ b/applications/main/subghz/scenes/subghz_scene_set_fix.c @@ -43,4 +43,4 @@ void subghz_scene_set_fix_on_exit(void* context) { // Clear view byte_input_set_result_callback(subghz->byte_input, NULL, NULL, NULL, NULL, 0); byte_input_set_header_text(subghz->byte_input, ""); -} \ No newline at end of file +} diff --git a/applications/main/subghz/scenes/subghz_scene_show_gps.c b/applications/main/subghz/scenes/subghz_scene_show_gps.c index 3625b1869..dc2939e7c 100644 --- a/applications/main/subghz/scenes/subghz_scene_show_gps.c +++ b/applications/main/subghz/scenes/subghz_scene_show_gps.c @@ -85,4 +85,4 @@ void subghz_scene_show_gps_on_exit(void* context) { } widget_reset(subghz->widget); -} \ No newline at end of file +} diff --git a/applications/main/subghz/subghz_i.h b/applications/main/subghz/subghz_i.h index 0d1eeb00f..9f0eae6fa 100644 --- a/applications/main/subghz/subghz_i.h +++ b/applications/main/subghz/subghz_i.h @@ -41,7 +41,7 @@ #include "helpers/subghz_txrx.h" #include "helpers/subghz_gps.h" -#define SUBGHZ_MAX_LEN_NAME 64 +#define SUBGHZ_MAX_LEN_NAME 64 #define SUBGHZ_EXT_PRESET_NAME true #define SUBGHZ_MEASURE_LOADING false diff --git a/applications/main/subghz/subghz_last_settings.c b/applications/main/subghz/subghz_last_settings.c index 2ea191490..87b881d63 100644 --- a/applications/main/subghz/subghz_last_settings.c +++ b/applications/main/subghz/subghz_last_settings.c @@ -3,26 +3,26 @@ #define TAG "SubGhzLastSettings" -#define SUBGHZ_LAST_SETTING_FILE_TYPE "Flipper SubGhz Last Setting File" +#define SUBGHZ_LAST_SETTING_FILE_TYPE "Flipper SubGhz Last Setting File" #define SUBGHZ_LAST_SETTING_FILE_VERSION 3 -#define SUBGHZ_LAST_SETTINGS_PATH EXT_PATH("subghz/assets/last_subghz.settings") +#define SUBGHZ_LAST_SETTINGS_PATH EXT_PATH("subghz/assets/last_subghz.settings") -#define SUBGHZ_LAST_SETTING_FIELD_FREQUENCY "Frequency" -#define SUBGHZ_LAST_SETTING_FIELD_PRESET "Preset" // AKA Modulation +#define SUBGHZ_LAST_SETTING_FIELD_FREQUENCY "Frequency" +#define SUBGHZ_LAST_SETTING_FIELD_PRESET "Preset" // AKA Modulation #define SUBGHZ_LAST_SETTING_FIELD_FREQUENCY_ANALYZER_FEEDBACK_LEVEL "FeedbackLevel" -#define SUBGHZ_LAST_SETTING_FIELD_FREQUENCY_ANALYZER_TRIGGER "FATrigger" -#define SUBGHZ_LAST_SETTING_FIELD_PROTOCOL_FILE_NAMES "ProtocolNames" -#define SUBGHZ_LAST_SETTING_FIELD_HOPPING_ENABLE "Hopping" -#define SUBGHZ_LAST_SETTING_FIELD_IGNORE_FILTER "IgnoreFilter" -#define SUBGHZ_LAST_SETTING_FIELD_FILTER "Filter" -#define SUBGHZ_LAST_SETTING_FIELD_RSSI_THRESHOLD "RSSI" -#define SUBGHZ_LAST_SETTING_FIELD_DELETE_OLD "DelOldSignals" +#define SUBGHZ_LAST_SETTING_FIELD_FREQUENCY_ANALYZER_TRIGGER "FATrigger" +#define SUBGHZ_LAST_SETTING_FIELD_PROTOCOL_FILE_NAMES "ProtocolNames" +#define SUBGHZ_LAST_SETTING_FIELD_HOPPING_ENABLE "Hopping" +#define SUBGHZ_LAST_SETTING_FIELD_IGNORE_FILTER "IgnoreFilter" +#define SUBGHZ_LAST_SETTING_FIELD_FILTER "Filter" +#define SUBGHZ_LAST_SETTING_FIELD_RSSI_THRESHOLD "RSSI" +#define SUBGHZ_LAST_SETTING_FIELD_DELETE_OLD "DelOldSignals" -#define SUBGHZ_LAST_SETTING_FIELD_GPS_BAUDRATE "GpsBaudrate" +#define SUBGHZ_LAST_SETTING_FIELD_GPS_BAUDRATE "GpsBaudrate" #define SUBGHZ_LAST_SETTING_FIELD_REMOVE_DUPLICATES "RemoveDuplicates" -#define SUBGHZ_LAST_SETTING_FIELD_REPEATER "Repeater" -#define SUBGHZ_LAST_SETTING_FIELD_ENABLE_SOUND "Sound" -#define SUBGHZ_LAST_SETTING_FIELD_AUTOSAVE "Autosave" +#define SUBGHZ_LAST_SETTING_FIELD_REPEATER "Repeater" +#define SUBGHZ_LAST_SETTING_FIELD_ENABLE_SOUND "Sound" +#define SUBGHZ_LAST_SETTING_FIELD_AUTOSAVE "Autosave" #define SUBGHZ_LAST_SETTING_FIELD_HOPPING_THRESHOLD "HoppingThreshold" SubGhzLastSettings* subghz_last_settings_alloc(void) { diff --git a/applications/main/subghz/subghz_last_settings.h b/applications/main/subghz/subghz_last_settings.h index 430cb11ae..470475e7b 100644 --- a/applications/main/subghz/subghz_last_settings.h +++ b/applications/main/subghz/subghz_last_settings.h @@ -6,11 +6,11 @@ #include #include -#define SUBGHZ_LAST_SETTING_FREQUENCY_ANALYZER_TRIGGER (-93.0f) +#define SUBGHZ_LAST_SETTING_FREQUENCY_ANALYZER_TRIGGER (-93.0f) // 1 = "AM650" // "AM270", "AM650", "FM238", "FM476", -#define SUBGHZ_LAST_SETTING_DEFAULT_PRESET 1 -#define SUBGHZ_LAST_SETTING_DEFAULT_FREQUENCY 433920000 +#define SUBGHZ_LAST_SETTING_DEFAULT_PRESET 1 +#define SUBGHZ_LAST_SETTING_DEFAULT_FREQUENCY 433920000 #define SUBGHZ_LAST_SETTING_FREQUENCY_ANALYZER_FEEDBACK_LEVEL 2 typedef struct { diff --git a/applications/main/u2f/u2f_data.h b/applications/main/u2f/u2f_data.h index ba1e6acc2..54428acf9 100644 --- a/applications/main/u2f/u2f_data.h +++ b/applications/main/u2f/u2f_data.h @@ -6,11 +6,11 @@ extern "C" { #include -#define U2F_DATA_FOLDER EXT_PATH("u2f/") -#define U2F_CERT_FILE U2F_DATA_FOLDER "assets/cert.der" +#define U2F_DATA_FOLDER EXT_PATH("u2f/") +#define U2F_CERT_FILE U2F_DATA_FOLDER "assets/cert.der" #define U2F_CERT_KEY_FILE U2F_DATA_FOLDER "assets/cert_key.u2f" -#define U2F_CNT_FILE U2F_DATA_FOLDER "cnt.u2f" -#define U2F_KEY_FILE INT_PATH(".key.u2f") +#define U2F_CNT_FILE U2F_DATA_FOLDER "cnt.u2f" +#define U2F_KEY_FILE INT_PATH(".key.u2f") bool u2f_data_check(bool cert_only); diff --git a/applications/services/cli/cli_i.h b/applications/services/cli/cli_i.h index 11f01d304..ed207b9f9 100644 --- a/applications/services/cli/cli_i.h +++ b/applications/services/cli/cli_i.h @@ -65,7 +65,7 @@ void cli_stdout_callback(void* _cookie, const char* data, size_t size); // Wraps CLI commands to load from plugin file // Must call from CLI context, like dummy CLI command callback // You need to setup the plugin to compile correctly separately -#define CLI_PLUGIN_APP_ID "cli" +#define CLI_PLUGIN_APP_ID "cli" #define CLI_PLUGIN_API_VERSION 1 void cli_plugin_wrapper(const char* name, Cli* cli, FuriString* args, void* context); diff --git a/applications/services/gui/view_dispatcher.c b/applications/services/gui/view_dispatcher.c index 0e8be86bd..9e91c2c9c 100644 --- a/applications/services/gui/view_dispatcher.c +++ b/applications/services/gui/view_dispatcher.c @@ -487,4 +487,4 @@ bool view_dispatcher_run_ascii_callback(FuriMessageQueue* queue, void* context) view_dispatcher_handle_ascii(instance, &ascii); return true; -} \ No newline at end of file +} diff --git a/applications/services/gui/view_dispatcher_i.h b/applications/services/gui/view_dispatcher_i.h index 37571cf3c..28c794b59 100644 --- a/applications/services/gui/view_dispatcher_i.h +++ b/applications/services/gui/view_dispatcher_i.h @@ -69,4 +69,4 @@ bool view_dispatcher_run_event_callback(FuriMessageQueue* queue, void* context); bool view_dispatcher_run_input_callback(FuriMessageQueue* queue, void* context); /** ViewDispatcher run event loop ascii callback */ -bool view_dispatcher_run_ascii_callback(FuriMessageQueue* queue, void* context); \ No newline at end of file +bool view_dispatcher_run_ascii_callback(FuriMessageQueue* queue, void* context); diff --git a/applications/services/power/power_settings.h b/applications/services/power/power_settings.h index 94bd5895c..df16f72af 100644 --- a/applications/services/power/power_settings.h +++ b/applications/services/power/power_settings.h @@ -3,7 +3,7 @@ #define POWER_SETTINGS_VER (1) -#define POWER_SETTINGS_PATH CFG_PATH("power.settings") +#define POWER_SETTINGS_PATH CFG_PATH("power.settings") #define POWER_SETTINGS_MAGIC (0x21) #ifdef __cplusplus diff --git a/applications/services/storage/storage_glue.c b/applications/services/storage/storage_glue.c index 727af765f..0356aa120 100644 --- a/applications/services/storage/storage_glue.c +++ b/applications/services/storage/storage_glue.c @@ -161,4 +161,4 @@ const char* storage_file_get_path(File* file, StorageData* storage) { StorageFile* storage_file_ref = storage_get_file(file, storage); if(!storage_file_ref) return ""; return furi_string_get_cstr(storage_file_ref->path); -} \ No newline at end of file +} diff --git a/applications/settings/power_settings_app/about.c b/applications/settings/power_settings_app/about.c index a6a605667..d33248c4f 100644 --- a/applications/settings/power_settings_app/about.c +++ b/applications/settings/power_settings_app/about.c @@ -1 +1 @@ -#include \ No newline at end of file +#include diff --git a/applications/settings/power_settings_app/scenes/power_settings_scene_shutdown_idle.c b/applications/settings/power_settings_app/scenes/power_settings_scene_shutdown_idle.c index 7b0bea340..a04f9fdf2 100644 --- a/applications/settings/power_settings_app/scenes/power_settings_scene_shutdown_idle.c +++ b/applications/settings/power_settings_app/scenes/power_settings_scene_shutdown_idle.c @@ -1,7 +1,7 @@ #include "../power_settings_app.h" #include -#define SHUTDOWN_IDLE_DELAY_COUNT 9 +#define SHUTDOWN_IDLE_DELAY_COUNT 9 #define SCENE_EVENT_SELECT_SHUTDOWN_IDLE_DELAY 0 const char* const shutdown_idle_delay_text[SHUTDOWN_IDLE_DELAY_COUNT] = diff --git a/applications/settings/storage_settings/scenes/storage_settings_scene_config.h b/applications/settings/storage_settings/scenes/storage_settings_scene_config.h index 22acd54e1..b3dc6e6f6 100644 --- a/applications/settings/storage_settings/scenes/storage_settings_scene_config.h +++ b/applications/settings/storage_settings/scenes/storage_settings_scene_config.h @@ -8,4 +8,4 @@ ADD_SCENE(storage_settings, internal_info, InternalInfo) ADD_SCENE(storage_settings, benchmark_confirm, BenchmarkConfirm) ADD_SCENE(storage_settings, benchmark, Benchmark) ADD_SCENE(storage_settings, factory_reset, FactoryReset) -ADD_SCENE(storage_settings, wipe_device, WipeDevice) \ No newline at end of file +ADD_SCENE(storage_settings, wipe_device, WipeDevice) diff --git a/applications/system/findmy/findmy.c b/applications/system/findmy/findmy.c index 16b36cbbd..ba6735b64 100644 --- a/applications/system/findmy/findmy.c +++ b/applications/system/findmy/findmy.c @@ -139,4 +139,4 @@ void furi_hal_bt_reverse_mac_addr(uint8_t mac_addr[GAP_MAC_ADDR_SIZE]) { mac_addr[i] = mac_addr[GAP_MAC_ADDR_SIZE - 1 - i]; mac_addr[GAP_MAC_ADDR_SIZE - 1 - i] = tmp; } -} \ No newline at end of file +} diff --git a/applications/system/findmy/findmy_state.h b/applications/system/findmy/findmy_state.h index 77d49b095..f0be35430 100644 --- a/applications/system/findmy/findmy_state.h +++ b/applications/system/findmy/findmy_state.h @@ -3,13 +3,13 @@ #include #define FINDMY_STATE_HEADER "FindMy Flipper State" -#define FINDMY_STATE_VER 1 -#define FINDMY_STATE_DIR EXT_PATH("apps_data/findmy") -#define FINDMY_STATE_PATH FINDMY_STATE_DIR "/findmy_state.txt" +#define FINDMY_STATE_VER 1 +#define FINDMY_STATE_DIR EXT_PATH("apps_data/findmy") +#define FINDMY_STATE_PATH FINDMY_STATE_DIR "/findmy_state.txt" -#define BATTERY_FULL 0x00 -#define BATTERY_MEDIUM 0x50 -#define BATTERY_LOW 0xA0 +#define BATTERY_FULL 0x00 +#define BATTERY_MEDIUM 0x50 +#define BATTERY_LOW 0xA0 #define BATTERY_CRITICAL 0xF0 typedef enum { diff --git a/applications/system/findmy/helpers/base64.c b/applications/system/findmy/helpers/base64.c index a2162bec3..9c6a32bfa 100644 --- a/applications/system/findmy/helpers/base64.c +++ b/applications/system/findmy/helpers/base64.c @@ -10,7 +10,7 @@ #include "base64.h" #define os_malloc malloc -#define os_free free +#define os_free free #define os_memset memset static const unsigned char base64_table[65] = diff --git a/applications/system/findmy/helpers/base64.h b/applications/system/findmy/helpers/base64.h index 333f82dc1..d20660c5b 100644 --- a/applications/system/findmy/helpers/base64.h +++ b/applications/system/findmy/helpers/base64.h @@ -18,4 +18,4 @@ unsigned char* base64_encode(const unsigned char* src, size_t len, size_t* out_len); unsigned char* base64_decode(const unsigned char* src, size_t len, size_t* out_len); -#endif /* BASE64_H */ \ No newline at end of file +#endif /* BASE64_H */ diff --git a/applications/system/findmy/scenes/findmy_scene.c b/applications/system/findmy/scenes/findmy_scene.c index dca1adbb4..f854566e5 100644 --- a/applications/system/findmy/scenes/findmy_scene.c +++ b/applications/system/findmy/scenes/findmy_scene.c @@ -28,4 +28,4 @@ const SceneManagerHandlers findmy_scene_handlers = { .on_event_handlers = findmy_on_event_handlers, .on_exit_handlers = findmy_on_exit_handlers, .scene_num = FindMySceneNum, -}; \ No newline at end of file +}; diff --git a/applications/system/findmy/scenes/findmy_scene.h b/applications/system/findmy/scenes/findmy_scene.h index 993b9d054..14ab9d6bf 100644 --- a/applications/system/findmy/scenes/findmy_scene.h +++ b/applications/system/findmy/scenes/findmy_scene.h @@ -27,4 +27,4 @@ extern const SceneManagerHandlers findmy_scene_handlers; // Generate scene on_exit handlers declaration #define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_exit(void* context); #include "findmy_scenes.h" -#undef ADD_SCENE \ No newline at end of file +#undef ADD_SCENE diff --git a/applications/system/findmy/scenes/findmy_scene_config.c b/applications/system/findmy/scenes/findmy_scene_config.c index 0ab63be42..caad8f13e 100644 --- a/applications/system/findmy/scenes/findmy_scene_config.c +++ b/applications/system/findmy/scenes/findmy_scene_config.c @@ -114,4 +114,4 @@ void findmy_scene_config_on_exit(void* context) { VariableItemList* var_item_list = app->var_item_list; variable_item_list_reset(var_item_list); -} \ No newline at end of file +} diff --git a/applications/system/findmy/scenes/findmy_scene_config_import.c b/applications/system/findmy/scenes/findmy_scene_config_import.c index 7b1fe27a3..90297e6b2 100644 --- a/applications/system/findmy/scenes/findmy_scene_config_import.c +++ b/applications/system/findmy/scenes/findmy_scene_config_import.c @@ -228,4 +228,4 @@ void findmy_scene_config_import_on_exit(void* context) { VariableItemList* var_item_list = app->var_item_list; variable_item_list_reset(var_item_list); -} \ No newline at end of file +} diff --git a/applications/system/findmy/scenes/findmy_scene_config_mac.c b/applications/system/findmy/scenes/findmy_scene_config_mac.c index 7f13b77d1..e14ef5e07 100644 --- a/applications/system/findmy/scenes/findmy_scene_config_mac.c +++ b/applications/system/findmy/scenes/findmy_scene_config_mac.c @@ -57,4 +57,4 @@ void findmy_scene_config_mac_on_exit(void* context) { byte_input_set_result_callback(app->byte_input, NULL, NULL, NULL, NULL, 0); byte_input_set_header_text(app->byte_input, ""); -} \ No newline at end of file +} diff --git a/applications/system/findmy/scenes/findmy_scene_config_packet.c b/applications/system/findmy/scenes/findmy_scene_config_packet.c index dc1985486..06e30856e 100644 --- a/applications/system/findmy/scenes/findmy_scene_config_packet.c +++ b/applications/system/findmy/scenes/findmy_scene_config_packet.c @@ -55,4 +55,4 @@ void findmy_scene_config_packet_on_exit(void* context) { byte_input_set_result_callback(app->byte_input, NULL, NULL, NULL, NULL, 0); byte_input_set_header_text(app->byte_input, ""); -} \ No newline at end of file +} diff --git a/applications/system/findmy/scenes/findmy_scene_config_tagtype.c b/applications/system/findmy/scenes/findmy_scene_config_tagtype.c index e43eea7f8..40f0b584b 100644 --- a/applications/system/findmy/scenes/findmy_scene_config_tagtype.c +++ b/applications/system/findmy/scenes/findmy_scene_config_tagtype.c @@ -67,4 +67,4 @@ void findmy_scene_config_tagtype_on_exit(void* context) { VariableItemList* var_item_list = app->var_item_list; variable_item_list_reset(var_item_list); -} \ No newline at end of file +} diff --git a/applications/system/findmy/scenes/findmy_scene_main.c b/applications/system/findmy/scenes/findmy_scene_main.c index 3af530701..a4e72bdf7 100644 --- a/applications/system/findmy/scenes/findmy_scene_main.c +++ b/applications/system/findmy/scenes/findmy_scene_main.c @@ -53,4 +53,4 @@ bool findmy_scene_main_on_event(void* context, SceneManagerEvent event) { void findmy_scene_main_on_exit(void* context) { FindMy* app = context; UNUSED(app); -} \ No newline at end of file +} diff --git a/applications/system/findmy/views/findmy_main.c b/applications/system/findmy/views/findmy_main.c index df30c82ec..bc89de975 100644 --- a/applications/system/findmy/views/findmy_main.c +++ b/applications/system/findmy/views/findmy_main.c @@ -190,4 +190,4 @@ void findmy_main_update_interval(FindMyMain* findmy_main, uint8_t interval) { void findmy_main_update_type(FindMyMain* findmy_main, FindMyType type) { furi_assert(findmy_main); with_view_model(findmy_main->view, FindMyMainModel * model, { model->type = type; }, true); -} \ No newline at end of file +} diff --git a/applications/system/findmy/views/findmy_main.h b/applications/system/findmy/views/findmy_main.h index a8d575cd4..5680fa641 100644 --- a/applications/system/findmy/views/findmy_main.h +++ b/applications/system/findmy/views/findmy_main.h @@ -29,4 +29,4 @@ void findmy_main_update_active(FindMyMain* findmy_main, bool active); void findmy_main_update_interval(FindMyMain* findmy_main, uint8_t interval); void findmy_main_toggle_mac(FindMyMain* findmy_main, bool show_mac); void findmy_main_update_mac(FindMyMain* findmy_main, uint8_t* mac); -void findmy_main_update_type(FindMyMain* findmy_main, FindMyType type); \ No newline at end of file +void findmy_main_update_type(FindMyMain* findmy_main, FindMyType type); diff --git a/applications/system/hid_app/views/hid_numpad.c b/applications/system/hid_app/views/hid_numpad.c index d78c291e0..b480e9678 100644 --- a/applications/system/hid_app/views/hid_numpad.c +++ b/applications/system/hid_app/views/hid_numpad.c @@ -38,12 +38,12 @@ typedef struct { int8_t y; } HidNumpadPoint; -#define MARGIN_TOP 32 -#define MARGIN_LEFT 1 -#define KEY_WIDTH 20 -#define KEY_HEIGHT 15 -#define KEY_PADDING 1 -#define ROW_COUNT 6 +#define MARGIN_TOP 32 +#define MARGIN_LEFT 1 +#define KEY_WIDTH 20 +#define KEY_HEIGHT 15 +#define KEY_PADDING 1 +#define ROW_COUNT 6 #define COLUMN_COUNT 3 const HidNumpadKey hid_numpad_keyset[ROW_COUNT][COLUMN_COUNT] = { diff --git a/applications/system/hid_app/views/hid_ptt_menu.h b/applications/system/hid_app/views/hid_ptt_menu.h index c6dc53d55..2defd0569 100644 --- a/applications/system/hid_app/views/hid_ptt_menu.h +++ b/applications/system/hid_app/views/hid_ptt_menu.h @@ -26,4 +26,4 @@ void ptt_menu_add_item_to_list( PushToTalkMenuItemCallback callback, void* callback_context); -void ptt_menu_add_list(HidPushToTalkMenu* hid_ptt_menu, const char* label, uint32_t index); \ No newline at end of file +void ptt_menu_add_list(HidPushToTalkMenu* hid_ptt_menu, const char* label, uint32_t index); diff --git a/applications/system/js_app/modules/js_blebeacon.c b/applications/system/js_app/modules/js_blebeacon.c index 7dc212b6a..1d79457c8 100644 --- a/applications/system/js_app/modules/js_blebeacon.c +++ b/applications/system/js_app/modules/js_blebeacon.c @@ -241,4 +241,4 @@ static const FlipperAppPluginDescriptor plugin_descriptor = { const FlipperAppPluginDescriptor* js_blebeacon_ep(void) { return &plugin_descriptor; -} \ No newline at end of file +} diff --git a/applications/system/js_app/modules/js_gpio.c b/applications/system/js_app/modules/js_gpio.c index ce65837b1..fb42bea2b 100644 --- a/applications/system/js_app/modules/js_gpio.c +++ b/applications/system/js_app/modules/js_gpio.c @@ -392,4 +392,4 @@ static const FlipperAppPluginDescriptor plugin_descriptor = { const FlipperAppPluginDescriptor* js_gpio_ep(void) { return &plugin_descriptor; -} \ No newline at end of file +} diff --git a/applications/system/js_app/modules/js_keyboard.c b/applications/system/js_app/modules/js_keyboard.c index 2c9041d60..240d99787 100644 --- a/applications/system/js_app/modules/js_keyboard.c +++ b/applications/system/js_app/modules/js_keyboard.c @@ -205,4 +205,4 @@ static const FlipperAppPluginDescriptor plugin_descriptor = { const FlipperAppPluginDescriptor* js_keyboard_ep(void) { return &plugin_descriptor; -} \ No newline at end of file +} diff --git a/applications/system/js_app/modules/js_subghz/radio_device_loader.c b/applications/system/js_app/modules/js_subghz/radio_device_loader.c index d2cffde58..0a45c2418 100644 --- a/applications/system/js_app/modules/js_subghz/radio_device_loader.c +++ b/applications/system/js_app/modules/js_subghz/radio_device_loader.c @@ -61,4 +61,4 @@ void radio_device_loader_end(const SubGhzDevice* radio_device) { if(radio_device != subghz_devices_get_by_name(SUBGHZ_DEVICE_CC1101_INT_NAME)) { subghz_devices_end(radio_device); } -} \ No newline at end of file +} diff --git a/applications/system/js_app/modules/js_subghz/radio_device_loader.h b/applications/system/js_app/modules/js_subghz/radio_device_loader.h index bee4e2c36..4f200ebc3 100644 --- a/applications/system/js_app/modules/js_subghz/radio_device_loader.h +++ b/applications/system/js_app/modules/js_subghz/radio_device_loader.h @@ -12,4 +12,4 @@ const SubGhzDevice* radio_device_loader_set( const SubGhzDevice* current_radio_device, SubGhzRadioDeviceType radio_device_type); -void radio_device_loader_end(const SubGhzDevice* radio_device); \ No newline at end of file +void radio_device_loader_end(const SubGhzDevice* radio_device); diff --git a/applications/system/js_app/modules/js_usbdisk/mass_storage_scsi.c b/applications/system/js_app/modules/js_usbdisk/mass_storage_scsi.c index c1efacf8e..83f8caaef 100644 --- a/applications/system/js_app/modules/js_usbdisk/mass_storage_scsi.c +++ b/applications/system/js_app/modules/js_usbdisk/mass_storage_scsi.c @@ -4,16 +4,16 @@ #define TAG "MassStorageSCSI" -#define SCSI_TEST_UNIT_READY (0x00) -#define SCSI_REQUEST_SENSE (0x03) -#define SCSI_INQUIRY (0x12) +#define SCSI_TEST_UNIT_READY (0x00) +#define SCSI_REQUEST_SENSE (0x03) +#define SCSI_INQUIRY (0x12) #define SCSI_READ_FORMAT_CAPACITIES (0x23) -#define SCSI_READ_CAPACITY_10 (0x25) -#define SCSI_MODE_SENSE_6 (0x1A) -#define SCSI_READ_10 (0x28) +#define SCSI_READ_CAPACITY_10 (0x25) +#define SCSI_MODE_SENSE_6 (0x1A) +#define SCSI_READ_10 (0x28) #define SCSI_PREVENT_MEDIUM_REMOVAL (0x1E) -#define SCSI_START_STOP_UNIT (0x1B) -#define SCSI_WRITE_10 (0x2A) +#define SCSI_START_STOP_UNIT (0x1B) +#define SCSI_WRITE_10 (0x2A) bool scsi_cmd_start(SCSISession* scsi, uint8_t* cmd, uint8_t len) { if(!len) { diff --git a/applications/system/js_app/modules/js_usbdisk/mass_storage_scsi.h b/applications/system/js_app/modules/js_usbdisk/mass_storage_scsi.h index a35d6aff3..56f4847a1 100644 --- a/applications/system/js_app/modules/js_usbdisk/mass_storage_scsi.h +++ b/applications/system/js_app/modules/js_usbdisk/mass_storage_scsi.h @@ -7,8 +7,8 @@ #define SCSI_SK_ILLEGAL_REQUEST (5) #define SCSI_ASC_INVALID_COMMAND_OPERATION_CODE (0x20) -#define SCSI_ASC_LBA_OOB (0x21) -#define SCSI_ASC_INVALID_FIELD_IN_CDB (0x24) +#define SCSI_ASC_LBA_OOB (0x21) +#define SCSI_ASC_INVALID_FIELD_IN_CDB (0x24) typedef struct { void* ctx; @@ -53,4 +53,4 @@ typedef struct { bool scsi_cmd_start(SCSISession* scsi, uint8_t* cmd, uint8_t len); bool scsi_cmd_rx_data(SCSISession* scsi, uint8_t* data, uint32_t len); bool scsi_cmd_tx_data(SCSISession* scsi, uint8_t* data, uint32_t* len, uint32_t cap); -bool scsi_cmd_end(SCSISession* scsi); \ No newline at end of file +bool scsi_cmd_end(SCSISession* scsi); diff --git a/applications/system/js_app/modules/js_usbdisk/mass_storage_usb.c b/applications/system/js_app/modules/js_usbdisk/mass_storage_usb.c index bae1b6654..1f1a46131 100644 --- a/applications/system/js_app/modules/js_usbdisk/mass_storage_usb.c +++ b/applications/system/js_app/modules/js_usbdisk/mass_storage_usb.c @@ -10,14 +10,14 @@ #define USB_MSC_TX_EP_SIZE (64UL) #define USB_MSC_BOT_GET_MAX_LUN (0xFE) -#define USB_MSC_BOT_RESET (0xFF) +#define USB_MSC_BOT_RESET (0xFF) -#define CBW_SIG (0x43425355) +#define CBW_SIG (0x43425355) #define CBW_FLAGS_DEVICE_TO_HOST (0x80) -#define CSW_SIG (0x53425355) -#define CSW_STATUS_OK (0) -#define CSW_STATUS_NOK (1) +#define CSW_SIG (0x53425355) +#define CSW_STATUS_OK (0) +#define CSW_STATUS_NOK (1) #define CSW_STATUS_PHASE_ERROR (2) // must be SCSI_BLOCK_SIZE aligned diff --git a/applications/system/js_app/modules/js_vgm/ICM42688P/ICM42688P.h b/applications/system/js_app/modules/js_vgm/ICM42688P/ICM42688P.h index b04fb9809..c060e84b2 100644 --- a/applications/system/js_app/modules/js_vgm/ICM42688P/ICM42688P.h +++ b/applications/system/js_app/modules/js_vgm/ICM42688P/ICM42688P.h @@ -124,4 +124,4 @@ bool icm42688_fifo_read(ICM42688P* icm42688p, ICM42688PFifoPacket* data); #ifdef __cplusplus } -#endif \ No newline at end of file +#endif diff --git a/applications/system/js_app/modules/js_vgm/ICM42688P/ICM42688P_regs.h b/applications/system/js_app/modules/js_vgm/ICM42688P/ICM42688P_regs.h index 1967534df..cad14542b 100644 --- a/applications/system/js_app/modules/js_vgm/ICM42688P/ICM42688P_regs.h +++ b/applications/system/js_app/modules/js_vgm/ICM42688P/ICM42688P_regs.h @@ -3,174 +3,174 @@ #define ICM42688_WHOAMI 0x47 // Bank 0 -#define ICM42688_DEVICE_CONFIG 0x11 -#define ICM42688_DRIVE_CONFIG 0x13 -#define ICM42688_INT_CONFIG 0x14 -#define ICM42688_FIFO_CONFIG 0x16 -#define ICM42688_TEMP_DATA1 0x1D -#define ICM42688_TEMP_DATA0 0x1E -#define ICM42688_ACCEL_DATA_X1 0x1F -#define ICM42688_ACCEL_DATA_X0 0x20 -#define ICM42688_ACCEL_DATA_Y1 0x21 -#define ICM42688_ACCEL_DATA_Y0 0x22 -#define ICM42688_ACCEL_DATA_Z1 0x23 -#define ICM42688_ACCEL_DATA_Z0 0x24 -#define ICM42688_GYRO_DATA_X1 0x25 -#define ICM42688_GYRO_DATA_X0 0x26 -#define ICM42688_GYRO_DATA_Y1 0x27 -#define ICM42688_GYRO_DATA_Y0 0x28 -#define ICM42688_GYRO_DATA_Z1 0x29 -#define ICM42688_GYRO_DATA_Z0 0x2A -#define ICM42688_TMST_FSYNCH 0x2B -#define ICM42688_TMST_FSYNCL 0x2C -#define ICM42688_INT_STATUS 0x2D -#define ICM42688_FIFO_COUNTH 0x2E -#define ICM42688_FIFO_COUNTL 0x2F -#define ICM42688_FIFO_DATA 0x30 -#define ICM42688_APEX_DATA0 0x31 -#define ICM42688_APEX_DATA1 0x32 -#define ICM42688_APEX_DATA2 0x33 -#define ICM42688_APEX_DATA3 0x34 -#define ICM42688_APEX_DATA4 0x35 -#define ICM42688_APEX_DATA5 0x36 -#define ICM42688_INT_STATUS2 0x37 -#define ICM42688_INT_STATUS3 0x38 -#define ICM42688_SIGNAL_PATH_RESET 0x4B -#define ICM42688_INTF_CONFIG0 0x4C -#define ICM42688_INTF_CONFIG1 0x4D -#define ICM42688_PWR_MGMT0 0x4E -#define ICM42688_GYRO_CONFIG0 0x4F -#define ICM42688_ACCEL_CONFIG0 0x50 -#define ICM42688_GYRO_CONFIG1 0x51 +#define ICM42688_DEVICE_CONFIG 0x11 +#define ICM42688_DRIVE_CONFIG 0x13 +#define ICM42688_INT_CONFIG 0x14 +#define ICM42688_FIFO_CONFIG 0x16 +#define ICM42688_TEMP_DATA1 0x1D +#define ICM42688_TEMP_DATA0 0x1E +#define ICM42688_ACCEL_DATA_X1 0x1F +#define ICM42688_ACCEL_DATA_X0 0x20 +#define ICM42688_ACCEL_DATA_Y1 0x21 +#define ICM42688_ACCEL_DATA_Y0 0x22 +#define ICM42688_ACCEL_DATA_Z1 0x23 +#define ICM42688_ACCEL_DATA_Z0 0x24 +#define ICM42688_GYRO_DATA_X1 0x25 +#define ICM42688_GYRO_DATA_X0 0x26 +#define ICM42688_GYRO_DATA_Y1 0x27 +#define ICM42688_GYRO_DATA_Y0 0x28 +#define ICM42688_GYRO_DATA_Z1 0x29 +#define ICM42688_GYRO_DATA_Z0 0x2A +#define ICM42688_TMST_FSYNCH 0x2B +#define ICM42688_TMST_FSYNCL 0x2C +#define ICM42688_INT_STATUS 0x2D +#define ICM42688_FIFO_COUNTH 0x2E +#define ICM42688_FIFO_COUNTL 0x2F +#define ICM42688_FIFO_DATA 0x30 +#define ICM42688_APEX_DATA0 0x31 +#define ICM42688_APEX_DATA1 0x32 +#define ICM42688_APEX_DATA2 0x33 +#define ICM42688_APEX_DATA3 0x34 +#define ICM42688_APEX_DATA4 0x35 +#define ICM42688_APEX_DATA5 0x36 +#define ICM42688_INT_STATUS2 0x37 +#define ICM42688_INT_STATUS3 0x38 +#define ICM42688_SIGNAL_PATH_RESET 0x4B +#define ICM42688_INTF_CONFIG0 0x4C +#define ICM42688_INTF_CONFIG1 0x4D +#define ICM42688_PWR_MGMT0 0x4E +#define ICM42688_GYRO_CONFIG0 0x4F +#define ICM42688_ACCEL_CONFIG0 0x50 +#define ICM42688_GYRO_CONFIG1 0x51 #define ICM42688_GYRO_ACCEL_CONFIG0 0x52 -#define ICM42688_ACCEL_CONFIG1 0x53 -#define ICM42688_TMST_CONFIG 0x54 -#define ICM42688_APEX_CONFIG0 0x56 -#define ICM42688_SMD_CONFIG 0x57 -#define ICM42688_FIFO_CONFIG1 0x5F -#define ICM42688_FIFO_CONFIG2 0x60 -#define ICM42688_FIFO_CONFIG3 0x61 -#define ICM42688_FSYNC_CONFIG 0x62 -#define ICM42688_INT_CONFIG0 0x63 -#define ICM42688_INT_CONFIG1 0x64 -#define ICM42688_INT_SOURCE0 0x65 -#define ICM42688_INT_SOURCE1 0x66 -#define ICM42688_INT_SOURCE3 0x68 -#define ICM42688_INT_SOURCE4 0x69 -#define ICM42688_FIFO_LOST_PKT0 0x6C -#define ICM42688_FIFO_LOST_PKT1 0x6D -#define ICM42688_SELF_TEST_CONFIG 0x70 -#define ICM42688_WHO_AM_I 0x75 -#define ICM42688_REG_BANK_SEL 0x76 +#define ICM42688_ACCEL_CONFIG1 0x53 +#define ICM42688_TMST_CONFIG 0x54 +#define ICM42688_APEX_CONFIG0 0x56 +#define ICM42688_SMD_CONFIG 0x57 +#define ICM42688_FIFO_CONFIG1 0x5F +#define ICM42688_FIFO_CONFIG2 0x60 +#define ICM42688_FIFO_CONFIG3 0x61 +#define ICM42688_FSYNC_CONFIG 0x62 +#define ICM42688_INT_CONFIG0 0x63 +#define ICM42688_INT_CONFIG1 0x64 +#define ICM42688_INT_SOURCE0 0x65 +#define ICM42688_INT_SOURCE1 0x66 +#define ICM42688_INT_SOURCE3 0x68 +#define ICM42688_INT_SOURCE4 0x69 +#define ICM42688_FIFO_LOST_PKT0 0x6C +#define ICM42688_FIFO_LOST_PKT1 0x6D +#define ICM42688_SELF_TEST_CONFIG 0x70 +#define ICM42688_WHO_AM_I 0x75 +#define ICM42688_REG_BANK_SEL 0x76 // Bank 1 -#define ICM42688_SENSOR_CONFIG0 0x03 -#define ICM42688_GYRO_CONFIG_STATIC2 0x0B -#define ICM42688_GYRO_CONFIG_STATIC3 0x0C -#define ICM42688_GYRO_CONFIG_STATIC4 0x0D -#define ICM42688_GYRO_CONFIG_STATIC5 0x0E -#define ICM42688_GYRO_CONFIG_STATIC6 0x0F -#define ICM42688_GYRO_CONFIG_STATIC7 0x10 -#define ICM42688_GYRO_CONFIG_STATIC8 0x11 -#define ICM42688_GYRO_CONFIG_STATIC9 0x12 +#define ICM42688_SENSOR_CONFIG0 0x03 +#define ICM42688_GYRO_CONFIG_STATIC2 0x0B +#define ICM42688_GYRO_CONFIG_STATIC3 0x0C +#define ICM42688_GYRO_CONFIG_STATIC4 0x0D +#define ICM42688_GYRO_CONFIG_STATIC5 0x0E +#define ICM42688_GYRO_CONFIG_STATIC6 0x0F +#define ICM42688_GYRO_CONFIG_STATIC7 0x10 +#define ICM42688_GYRO_CONFIG_STATIC8 0x11 +#define ICM42688_GYRO_CONFIG_STATIC9 0x12 #define ICM42688_GYRO_CONFIG_STATIC10 0x13 -#define ICM42688_XG_ST_DATA 0x5F -#define ICM42688_YG_ST_DATA 0x60 -#define ICM42688_ZG_ST_DATA 0x61 -#define ICM42688_TMSTVAL0 0x62 -#define ICM42688_TMSTVAL1 0x63 -#define ICM42688_TMSTVAL2 0x64 -#define ICM42688_INTF_CONFIG4 0x7A -#define ICM42688_INTF_CONFIG5 0x7B -#define ICM42688_INTF_CONFIG6 0x7C +#define ICM42688_XG_ST_DATA 0x5F +#define ICM42688_YG_ST_DATA 0x60 +#define ICM42688_ZG_ST_DATA 0x61 +#define ICM42688_TMSTVAL0 0x62 +#define ICM42688_TMSTVAL1 0x63 +#define ICM42688_TMSTVAL2 0x64 +#define ICM42688_INTF_CONFIG4 0x7A +#define ICM42688_INTF_CONFIG5 0x7B +#define ICM42688_INTF_CONFIG6 0x7C // Bank 2 #define ICM42688_ACCEL_CONFIG_STATIC2 0x03 #define ICM42688_ACCEL_CONFIG_STATIC3 0x04 #define ICM42688_ACCEL_CONFIG_STATIC4 0x05 -#define ICM42688_XA_ST_DATA 0x3B -#define ICM42688_YA_ST_DATA 0x3C -#define ICM42688_ZA_ST_DATA 0x3D +#define ICM42688_XA_ST_DATA 0x3B +#define ICM42688_YA_ST_DATA 0x3C +#define ICM42688_ZA_ST_DATA 0x3D // Bank 4 -#define ICM42688_APEX_CONFIG1 0x40 -#define ICM42688_APEX_CONFIG2 0x41 -#define ICM42688_APEX_CONFIG3 0x42 -#define ICM42688_APEX_CONFIG4 0x43 -#define ICM42688_APEX_CONFIG5 0x44 -#define ICM42688_APEX_CONFIG6 0x45 -#define ICM42688_APEX_CONFIG7 0x46 -#define ICM42688_APEX_CONFIG8 0x47 -#define ICM42688_APEX_CONFIG9 0x48 +#define ICM42688_APEX_CONFIG1 0x40 +#define ICM42688_APEX_CONFIG2 0x41 +#define ICM42688_APEX_CONFIG3 0x42 +#define ICM42688_APEX_CONFIG4 0x43 +#define ICM42688_APEX_CONFIG5 0x44 +#define ICM42688_APEX_CONFIG6 0x45 +#define ICM42688_APEX_CONFIG7 0x46 +#define ICM42688_APEX_CONFIG8 0x47 +#define ICM42688_APEX_CONFIG9 0x48 #define ICM42688_ACCEL_WOM_X_THR 0x4A #define ICM42688_ACCEL_WOM_Y_THR 0x4B #define ICM42688_ACCEL_WOM_Z_THR 0x4C -#define ICM42688_INT_SOURCE6 0x4D -#define ICM42688_INT_SOURCE7 0x4E -#define ICM42688_INT_SOURCE8 0x4F -#define ICM42688_INT_SOURCE9 0x50 -#define ICM42688_INT_SOURCE10 0x51 -#define ICM42688_OFFSET_USER0 0x77 -#define ICM42688_OFFSET_USER1 0x78 -#define ICM42688_OFFSET_USER2 0x79 -#define ICM42688_OFFSET_USER3 0x7A -#define ICM42688_OFFSET_USER4 0x7B -#define ICM42688_OFFSET_USER5 0x7C -#define ICM42688_OFFSET_USER6 0x7D -#define ICM42688_OFFSET_USER7 0x7E -#define ICM42688_OFFSET_USER8 0x7F +#define ICM42688_INT_SOURCE6 0x4D +#define ICM42688_INT_SOURCE7 0x4E +#define ICM42688_INT_SOURCE8 0x4F +#define ICM42688_INT_SOURCE9 0x50 +#define ICM42688_INT_SOURCE10 0x51 +#define ICM42688_OFFSET_USER0 0x77 +#define ICM42688_OFFSET_USER1 0x78 +#define ICM42688_OFFSET_USER2 0x79 +#define ICM42688_OFFSET_USER3 0x7A +#define ICM42688_OFFSET_USER4 0x7B +#define ICM42688_OFFSET_USER5 0x7C +#define ICM42688_OFFSET_USER6 0x7D +#define ICM42688_OFFSET_USER7 0x7E +#define ICM42688_OFFSET_USER8 0x7F // PWR_MGMT0 -#define ICM42688_PWR_TEMP_ON (0 << 5) -#define ICM42688_PWR_TEMP_OFF (1 << 5) -#define ICM42688_PWR_IDLE (1 << 4) -#define ICM42688_PWR_GYRO_MODE_OFF (0 << 2) -#define ICM42688_PWR_GYRO_MODE_LN (3 << 2) +#define ICM42688_PWR_TEMP_ON (0 << 5) +#define ICM42688_PWR_TEMP_OFF (1 << 5) +#define ICM42688_PWR_IDLE (1 << 4) +#define ICM42688_PWR_GYRO_MODE_OFF (0 << 2) +#define ICM42688_PWR_GYRO_MODE_LN (3 << 2) #define ICM42688_PWR_ACCEL_MODE_OFF (0 << 0) -#define ICM42688_PWR_ACCEL_MODE_LP (2 << 0) -#define ICM42688_PWR_ACCEL_MODE_LN (3 << 0) +#define ICM42688_PWR_ACCEL_MODE_LP (2 << 0) +#define ICM42688_PWR_ACCEL_MODE_LN (3 << 0) // GYRO_CONFIG0 -#define ICM42688_GFS_2000DPS (0x00 << 5) -#define ICM42688_GFS_1000DPS (0x01 << 5) -#define ICM42688_GFS_500DPS (0x02 << 5) -#define ICM42688_GFS_250DPS (0x03 << 5) -#define ICM42688_GFS_125DPS (0x04 << 5) -#define ICM42688_GFS_62_5DPS (0x05 << 5) -#define ICM42688_GFS_31_25DPS (0x06 << 5) +#define ICM42688_GFS_2000DPS (0x00 << 5) +#define ICM42688_GFS_1000DPS (0x01 << 5) +#define ICM42688_GFS_500DPS (0x02 << 5) +#define ICM42688_GFS_250DPS (0x03 << 5) +#define ICM42688_GFS_125DPS (0x04 << 5) +#define ICM42688_GFS_62_5DPS (0x05 << 5) +#define ICM42688_GFS_31_25DPS (0x06 << 5) #define ICM42688_GFS_15_625DPS (0x07 << 5) -#define ICM42688_GODR_32kHz 0x01 -#define ICM42688_GODR_16kHz 0x02 -#define ICM42688_GODR_8kHz 0x03 -#define ICM42688_GODR_4kHz 0x04 -#define ICM42688_GODR_2kHz 0x05 -#define ICM42688_GODR_1kHz 0x06 -#define ICM42688_GODR_200Hz 0x07 -#define ICM42688_GODR_100Hz 0x08 -#define ICM42688_GODR_50Hz 0x09 -#define ICM42688_GODR_25Hz 0x0A +#define ICM42688_GODR_32kHz 0x01 +#define ICM42688_GODR_16kHz 0x02 +#define ICM42688_GODR_8kHz 0x03 +#define ICM42688_GODR_4kHz 0x04 +#define ICM42688_GODR_2kHz 0x05 +#define ICM42688_GODR_1kHz 0x06 +#define ICM42688_GODR_200Hz 0x07 +#define ICM42688_GODR_100Hz 0x08 +#define ICM42688_GODR_50Hz 0x09 +#define ICM42688_GODR_25Hz 0x0A #define ICM42688_GODR_12_5Hz 0x0B -#define ICM42688_GODR_500Hz 0x0F +#define ICM42688_GODR_500Hz 0x0F // ACCEL_CONFIG0 #define ICM42688_AFS_16G (0x00 << 5) -#define ICM42688_AFS_8G (0x01 << 5) -#define ICM42688_AFS_4G (0x02 << 5) -#define ICM42688_AFS_2G (0x03 << 5) +#define ICM42688_AFS_8G (0x01 << 5) +#define ICM42688_AFS_4G (0x02 << 5) +#define ICM42688_AFS_2G (0x03 << 5) -#define ICM42688_AODR_32kHz 0x01 -#define ICM42688_AODR_16kHz 0x02 -#define ICM42688_AODR_8kHz 0x03 -#define ICM42688_AODR_4kHz 0x04 -#define ICM42688_AODR_2kHz 0x05 -#define ICM42688_AODR_1kHz 0x06 -#define ICM42688_AODR_200Hz 0x07 -#define ICM42688_AODR_100Hz 0x08 -#define ICM42688_AODR_50Hz 0x09 -#define ICM42688_AODR_25Hz 0x0A -#define ICM42688_AODR_12_5Hz 0x0B -#define ICM42688_AODR_6_25Hz 0x0C -#define ICM42688_AODR_3_125Hz 0x0D +#define ICM42688_AODR_32kHz 0x01 +#define ICM42688_AODR_16kHz 0x02 +#define ICM42688_AODR_8kHz 0x03 +#define ICM42688_AODR_4kHz 0x04 +#define ICM42688_AODR_2kHz 0x05 +#define ICM42688_AODR_1kHz 0x06 +#define ICM42688_AODR_200Hz 0x07 +#define ICM42688_AODR_100Hz 0x08 +#define ICM42688_AODR_50Hz 0x09 +#define ICM42688_AODR_25Hz 0x0A +#define ICM42688_AODR_12_5Hz 0x0B +#define ICM42688_AODR_6_25Hz 0x0C +#define ICM42688_AODR_3_125Hz 0x0D #define ICM42688_AODR_1_5625Hz 0x0E -#define ICM42688_AODR_500Hz 0x0F +#define ICM42688_AODR_500Hz 0x0F diff --git a/applications/system/js_app/modules/js_vgm/imu.c b/applications/system/js_app/modules/js_vgm/imu.c index 2b4cd98b8..eecab3f67 100644 --- a/applications/system/js_app/modules/js_vgm/imu.c +++ b/applications/system/js_app/modules/js_vgm/imu.c @@ -7,12 +7,12 @@ #define ACCEL_GYRO_RATE DataRate100Hz #define FILTER_SAMPLE_FREQ 100.f -#define FILTER_BETA 0.08f +#define FILTER_BETA 0.08f #define SAMPLE_RATE_DIV 5 #define SENSITIVITY_K 30.f -#define EXP_RATE 1.1f +#define EXP_RATE 1.1f #define IMU_CALI_AVG 64 @@ -325,4 +325,4 @@ float imu_roll_get(Imu* imu) { float imu_yaw_get(Imu* imu) { // we pretend that reading a float is an atomic operation return imu->thread->lefty ? -imu->thread->processed_data.yaw : imu->thread->processed_data.yaw; -} \ No newline at end of file +} diff --git a/applications/system/js_app/modules/js_vgm/imu.h b/applications/system/js_app/modules/js_vgm/imu.h index 42a08fe0c..5dba45241 100644 --- a/applications/system/js_app/modules/js_vgm/imu.h +++ b/applications/system/js_app/modules/js_vgm/imu.h @@ -12,4 +12,4 @@ float imu_pitch_get(Imu* imu); float imu_roll_get(Imu* imu); -float imu_yaw_get(Imu* imu); \ No newline at end of file +float imu_yaw_get(Imu* imu); diff --git a/lib/drivers/SK6805.c b/lib/drivers/SK6805.c index cbf9eded6..6aa3cda1d 100644 --- a/lib/drivers/SK6805.c +++ b/lib/drivers/SK6805.c @@ -29,7 +29,7 @@ #define DEBUG_INIT() \ furi_hal_gpio_init(DEBUG_PIN, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh) #define DEBUG_SET_HIGH() furi_hal_gpio_write(DEBUG_PIN, true) -#define DEBUG_SET_LOW() furi_hal_gpio_write(DEBUG_PIN, false) +#define DEBUG_SET_LOW() furi_hal_gpio_write(DEBUG_PIN, false) #else #define DEBUG_INIT() #define DEBUG_SET_HIGH() diff --git a/lib/drivers/rgb_backlight.c b/lib/drivers/rgb_backlight.c index d57d2df0f..1995c0d17 100644 --- a/lib/drivers/rgb_backlight.c +++ b/lib/drivers/rgb_backlight.c @@ -22,9 +22,9 @@ #include #include -#define RGB_BACKLIGHT_SETTINGS_MAGIC 0x15 +#define RGB_BACKLIGHT_SETTINGS_MAGIC 0x15 #define RGB_BACKLIGHT_SETTINGS_VERSION 6 -#define RGB_BACKLIGHT_SETTINGS_PATH CFG_PATH("rgb_backlight.settings") +#define RGB_BACKLIGHT_SETTINGS_PATH CFG_PATH("rgb_backlight.settings") static struct { RgbColor colors[SK6805_LED_COUNT]; diff --git a/lib/lfrfid/protocols/protocol_insta_fob.c b/lib/lfrfid/protocols/protocol_insta_fob.c index 2f4868ce6..ed7bf4a98 100644 --- a/lib/lfrfid/protocols/protocol_insta_fob.c +++ b/lib/lfrfid/protocols/protocol_insta_fob.c @@ -15,14 +15,14 @@ #define INSTAFOB_DECODED_DATA_SIZE_BYTES (8) #define INSTAFOB_ENCODED_DATA_SIZE_BYTES ((4 * 7) + 1) -#define INSTAFOB_ENCODED_DATA_SIZE_BITS ((8 * 4 * 7) + 1) -#define INSTAFOB_ENCODED_DATA_OFFSET (7) +#define INSTAFOB_ENCODED_DATA_SIZE_BITS ((8 * 4 * 7) + 1) +#define INSTAFOB_ENCODED_DATA_OFFSET (7) #define INSTAFOB_BLOCK1 (0x00107060) -#define LFRFID_FREQUENCY (125000) -#define INSTAFOB_CLOCK_PER_BIT (32) -#define INSTAFOB_READ_LONG_TIME_BASE (1000000 / (LFRFID_FREQUENCY / INSTAFOB_CLOCK_PER_BIT)) +#define LFRFID_FREQUENCY (125000) +#define INSTAFOB_CLOCK_PER_BIT (32) +#define INSTAFOB_READ_LONG_TIME_BASE (1000000 / (LFRFID_FREQUENCY / INSTAFOB_CLOCK_PER_BIT)) #define INSTAFOB_READ_SHORT_TIME_BASE (INSTAFOB_READ_LONG_TIME_BASE / 2) #define INSTAFOB_READ_SEQTERM_TIME_BASE \ (1000000 / (LFRFID_FREQUENCY * 32 / 50 / INSTAFOB_CLOCK_PER_BIT)) @@ -57,16 +57,16 @@ ProtocolInstaFob* protocol_insta_fob_alloc(void) { bit_lib_num_to_bytes_be(INSTAFOB_BLOCK1, 4, protocol->data); protocol->debug_string = furi_string_alloc(); return (void*)protocol; -}; +} void protocol_insta_fob_free(ProtocolInstaFob* protocol) { free(protocol->debug_string); free(protocol); -}; +} uint8_t* protocol_insta_fob_get_data(ProtocolInstaFob* protocol) { return protocol->data; -}; +} void protocol_insta_fob_decoder_start(ProtocolInstaFob* protocol) { memset(protocol->data, 0, INSTAFOB_DECODED_DATA_SIZE_BYTES); @@ -78,7 +78,7 @@ void protocol_insta_fob_decoder_start(ProtocolInstaFob* protocol) { NULL); protocol->encoded_polarity = false; protocol->encoded_term_state = ProtocolInstaFobSeqTermNone; -}; +} static const char* protocol_insta_fob_get_encoded_data(ProtocolInstaFob* protocol) { furi_string_reset(protocol->debug_string); @@ -87,7 +87,7 @@ static const char* protocol_insta_fob_get_encoded_data(ProtocolInstaFob* protoco protocol->debug_string, bit_lib_get_bit(protocol->encoded_data, i) ? "1" : "0"); } return furi_string_get_cstr(protocol->debug_string); -}; +} static bool protocol_insta_fob_can_be_decoded(ProtocolInstaFob* protocol) { return bit_lib_get_bits_32(protocol->encoded_data, INSTAFOB_ENCODED_DATA_OFFSET, 32) == @@ -96,11 +96,11 @@ static bool protocol_insta_fob_can_be_decoded(ProtocolInstaFob* protocol) { static void protocol_insta_fob_decode(ProtocolInstaFob* protocol) { bit_lib_copy_bits(protocol->data, 0, 64, protocol->encoded_data, INSTAFOB_ENCODED_DATA_OFFSET); -}; +} static bool protocol_insta_fob_in_range(uint32_t value, uint32_t base, uint32_t jitter) { return (value > (base - jitter)) && (value < (base + jitter)); -}; +} static ManchesterEvent protocol_insta_fob_manchester_event(bool level, uint32_t duration_us) { ManchesterEvent event = ManchesterEventReset; @@ -122,12 +122,12 @@ static ManchesterEvent protocol_insta_fob_manchester_event(bool level, uint32_t } return event; -}; +} static bool protocol_insta_fob_is_sequence_terminator(uint32_t duration_us) { return protocol_insta_fob_in_range( duration_us, INSTAFOB_READ_SEQTERM_TIME_BASE, INSTAFOB_READ_JITTER_TIME_BASE); -}; +} static bool protocol_insta_fob_decoder_seq_terminator( ProtocolInstaFob* protocol, @@ -221,7 +221,7 @@ bool protocol_insta_fob_decoder_feed(ProtocolInstaFob* protocol, bool level, uin } return decoded_signal; -}; +} bool protocol_insta_fob_encoder_start(ProtocolInstaFob* protocol) { uint32_t block1 = bit_lib_get_bits_32(protocol->data, 0, 32); @@ -301,7 +301,7 @@ LevelDuration protocol_insta_fob_encoder_yield(ProtocolInstaFob* protocol) { } return level_duration_make(level, duration_cycles); -}; +} void protocol_insta_fob_render_data(ProtocolInstaFob* protocol, FuriString* result) { furi_string_printf( @@ -309,7 +309,7 @@ void protocol_insta_fob_render_data(ProtocolInstaFob* protocol, FuriString* resu "InstaFob\nBlk[1]: %08lX\nBlk[2]: %08lX", bit_lib_get_bits_32(protocol->data, 0, 32), bit_lib_get_bits_32(protocol->data, 32, 32)); -}; +} void protocol_insta_fob_render_brief_data(ProtocolInstaFob* protocol, FuriString* result) { furi_string_printf( @@ -317,7 +317,7 @@ void protocol_insta_fob_render_brief_data(ProtocolInstaFob* protocol, FuriString "Fob %08lX %08lX", bit_lib_get_bits_32(protocol->data, 0, 32), bit_lib_get_bits_32(protocol->data, 32, 32)); -}; +} bool protocol_insta_fob_write_data(ProtocolInstaFob* protocol, void* data) { LFRFIDWriteRequest* request = (LFRFIDWriteRequest*)data; @@ -347,7 +347,7 @@ bool protocol_insta_fob_write_data(ProtocolInstaFob* protocol, void* data) { request->t5577.block[2]); } return result; -}; +} const ProtocolBase protocol_insta_fob = { .name = "InstaFob", diff --git a/lib/lfrfid/protocols/protocol_insta_fob.h b/lib/lfrfid/protocols/protocol_insta_fob.h index f4419e496..9bf05ae74 100644 --- a/lib/lfrfid/protocols/protocol_insta_fob.h +++ b/lib/lfrfid/protocols/protocol_insta_fob.h @@ -1,4 +1,4 @@ #pragma once #include -extern const ProtocolBase protocol_insta_fob; \ No newline at end of file +extern const ProtocolBase protocol_insta_fob; diff --git a/lib/momentum/momentum.h b/lib/momentum/momentum.h index ba87fb750..342110bea 100644 --- a/lib/momentum/momentum.h +++ b/lib/momentum/momentum.h @@ -12,9 +12,9 @@ extern "C" { #endif #define MOMENTUM_SETTINGS_PATH CFG_PATH("momentum_settings.txt") -#define ASSET_PACKS_PATH EXT_PATH("asset_packs") -#define MAINMENU_APPS_PATH CFG_PATH("mainmenu_apps.txt") -#define ASSET_PACKS_NAME_LEN 32 +#define ASSET_PACKS_PATH EXT_PATH("asset_packs") +#define MAINMENU_APPS_PATH CFG_PATH("mainmenu_apps.txt") +#define ASSET_PACKS_NAME_LEN 32 typedef enum { BatteryIconOff, diff --git a/lib/momentum/namespoof.h b/lib/momentum/namespoof.h index 70d3ed9fe..49bb51a6a 100644 --- a/lib/momentum/namespoof.h +++ b/lib/momentum/namespoof.h @@ -1,7 +1,7 @@ #pragma once -#define NAMESPOOF_HEADER "Flipper Name File" +#define NAMESPOOF_HEADER "Flipper Name File" #define NAMESPOOF_VERSION 1 -#define NAMESPOOF_PATH EXT_PATH("dolphin/name.txt") +#define NAMESPOOF_PATH EXT_PATH("dolphin/name.txt") void namespoof_init(void); diff --git a/lib/momentum/settings.c b/lib/momentum/settings.c index c8b6540c0..3e4650140 100644 --- a/lib/momentum/settings.c +++ b/lib/momentum/settings.c @@ -68,13 +68,13 @@ static const struct { uint8_t u_sz; }; }; -#define setting(t, n) .type = momentum_settings_type##t, .key = #n, .val = &momentum_settings.n -#define setting_str(n) setting(_str, n), .str_len = sizeof(momentum_settings.n) -#define num(t, n, min, max) .t##_min = min, .t##_max = max, .t##_sz = sizeof(momentum_settings.n) -#define setting_int(n, min, max) setting(_int, n), num(i, n, min, max) +#define setting(t, n) .type = momentum_settings_type##t, .key = #n, .val = &momentum_settings.n +#define setting_str(n) setting(_str, n), .str_len = sizeof(momentum_settings.n) +#define num(t, n, min, max) .t##_min = min, .t##_max = max, .t##_sz = sizeof(momentum_settings.n) +#define setting_int(n, min, max) setting(_int, n), num(i, n, min, max) #define setting_uint(n, min, max) setting(_uint, n), num(u, n, min, max) -#define setting_enum(n, cnt) setting_uint(n, 0, cnt - 1) -#define setting_bool(n) setting(_bool, n) +#define setting_enum(n, cnt) setting_uint(n, 0, cnt - 1) +#define setting_bool(n) setting(_bool, n) } momentum_settings_entries[] = { {setting_str(asset_pack)}, {setting_uint(anim_speed, 25, 300)}, diff --git a/lib/nfc/helpers/iso14443_4_layer.c b/lib/nfc/helpers/iso14443_4_layer.c index 044b569d6..933612df8 100644 --- a/lib/nfc/helpers/iso14443_4_layer.c +++ b/lib/nfc/helpers/iso14443_4_layer.c @@ -7,16 +7,16 @@ #define ISO14443_4_BLOCK_PCB_R (5U << 5) #define ISO14443_4_BLOCK_PCB_S (3U << 6) -#define ISO14443_4_BLOCK_PCB_I_ (0U << 6) -#define ISO14443_4_BLOCK_PCB_R_ (2U << 6) +#define ISO14443_4_BLOCK_PCB_I_ (0U << 6) +#define ISO14443_4_BLOCK_PCB_R_ (2U << 6) #define ISO14443_4_BLOCK_PCB_TYPE_MASK (3U << 6) -#define ISO14443_4_BLOCK_PCB_S_DESELECT (0U << 4) -#define ISO14443_4_BLOCK_PCB_S_WTX (3U << 4) +#define ISO14443_4_BLOCK_PCB_S_DESELECT (0U << 4) +#define ISO14443_4_BLOCK_PCB_S_WTX (3U << 4) #define ISO14443_4_BLOCK_PCB_BLOCK_NUMBER (1U << 0) -#define ISO14443_4_BLOCK_PCB_NAD (1U << 2) -#define ISO14443_4_BLOCK_PCB_CID (1U << 3) +#define ISO14443_4_BLOCK_PCB_NAD (1U << 2) +#define ISO14443_4_BLOCK_PCB_CID (1U << 3) #define ISO14443_4_BLOCK_PCB_CHAINING (1U << 4) struct Iso14443_4Layer { diff --git a/lib/nfc/protocols/emv/emv.c b/lib/nfc/protocols/emv/emv.c index cfdad3c6e..1b572e66d 100644 --- a/lib/nfc/protocols/emv/emv.c +++ b/lib/nfc/protocols/emv/emv.c @@ -213,4 +213,4 @@ Iso14443_4aData* emv_get_base_data(const EmvData* data) { furi_assert(data); return data->iso14443_4a_data; -} \ No newline at end of file +} diff --git a/lib/nfc/protocols/emv/emv.h b/lib/nfc/protocols/emv/emv.h index 638e93ddc..79a22ade1 100644 --- a/lib/nfc/protocols/emv/emv.h +++ b/lib/nfc/protocols/emv/emv.h @@ -12,44 +12,44 @@ extern "C" { #define UNKNOWN_TAG 0x0B -#define EMV_TAG_AID 0x4F -#define EMV_TAG_PRIORITY 0x87 +#define EMV_TAG_AID 0x4F +#define EMV_TAG_PRIORITY 0x87 #define EMV_TAG_APPL_INTERCHANGE_PROFILE 0x82 -#define EMV_TAG_PDOL 0x9F38 -#define EMV_TAG_APPL_LABEL 0x50 -#define EMV_TAG_APPL_NAME 0x9F12 -#define EMV_TAG_APPL_EFFECTIVE 0x5F25 -#define EMV_TAG_PIN_TRY_COUNTER 0x9F17 -#define EMV_TAG_LOG_ENTRY 0x9F4D -#define EMV_TAG_LOG_FMT 0x9F4F +#define EMV_TAG_PDOL 0x9F38 +#define EMV_TAG_APPL_LABEL 0x50 +#define EMV_TAG_APPL_NAME 0x9F12 +#define EMV_TAG_APPL_EFFECTIVE 0x5F25 +#define EMV_TAG_PIN_TRY_COUNTER 0x9F17 +#define EMV_TAG_LOG_ENTRY 0x9F4D +#define EMV_TAG_LOG_FMT 0x9F4F #define EMV_TAG_LAST_ONLINE_ATC 0x9F13 -#define EMV_TAG_ATC 0x9F36 -#define EMV_TAG_LOG_AMOUNT 0x9F02 -#define EMV_TAG_LOG_COUNTRY 0x9F1A -#define EMV_TAG_LOG_CURRENCY 0x5F2A -#define EMV_TAG_LOG_DATE 0x9A -#define EMV_TAG_LOG_TIME 0x9F21 +#define EMV_TAG_ATC 0x9F36 +#define EMV_TAG_LOG_AMOUNT 0x9F02 +#define EMV_TAG_LOG_COUNTRY 0x9F1A +#define EMV_TAG_LOG_CURRENCY 0x5F2A +#define EMV_TAG_LOG_DATE 0x9A +#define EMV_TAG_LOG_TIME 0x9F21 -#define EMV_TAG_TRACK_1_EQUIV 0x56 -#define EMV_TAG_TRACK_2_EQUIV 0x57 -#define EMV_TAG_PAN 0x5A -#define EMV_TAG_AFL 0x94 -#define EMV_TAG_EXP_DATE 0x5F24 -#define EMV_TAG_COUNTRY_CODE 0x5F28 -#define EMV_TAG_CURRENCY_CODE 0x9F42 -#define EMV_TAG_CARDHOLDER_NAME 0x5F20 +#define EMV_TAG_TRACK_1_EQUIV 0x56 +#define EMV_TAG_TRACK_2_EQUIV 0x57 +#define EMV_TAG_PAN 0x5A +#define EMV_TAG_AFL 0x94 +#define EMV_TAG_EXP_DATE 0x5F24 +#define EMV_TAG_COUNTRY_CODE 0x5F28 +#define EMV_TAG_CURRENCY_CODE 0x9F42 +#define EMV_TAG_CARDHOLDER_NAME 0x5F20 #define EMV_TAG_CARDHOLDER_NAME_EXTENDED 0x9F0B -#define EMV_TAG_TRACK_2_DATA 0x9F6B -#define EMV_TAG_GPO_FMT1 0x80 +#define EMV_TAG_TRACK_2_DATA 0x9F6B +#define EMV_TAG_GPO_FMT1 0x80 -#define EMV_TAG_RESP_BUF_SIZE 0x6C +#define EMV_TAG_RESP_BUF_SIZE 0x6C #define EMV_TAG_RESP_BYTES_AVAILABLE 0x61 // Not used tags -#define EMV_TAG_FORM_FACTOR 0x9F6E -#define EMV_TAG_APP_TEMPLATE 0x61 -#define EMV_TAG_FCI 0xBF0C +#define EMV_TAG_FORM_FACTOR 0x9F6E +#define EMV_TAG_APP_TEMPLATE 0x61 +#define EMV_TAG_FCI 0xBF0C #define EMV_TAG_DEPOSIT_LOG_ENTRY 0xDF4D typedef struct { diff --git a/lib/nfc/protocols/emv/emv_poller.c b/lib/nfc/protocols/emv/emv_poller.c index 3042352fe..42c9c513c 100644 --- a/lib/nfc/protocols/emv/emv_poller.c +++ b/lib/nfc/protocols/emv/emv_poller.c @@ -203,4 +203,4 @@ const NfcPollerBase emv_poller = { .run = (NfcPollerRun)emv_poller_run, .detect = (NfcPollerDetect)emv_poller_detect, .get_data = (NfcPollerGetData)emv_poller_get_data, -}; \ No newline at end of file +}; diff --git a/lib/nfc/protocols/emv/emv_poller.h b/lib/nfc/protocols/emv/emv_poller.h index 9cae80195..9cc632a0f 100644 --- a/lib/nfc/protocols/emv/emv_poller.h +++ b/lib/nfc/protocols/emv/emv_poller.h @@ -56,4 +56,4 @@ EmvError emv_poller_get_last_online_atc(EmvPoller* instance); #ifdef __cplusplus } -#endif \ No newline at end of file +#endif diff --git a/lib/nfc/protocols/emv/emv_poller_defs.h b/lib/nfc/protocols/emv/emv_poller_defs.h index 001910112..4c9bf692d 100644 --- a/lib/nfc/protocols/emv/emv_poller_defs.h +++ b/lib/nfc/protocols/emv/emv_poller_defs.h @@ -2,4 +2,4 @@ #include -extern const NfcPollerBase emv_poller; \ No newline at end of file +extern const NfcPollerBase emv_poller; diff --git a/lib/subghz/blocks/custom_btn.h b/lib/subghz/blocks/custom_btn.h index 49b66b61c..67f10a08d 100644 --- a/lib/subghz/blocks/custom_btn.h +++ b/lib/subghz/blocks/custom_btn.h @@ -9,10 +9,10 @@ extern "C" { #endif // Default btn ID -#define SUBGHZ_CUSTOM_BTN_OK (0U) -#define SUBGHZ_CUSTOM_BTN_UP (1U) -#define SUBGHZ_CUSTOM_BTN_DOWN (2U) -#define SUBGHZ_CUSTOM_BTN_LEFT (3U) +#define SUBGHZ_CUSTOM_BTN_OK (0U) +#define SUBGHZ_CUSTOM_BTN_UP (1U) +#define SUBGHZ_CUSTOM_BTN_DOWN (2U) +#define SUBGHZ_CUSTOM_BTN_LEFT (3U) #define SUBGHZ_CUSTOM_BTN_RIGHT (4U) bool subghz_custom_btn_set(uint8_t btn_id); diff --git a/lib/subghz/blocks/custom_btn_i.h b/lib/subghz/blocks/custom_btn_i.h index b800d7079..3c3b590f6 100644 --- a/lib/subghz/blocks/custom_btn_i.h +++ b/lib/subghz/blocks/custom_btn_i.h @@ -2,10 +2,10 @@ #include "custom_btn.h" -#define PROG_MODE_OFF (0U) -#define PROG_MODE_KEELOQ_BFT (1U) +#define PROG_MODE_OFF (0U) +#define PROG_MODE_KEELOQ_BFT (1U) #define PROG_MODE_KEELOQ_APRIMATIC (2U) -#define PROG_MODE_KEELOQ_DEA_MIO (3U) +#define PROG_MODE_KEELOQ_DEA_MIO (3U) typedef uint8_t ProgMode; diff --git a/lib/subghz/blocks/generic_i.h b/lib/subghz/blocks/generic_i.h index 4d9553e50..99838a366 100644 --- a/lib/subghz/blocks/generic_i.h +++ b/lib/subghz/blocks/generic_i.h @@ -12,4 +12,4 @@ SubGhzProtocolStatus subghz_block_generic_serialize_common( const char* protocol_name, FlipperFormat* flipper_format, - SubGhzRadioPreset* preset); \ No newline at end of file + SubGhzRadioPreset* preset); diff --git a/lib/subghz/devices/cc1101_configs.c b/lib/subghz/devices/cc1101_configs.c index 6b5b9f1f7..a75842589 100644 --- a/lib/subghz/devices/cc1101_configs.c +++ b/lib/subghz/devices/cc1101_configs.c @@ -479,4 +479,4 @@ const uint8_t subghz_device_cc1101_preset_gfsk_9_99kb_async_regs[] = { // 0x00, // 0x00, // 0x00, -// 0x00}; \ No newline at end of file +// 0x00}; diff --git a/lib/subghz/protocols/acurite_592txr.h b/lib/subghz/protocols/acurite_592txr.h index 08dcbc617..bddbcd1a2 100644 --- a/lib/subghz/protocols/acurite_592txr.h +++ b/lib/subghz/protocols/acurite_592txr.h @@ -85,4 +85,4 @@ bool ws_protocol_encoder_acurite_592txr_get_upload(WSProtocolEncoderAcurite_592T SubGhzProtocolStatus ws_protocol_encoder_acurite_592txr_deserialize(void* context, FlipperFormat* flipper_format); LevelDuration ws_protocol_encoder_acurite_592txr_yield(void* context); -void ws_protocol_encoder_acurite_592txr_stop(void* context); \ No newline at end of file +void ws_protocol_encoder_acurite_592txr_stop(void* context); diff --git a/lib/subghz/protocols/ambient_weather.c b/lib/subghz/protocols/ambient_weather.c index c010a38fc..a0f2c5f2f 100644 --- a/lib/subghz/protocols/ambient_weather.c +++ b/lib/subghz/protocols/ambient_weather.c @@ -31,8 +31,8 @@ * and on decoding also 0xffd45 */ -#define AMBIENT_WEATHER_PACKET_HEADER_1 0xFFD440000000000 //0xffd45 .. 0xffd46 -#define AMBIENT_WEATHER_PACKET_HEADER_2 0x001440000000000 //0x00145 .. 0x00146 +#define AMBIENT_WEATHER_PACKET_HEADER_1 0xFFD440000000000 //0xffd45 .. 0xffd46 +#define AMBIENT_WEATHER_PACKET_HEADER_2 0x001440000000000 //0x00145 .. 0x00146 #define AMBIENT_WEATHER_PACKET_HEADER_MASK 0xFFFFC0000000000 static const SubGhzBlockConst ws_protocol_ambient_weather_const = { diff --git a/lib/subghz/protocols/lacrosse_tx.c b/lib/subghz/protocols/lacrosse_tx.c index 07f75f818..be17f461d 100644 --- a/lib/subghz/protocols/lacrosse_tx.c +++ b/lib/subghz/protocols/lacrosse_tx.c @@ -35,12 +35,12 @@ * - Temperature and Humidity are sent in different messages bursts. */ -#define LACROSSE_TX_GAP 1000 -#define LACROSSE_TX_BIT_SIZE 44 -#define LACROSSE_TX_SUNC_PATTERN 0x0A000000000 -#define LACROSSE_TX_SUNC_MASK 0x0F000000000 +#define LACROSSE_TX_GAP 1000 +#define LACROSSE_TX_BIT_SIZE 44 +#define LACROSSE_TX_SUNC_PATTERN 0x0A000000000 +#define LACROSSE_TX_SUNC_MASK 0x0F000000000 #define LACROSSE_TX_MSG_TYPE_TEMP 0x00 -#define LACROSSE_TX_MSG_TYPE_HUM 0x0E +#define LACROSSE_TX_MSG_TYPE_HUM 0x0E static const SubGhzBlockConst ws_protocol_lacrosse_tx_const = { .te_short = 550, diff --git a/lib/subghz/protocols/oregon2.c b/lib/subghz/protocols/oregon2.c index 1e3a83a45..2bd7de16e 100644 --- a/lib/subghz/protocols/oregon2.c +++ b/lib/subghz/protocols/oregon2.c @@ -20,7 +20,7 @@ static const SubGhzBlockConst ws_oregon2_const = { #define OREGON2_PREAMBLE_BITS 19 #define OREGON2_PREAMBLE_MASK 0b1111111111111111111 -#define OREGON2_SENSOR_ID(d) (((d) >> 16) & 0xFFFF) +#define OREGON2_SENSOR_ID(d) (((d) >> 16) & 0xFFFF) #define OREGON2_CHECKSUM_BITS 8 // 15 ones + 0101 (inverted A) @@ -32,34 +32,34 @@ static const SubGhzBlockConst ws_oregon2_const = { /// Documentation for Oregon Scientific protocols can be found here: /// http://wmrx00.sourceforge.net/Arduino/OregonScientific-RF-Protocols.pdf // Sensors ID -#define ID_THGR122N 0x1d20 -#define ID_THGR968 0x1d30 -#define ID_BTHR918 0x5d50 -#define ID_BHTR968 0x5d60 -#define ID_RGR968 0x2d10 -#define ID_THR228N 0xec40 -#define ID_THN132N 0xec40 // same as THR228N but different packet size -#define ID_RTGN318 0x0cc3 // warning: id is from 0x0cc3 and 0xfcc3 -#define ID_RTGN129 0x0cc3 // same as RTGN318 but different packet size -#define ID_THGR810 0xf824 // This might be ID_THGR81, but what's true is lost in (git) history -#define ID_THGR810a 0xf8b4 // unconfirmed version -#define ID_THN802 0xc844 -#define ID_PCR800 0x2914 -#define ID_PCR800a 0x2d14 // Different PCR800 ID - AU version I think -#define ID_WGR800 0x1984 -#define ID_WGR800a 0x1994 // unconfirmed version -#define ID_WGR968 0x3d00 -#define ID_UV800 0xd874 -#define ID_THN129 0xcc43 // THN129 Temp only -#define ID_RTHN129 0x0cd3 // RTHN129 Temp, clock sensors -#define ID_RTHN129_1 0x9cd3 -#define ID_RTHN129_2 0xacd3 -#define ID_RTHN129_3 0xbcd3 -#define ID_RTHN129_4 0xccd3 -#define ID_RTHN129_5 0xdcd3 -#define ID_BTHGN129 0x5d53 // Baro, Temp, Hygro sensor -#define ID_UVR128 0xec70 -#define ID_THGR328N 0xcc23 // Temp & Hygro sensor similar to THR228N with 5 channel instead of 3 +#define ID_THGR122N 0x1d20 +#define ID_THGR968 0x1d30 +#define ID_BTHR918 0x5d50 +#define ID_BHTR968 0x5d60 +#define ID_RGR968 0x2d10 +#define ID_THR228N 0xec40 +#define ID_THN132N 0xec40 // same as THR228N but different packet size +#define ID_RTGN318 0x0cc3 // warning: id is from 0x0cc3 and 0xfcc3 +#define ID_RTGN129 0x0cc3 // same as RTGN318 but different packet size +#define ID_THGR810 0xf824 // This might be ID_THGR81, but what's true is lost in (git) history +#define ID_THGR810a 0xf8b4 // unconfirmed version +#define ID_THN802 0xc844 +#define ID_PCR800 0x2914 +#define ID_PCR800a 0x2d14 // Different PCR800 ID - AU version I think +#define ID_WGR800 0x1984 +#define ID_WGR800a 0x1994 // unconfirmed version +#define ID_WGR968 0x3d00 +#define ID_UV800 0xd874 +#define ID_THN129 0xcc43 // THN129 Temp only +#define ID_RTHN129 0x0cd3 // RTHN129 Temp, clock sensors +#define ID_RTHN129_1 0x9cd3 +#define ID_RTHN129_2 0xacd3 +#define ID_RTHN129_3 0xbcd3 +#define ID_RTHN129_4 0xccd3 +#define ID_RTHN129_5 0xdcd3 +#define ID_BTHGN129 0x5d53 // Baro, Temp, Hygro sensor +#define ID_UVR128 0xec70 +#define ID_THGR328N 0xcc23 // Temp & Hygro sensor similar to THR228N with 5 channel instead of 3 #define ID_RTGR328N_1 0xdcc3 // RTGR328N_[1-5] RFclock(date &time)&Temp&Hygro sensor #define ID_RTGR328N_2 0xccc3 #define ID_RTGR328N_3 0xbcc3 diff --git a/lib/subghz/protocols/oregon3.c b/lib/subghz/protocols/oregon3.c index 3688ecaf8..f70f5ce4a 100644 --- a/lib/subghz/protocols/oregon3.c +++ b/lib/subghz/protocols/oregon3.c @@ -21,7 +21,7 @@ static const SubGhzBlockConst ws_oregon3_const = { #define OREGON3_PREAMBLE_BITS 28 #define OREGON3_PREAMBLE_MASK 0b1111111111111111111111111111 // 24 ones + 0101 (inverted A) -#define OREGON3_PREAMBLE 0b1111111111111111111111110101 +#define OREGON3_PREAMBLE 0b1111111111111111111111110101 // Fixed part contains: // - Sensor type: 16 bits @@ -29,8 +29,8 @@ static const SubGhzBlockConst ws_oregon3_const = { // - ID (changes when batteries are changed): 8 bits // - Battery status: 4 bits #define OREGON3_FIXED_PART_BITS (16 + 4 + 8 + 4) -#define OREGON3_SENSOR_ID(d) (((d) >> 16) & 0xFFFF) -#define OREGON3_CHECKSUM_BITS 8 +#define OREGON3_SENSOR_ID(d) (((d) >> 16) & 0xFFFF) +#define OREGON3_CHECKSUM_BITS 8 // bit indicating the low battery #define OREGON3_FLAG_BAT_LOW 0x4 diff --git a/lib/subghz/protocols/pcsg_generic.h b/lib/subghz/protocols/pcsg_generic.h index 1861d71e1..d5304ae03 100644 --- a/lib/subghz/protocols/pcsg_generic.h +++ b/lib/subghz/protocols/pcsg_generic.h @@ -37,4 +37,4 @@ SubGhzProtocolStatus #ifdef __cplusplus } -#endif \ No newline at end of file +#endif diff --git a/lib/subghz/protocols/pocsag.c b/lib/subghz/protocols/pocsag.c index 0eaca9e9c..a54847402 100644 --- a/lib/subghz/protocols/pocsag.c +++ b/lib/subghz/protocols/pocsag.c @@ -22,15 +22,15 @@ static const SubGhzBlockConst pocsag2400_const = { }; // Minimal amount of sync bits (interleaving zeros and ones) -#define POCSAG_MIN_SYNC_BITS 24 -#define POCSAG_CW_BITS 32 -#define POCSAG_CW_MASK 0xFFFFFFFF +#define POCSAG_MIN_SYNC_BITS 24 +#define POCSAG_CW_BITS 32 +#define POCSAG_CW_MASK 0xFFFFFFFF #define POCSAG_FRAME_SYNC_CODE 0x7CD215D8 -#define POCSAG_IDLE_CODE_WORD 0x7A89C197 +#define POCSAG_IDLE_CODE_WORD 0x7A89C197 -#define POCSAG_FUNC_NUM 0 -#define POCSAG_FUNC_ALERT1 1 -#define POCSAG_FUNC_ALERT2 2 +#define POCSAG_FUNC_NUM 0 +#define POCSAG_FUNC_ALERT1 1 +#define POCSAG_FUNC_ALERT2 2 #define POCSAG_FUNC_ALPHANUM 3 static const char* func_msg[] = {"\e#Num:\e# ", "\e#Alert\e#", "\e#Alert:\e# ", "\e#Msg:\e# "}; diff --git a/lib/subghz/protocols/schrader_gg4.c b/lib/subghz/protocols/schrader_gg4.c index 5c31a0164..93d510703 100644 --- a/lib/subghz/protocols/schrader_gg4.c +++ b/lib/subghz/protocols/schrader_gg4.c @@ -40,7 +40,7 @@ Data layout: - C: 8 bit Checksum (CRC8, Poly 0x7, Init 0x0) */ -#define PREAMBLE 0b000 +#define PREAMBLE 0b000 #define PREAMBLE_BITS_LEN 3 static const SubGhzBlockConst tpms_protocol_schrader_gg4_const = { diff --git a/lib/subghz/protocols/tpms_generic.c b/lib/subghz/protocols/tpms_generic.c index f14952ac3..54604f783 100644 --- a/lib/subghz/protocols/tpms_generic.c +++ b/lib/subghz/protocols/tpms_generic.c @@ -165,4 +165,4 @@ SubGhzProtocolStatus tpms_block_generic_deserialize_check_count_bit( } } while(false); return ret; -} \ No newline at end of file +} diff --git a/lib/subghz/protocols/tpms_generic.h b/lib/subghz/protocols/tpms_generic.h index 2f5720064..410f3f773 100644 --- a/lib/subghz/protocols/tpms_generic.h +++ b/lib/subghz/protocols/tpms_generic.h @@ -61,4 +61,4 @@ SubGhzProtocolStatus tpms_block_generic_deserialize_check_count_bit( #ifdef __cplusplus } -#endif \ No newline at end of file +#endif diff --git a/lib/subghz/protocols/ws_generic.c b/lib/subghz/protocols/ws_generic.c index e8baebf2f..a29c00b31 100644 --- a/lib/subghz/protocols/ws_generic.c +++ b/lib/subghz/protocols/ws_generic.c @@ -234,4 +234,4 @@ void ws_block_generic_get_string(WSBlockGeneric* instance, FuriString* output) { if(instance->humidity != WS_NO_HUMIDITY) { furi_string_cat_printf(output, "Hum: %d%%", instance->humidity); } -} \ No newline at end of file +} diff --git a/lib/subghz/protocols/ws_generic.h b/lib/subghz/protocols/ws_generic.h index 39407e052..184b1cd4d 100644 --- a/lib/subghz/protocols/ws_generic.h +++ b/lib/subghz/protocols/ws_generic.h @@ -8,11 +8,11 @@ extern "C" { #endif -#define WS_NO_ID 0xFFFFFFFF -#define WS_NO_BATT 0xFF -#define WS_NO_HUMIDITY 0xFF -#define WS_NO_CHANNEL 0xFF -#define WS_NO_BTN 0xFF +#define WS_NO_ID 0xFFFFFFFF +#define WS_NO_BATT 0xFF +#define WS_NO_HUMIDITY 0xFF +#define WS_NO_CHANNEL 0xFF +#define WS_NO_BTN 0xFF #define WS_NO_TEMPERATURE -273.0f typedef struct WSBlockGeneric WSBlockGeneric; @@ -72,4 +72,4 @@ void ws_block_generic_get_string(WSBlockGeneric* instance, FuriString* output); #ifdef __cplusplus } -#endif \ No newline at end of file +#endif diff --git a/lib/subghz/subghz_setting.h b/lib/subghz/subghz_setting.h index 7ca1574c7..c83588815 100644 --- a/lib/subghz/subghz_setting.h +++ b/lib/subghz/subghz_setting.h @@ -11,7 +11,7 @@ extern "C" { #endif -#define SUBGHZ_SETTING_FILE_TYPE "Flipper SubGhz Setting File" +#define SUBGHZ_SETTING_FILE_TYPE "Flipper SubGhz Setting File" #define SUBGHZ_SETTING_FILE_VERSION 1 #define SUBGHZ_SETTING_DEFAULT_PRESET_COUNT 4 diff --git a/targets/f7/furi_hal/furi_hal_subghz.c b/targets/f7/furi_hal/furi_hal_subghz.c index 267a36ba5..fcfdf5ba8 100644 --- a/targets/f7/furi_hal/furi_hal_subghz.c +++ b/targets/f7/furi_hal/furi_hal_subghz.c @@ -54,7 +54,7 @@ typedef struct { int8_t rolling_counter_mult; bool extended_range : 1; - bool bypass_region : 1; + bool bypass_region : 1; } FuriHalSubGhz; volatile FuriHalSubGhz furi_hal_subghz = { diff --git a/targets/f7/furi_hal/furi_hal_subghz_i.h b/targets/f7/furi_hal/furi_hal_subghz_i.h index 47d7b40f5..7bd9e10ad 100644 --- a/targets/f7/furi_hal/furi_hal_subghz_i.h +++ b/targets/f7/furi_hal/furi_hal_subghz_i.h @@ -6,4 +6,4 @@ bool furi_hal_subghz_get_extended_range(void); void furi_hal_subghz_set_bypass_region(bool enabled); -bool furi_hal_subghz_get_bypass_region(void); \ No newline at end of file +bool furi_hal_subghz_get_bypass_region(void); diff --git a/targets/furi_hal_include/furi_hal_region.h b/targets/furi_hal_include/furi_hal_region.h index b6827132a..eed5bef92 100644 --- a/targets/furi_hal_include/furi_hal_region.h +++ b/targets/furi_hal_include/furi_hal_region.h @@ -78,4 +78,4 @@ const FuriHalRegionBand* furi_hal_region_get_band(uint32_t frequency); #ifdef __cplusplus } -#endif \ No newline at end of file +#endif