Merge branch 'release-candidate' into release

.github/CODEOWNERS

@@ -14,7 +14,7 @@ applications/gui/** @skotopes @DrZlo13
 applications/gui-test/** @skotopes @DrZlo13
 applications/ibutton/** @skotopes @DrZlo13
 applications/input/** @skotopes @DrZlo13
-applications/irda/** @skotopes @DrZlo13 @albkharisov
+applications/infrared/** @skotopes @DrZlo13
 applications/lf-rfid/** @skotopes @DrZlo13
 applications/menu/** @skotopes @DrZlo13
 applications/music-player/** @skotopes @DrZlo13

CODING_STYLE.md

@@ -58,7 +58,7 @@ Examples:
 
 	FuriHalUsb
 	Gui
-	SubghzKeystore
+	SubGhzKeystore
 
 
 ### Functions are snake_case
@@ -73,8 +73,8 @@ This rule makes easier to locate types, functions and sources.
 
 For example:
 
-We have abstraction that we call `Subghz Keystore`, so there will be:
-file `subghz_keystore.h` we have type `SubghzKeystore` and function `subghz_keystore_read`.
+We have abstraction that we call `SubGhz Keystore`, so there will be:
+file `subghz_keystore.h` we have type `SubGhzKeystore` and function `subghz_keystore_read`.
 
 ### File names
 

Makefile

@@ -13,7 +13,7 @@ PROJECT_SOURCE_DIRECTORIES := \
 	$(PROJECT_ROOT)/lib/cyfral \
 	$(PROJECT_ROOT)/lib/drivers \
 	$(PROJECT_ROOT)/lib/flipper_file \
-	$(PROJECT_ROOT)/lib/irda \
+	$(PROJECT_ROOT)/lib/infrared \
 	$(PROJECT_ROOT)/lib/nfc_protocols \
 	$(PROJECT_ROOT)/lib/ST25RFAL002 \
 	$(PROJECT_ROOT)/lib/onewire \
@@ -121,3 +121,8 @@ lint:
 format:
 	@echo "Reformating sources code"
 	@$(PROJECT_ROOT)/scripts/lint.py format $(PROJECT_SOURCE_DIRECTORIES)
+
+.PHONY: guruguru
+guruguru:
+	@echo "ぐるぐる回る"
+	@$(PROJECT_ROOT)/scripts/guruguru.py $(PROJECT_ROOT)

applications/ReadMe.md

@@ -15,8 +15,8 @@
 - `gui`                 - GUI service and API
 - `ibutton`             - iButton application, onewire keys and more
 - `input`               - Input service
-- `irda`                - Irda application, controls your IR devices
-- `irda_monitor`        - Irda debug tool
+- `infrared`            - Infrared application, controls your IR devices
+- `infrared_monitor`    - Infrared debug tool
 - `lfrfid`              - LF RFID application
 - `lfrfid_debug`        - LF RFID debug tool
 - `loader`              - Application loader service
@@ -30,7 +30,7 @@
 - `snake_game`          - Snake game application
 - `storage`             - Storage service, internal + sdcard
 - `storage_settings`    - Storage settings app
-- `subghz`              - Subghz application, 433 fobs and etc
+- `subghz`              - SubGhz application, 433 fobs and etc
 - `system`              - System settings, tools and API
 - `tests`               - Unit tests and etc
 - `u2f`                 - U2F Application

applications/applications.c

@@ -27,8 +27,8 @@ extern int32_t delay_test_app(void* p);
 extern int32_t display_test_app(void* p);
 extern int32_t gpio_app(void* p);
 extern int32_t ibutton_app(void* p);
-extern int32_t irda_app(void* p);
-extern int32_t irda_monitor_app(void* p);
+extern int32_t infrared_app(void* p);
+extern int32_t infrared_monitor_app(void* p);
 extern int32_t keypad_test_app(void* p);
 extern int32_t lfrfid_app(void* p);
 extern int32_t lfrfid_debug_app(void* p);
@@ -51,7 +51,7 @@ extern int32_t snake_game_app(void* p);
 extern void bt_on_system_start();
 extern void crypto_on_system_start();
 extern void ibutton_on_system_start();
-extern void irda_on_system_start();
+extern void infrared_on_system_start();
 extern void lfrfid_on_system_start();
 extern void nfc_on_system_start();
 extern void storage_on_system_start();
@@ -136,8 +136,8 @@ const FlipperApplication FLIPPER_APPS[] = {
     {.app = nfc_app, .name = "NFC", .stack_size = 4096, .icon = &A_NFC_14},
 #endif
 
-#ifdef APP_IRDA
-    {.app = irda_app, .name = "Infrared", .stack_size = 1024 * 3, .icon = &A_Infrared_14},
+#ifdef APP_INFRARED
+    {.app = infrared_app, .name = "Infrared", .stack_size = 1024 * 3, .icon = &A_Infrared_14},
 #endif
 
 #ifdef APP_GPIO
@@ -164,8 +164,8 @@ const size_t FLIPPER_APPS_COUNT = sizeof(FLIPPER_APPS) / sizeof(FlipperApplicati
 const FlipperOnStartHook FLIPPER_ON_SYSTEM_START[] = {
     crypto_on_system_start,
 
-#ifdef APP_IRDA
-    irda_on_system_start,
+#ifdef APP_INFRARED
+    infrared_on_system_start,
 #endif
 
 #ifdef APP_NFC
@@ -251,8 +251,8 @@ const FlipperApplication FLIPPER_DEBUG_APPS[] = {
     {.app = uart_echo_app, .name = "Uart Echo", .stack_size = 2048, .icon = NULL},
 #endif
 
-#ifdef APP_IRDA_MONITOR
-    {.app = irda_monitor_app, .name = "Irda Monitor", .stack_size = 1024, .icon = NULL},
+#ifdef APP_INFRARED_MONITOR
+    {.app = infrared_monitor_app, .name = "Infrared Monitor", .stack_size = 1024, .icon = NULL},
 #endif
 
 #ifdef APP_SCENED

applications/applications.mk

@@ -26,7 +26,7 @@ SRV_DESKTOP	= 1
 APP_ARCHIVE	= 1
 APP_GPIO = 1
 APP_IBUTTON	= 1
-APP_IRDA	= 1
+APP_INFRARED	= 1
 APP_LF_RFID	= 1
 APP_NFC		= 1
 APP_SUBGHZ	= 1
@@ -40,7 +40,7 @@ APP_SNAKE_GAME = 1
 # Debug
 APP_ACCESSOR = 1
 APP_BLINK = 1
-APP_IRDA_MONITOR = 1
+APP_INFRARED_MONITOR = 1
 APP_KEYPAD_TEST = 1
 APP_SD_TEST	= 1
 APP_VIBRO_TEST = 1
@@ -59,9 +59,9 @@ endif
 # Prefix with APP_*
 
 
-APP_IRDA_MONITOR	?= 0
-ifeq ($(APP_IRDA_MONITOR), 1)
-CFLAGS		+= -DAPP_IRDA_MONITOR
+APP_INFRARED_MONITOR	?= 0
+ifeq ($(APP_INFRARED_MONITOR), 1)
+CFLAGS		+= -DAPP_INFRARED_MONITOR
 SRV_GUI		= 1
 endif
 
@@ -122,9 +122,9 @@ SRV_GUI		= 1
 endif
 
 
-APP_IRDA ?= 0
-ifeq ($(APP_IRDA), 1)
-CFLAGS		+= -DAPP_IRDA
+APP_INFRARED ?= 0
+ifeq ($(APP_INFRARED), 1)
+CFLAGS		+= -DAPP_INFRARED
 SRV_GUI		= 1
 endif
 

applications/archive/helpers/archive_browser.h

@@ -10,7 +10,7 @@ static const char* tab_default_paths[] = {
     [ArchiveTabNFC] = "/any/nfc",
     [ArchiveTabSubGhz] = "/any/subghz",
     [ArchiveTabLFRFID] = "/any/lfrfid",
-    [ArchiveTabIrda] = "/any/irda",
+    [ArchiveTabInfrared] = "/any/infrared",
     [ArchiveTabBadUsb] = "/any/badusb",
     [ArchiveTabU2f] = "/app:u2f",
     [ArchiveTabBrowser] = "/any",
@@ -21,7 +21,7 @@ static const char* known_ext[] = {
     [ArchiveFileTypeNFC] = ".nfc",
     [ArchiveFileTypeSubGhz] = ".sub",
     [ArchiveFileTypeLFRFID] = ".rfid",
-    [ArchiveFileTypeIrda] = ".ir",
+    [ArchiveFileTypeInfrared] = ".ir",
     [ArchiveFileTypeBadUsb] = ".txt",
     [ArchiveFileTypeU2f] = "?",
     [ArchiveFileTypeFolder] = "?",
@@ -34,7 +34,7 @@ static const ArchiveFileTypeEnum known_type[] = {
     [ArchiveTabNFC] = ArchiveFileTypeNFC,
     [ArchiveTabSubGhz] = ArchiveFileTypeSubGhz,
     [ArchiveTabLFRFID] = ArchiveFileTypeLFRFID,
-    [ArchiveTabIrda] = ArchiveFileTypeIrda,
+    [ArchiveTabInfrared] = ArchiveFileTypeInfrared,
     [ArchiveTabBadUsb] = ArchiveFileTypeBadUsb,
     [ArchiveTabU2f] = ArchiveFileTypeU2f,
     [ArchiveTabBrowser] = ArchiveFileTypeUnknown,

applications/archive/helpers/archive_files.h

@@ -8,7 +8,7 @@ typedef enum {
     ArchiveFileTypeNFC,
     ArchiveFileTypeSubGhz,
     ArchiveFileTypeLFRFID,
-    ArchiveFileTypeIrda,
+    ArchiveFileTypeInfrared,
     ArchiveFileTypeBadUsb,
     ArchiveFileTypeU2f,
     ArchiveFileTypeFolder,

applications/archive/scenes/archive_scene_browser.c

@@ -12,7 +12,7 @@ static const char* flipper_app_name[] = {
     [ArchiveFileTypeNFC] = "NFC",
     [ArchiveFileTypeSubGhz] = "Sub-GHz",
     [ArchiveFileTypeLFRFID] = "125 kHz RFID",
-    [ArchiveFileTypeIrda] = "Infrared",
+    [ArchiveFileTypeInfrared] = "Infrared",
     [ArchiveFileTypeBadUsb] = "Bad USB",
     [ArchiveFileTypeU2f] = "U2F",
 };

applications/archive/views/archive_browser_view.c

@@ -9,7 +9,7 @@ static const char* ArchiveTabNames[] = {
     [ArchiveTabNFC] = "NFC",
     [ArchiveTabSubGhz] = "Sub-GHz",
     [ArchiveTabLFRFID] = "RFID LF",
-    [ArchiveTabIrda] = "Infrared",
+    [ArchiveTabInfrared] = "Infrared",
     [ArchiveTabBadUsb] = "Bad USB",
     [ArchiveTabU2f] = "U2F",
     [ArchiveTabBrowser] = "Browser"};
@@ -19,7 +19,7 @@ static const Icon* ArchiveItemIcons[] = {
     [ArchiveFileTypeNFC] = &I_Nfc_10px,
     [ArchiveFileTypeSubGhz] = &I_sub1_10px,
     [ArchiveFileTypeLFRFID] = &I_125_10px,
-    [ArchiveFileTypeIrda] = &I_ir_10px,
+    [ArchiveFileTypeInfrared] = &I_ir_10px,
     [ArchiveFileTypeBadUsb] = &I_badusb_10px,
     [ArchiveFileTypeU2f] = &I_u2f_10px,
     [ArchiveFileTypeFolder] = &I_dir_10px,

applications/archive/views/archive_browser_view.h

@@ -22,7 +22,7 @@ typedef enum {
     ArchiveTabSubGhz,
     ArchiveTabLFRFID,
     ArchiveTabNFC,
-    ArchiveTabIrda,
+    ArchiveTabInfrared,
     ArchiveTabIButton,
     ArchiveTabBadUsb,
     ArchiveTabU2f,