Fix merge issues

This commit is contained in:
MX
2023-03-14 20:25:33 +03:00
parent 8b8b78d001
commit 05e53cac26
22 changed files with 1670 additions and 11 deletions

View File

@@ -1,10 +1,10 @@
App(
appid="hid_usb",
name="Remote",
name="USB Keyboard & Mouse",
apptype=FlipperAppType.EXTERNAL,
entry_point="hid_usb_app",
stack_size=1 * 1024,
fap_category="USB",
fap_category="Misc",
fap_icon="hid_usb_10px.png",
fap_icon_assets="assets",
fap_icon_assets_symbol="hid",
@@ -13,11 +13,11 @@ App(
App(
appid="hid_ble",
name="Remote",
name="Bluetooth Remote",
apptype=FlipperAppType.EXTERNAL,
entry_point="hid_ble_app",
stack_size=1 * 1024,
fap_category="Bluetooth",
fap_category="Misc",
fap_icon="hid_ble_10px.png",
fap_icon_assets="assets",
fap_icon_assets_symbol="hid",