Merge pull request #102 from ESurge/unleashed

Updated api_symbols.csv to get NRFSniffer and MouseJacker working.

applications/meta/application.fam

@@ -35,9 +35,8 @@ App(
     provides=[
         "INTAPP_HIDAnalyzer",
         "INTAPP_Picopass",
-        "INTAPP_MouseJacker",
-        "INTAPP_NRFSniff",
         "INTAPP_TOTP",
+        "INTAPP_WiFiScanner",
     ],
 )
 
@@ -46,7 +45,6 @@ App(
     name="Custom applications for games menu",
     apptype=FlipperAppType.METAPACKAGE,
     provides=[
-        "GAME_Tetris",
 	"GAME_Snake",
     ],
 )
@@ -68,10 +66,8 @@ App(
     provides=[
         "INTAPP_HIDAnalyzer",
         "INTAPP_Picopass",
-        "INTAPP_MouseJacker",
-        "INTAPP_NRFSniff",
-        "INTAPP_WiFiScanner",
 	"INTAPP_TOTP",
+        "INTAPP_WiFiScanner",
 	"INTAPP_Chip8",
 	"INTAPP_Chess",
         "APPS_TouchTunes",
@@ -84,6 +80,8 @@ App(
         "APPS_SentrySafe",
 	"APPS_BarcodeGenerator",
 	"APPS_MouseJiggler",
+        "APPS_MouseJacker",
+        "APPS_NRFSniff",
         "GAME_2048",
 	"GAME_Arkanoid",
 	"GAME_Dice",

applications/mousejacker/application.fam

@@ -1,10 +1,10 @@
 App(
-    appid="INTAPP_MouseJacker",
+    appid="APPS_MouseJacker",
     name="Mouse Jacker",
     apptype=FlipperAppType.PLUGIN,
     entry_point="mousejacker_app",
     cdefines=["APP_MOUSEJACKER"],
     requires=["gui"],
     stack_size=2 * 1024,
     order=140,
-)
+)

applications/nrfsniff/application.fam

@@ -1,10 +1,10 @@
 App(
-    appid="INTAPP_NRFSniff",
+    appid="APPS_NRFSniff",
     name="NRF Sniff",
     apptype=FlipperAppType.PLUGIN,
     entry_point="nrfsniff_app",
     cdefines=["APP_NRFSNIFF"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=170,
-)
+)

assets/resources/Manifest

@@ -1,5 +1,5 @@
 V:0
-T:1658209416
+T:1658226066
 D:apps
 D:badusb
 D:dolphin
@@ -26,7 +26,7 @@ F:6118892858db3656d3390524b9819bec:3408:apps/GAME_GameOfLife.fap
 F:b604aa5c11aad7bf17ff5cef6b9927d9:2856:apps/GAME_MandelbrotSet.fap
 F:30b682269f6d5995a79fed8d2ffc1ac1:5228:apps/GAME_Raycast.fap
 F:718299069e8b3a4402ae9ebe87b095a5:4448:apps/GAME_Snake.fap
-F:1ba2cad2418d4434b9fd91e0f61adcd2:13820:apps/GAME_Tanks.fap
+F:8f2a2e9fd2f5c8a0640fdef2091a150e:13820:apps/GAME_Tanks.fap
 F:0dd7e257da79f74e8a872d5505ebb55c:5812:apps/GAME_Tetris.fap
 F:fff409711d633ebd96371705f2595842:5780:apps/GAME_TicTacToe.fap
 F:6caa0348fb3a9e234fceac0af81ebc3d:10192:apps/GAME_VideoPoker.fap

assets/resources/dolphin/manifest.txt

@@ -111,4 +111,4 @@ Min butthurt: 0
 Max butthurt: 14
 Min level: 1
 Max level: 3
-Weight: 3
+Weight: 3

firmware/targets/f7/api_symbols.csv

@@ -105,6 +105,7 @@ Header,+,lib/STM32CubeWB/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_tim.h,,
 Header,+,lib/STM32CubeWB/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_usart.h,,
 Header,+,lib/STM32CubeWB/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_utils.h,,
 Header,+,lib/STM32CubeWB/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_wwdg.h,,
+Header,+,lib/drivers/nrf24.h,,
 Header,+,lib/flipper_format/flipper_format.h,,
 Header,+,lib/flipper_format/flipper_format_i.h,,
 Header,+,lib/micro-ecc/uECC.h,,
@@ -569,6 +570,7 @@ Function,+,byte_input_free,void,ByteInput*
 Function,+,byte_input_get_view,View*,ByteInput*
 Function,+,byte_input_set_header_text,void,"ByteInput*, const char*"
 Function,+,byte_input_set_result_callback,void,"ByteInput*, ByteInputCallback, ByteChangedCallback, void*, uint8_t*, uint8_t"
+Function,+,bytes_to_int32,uint32_t,"uint8_t*, _Bool"
 Function,-,bzero,void,"void*, size_t"
 Function,-,calloc,void*,"size_t, size_t"
 Function,+,canvas_clear,void,Canvas*
@@ -745,7 +747,7 @@ Function,-,erfcf,float,float
 Function,-,erfcl,long double,long double
 Function,-,erff,float,float
 Function,-,erfl,long double,long double
-Function,-,exit,void,int
+Function,+,exit,void,int
 Function,-,exp,double,double
 Function,-,exp10,double,double
 Function,-,exp10f,float,float
@@ -1409,6 +1411,7 @@ Function,+,init_mutex,_Bool,"ValueMutex*, void*, size_t"
 Function,-,initstate,char*,"unsigned, char*, size_t"
 Function,+,input_get_key_name,const char*,InputKey
 Function,+,input_get_type_name,const char*,InputType
+Function,+,int32_to_bytes,void,"uint32_t, uint8_t*, bool"
 Function,+,iprintf,int,"const char*, ..."
 Function,-,isalnum,int,int
 Function,-,isalnum_l,int,"int, locale_t"
@@ -1567,6 +1570,13 @@ Function,+,nfca_get_crc16,uint16_t,"uint8_t*, uint16_t"
 Function,+,nfca_signal_alloc,NfcaSignal*,
 Function,+,nfca_signal_encode,void,"NfcaSignal*, uint8_t*, uint16_t, uint8_t*"
 Function,+,nfca_signal_free,void,NfcaSignal*
+Function,+,nrf24_find_channel,uint8_t,"FuriHalSpiBusHandle*, uint8_t*, uint8_t*, uint8_t, uint8_t, uint8_t, uint8_t, bool"
+Function,+,nrf24_init,void,,
+Function,+,nrf24_init_promisc_mode,void,"FuriHalSpiBusHandle*, uint8_t, uint8_t"
+Function,+,nrf24_set_idle,uint8_t,"FuriHalSpiBusHandle*"
+Function,+,nrf24_set_src_mac,uint8_t,"FuriHalSpiBusHandle*, uint8_t*, uint8_t"
+Function,+,nrf24_sniff_address,_Bool,"FuriHalSpiBusHandle*, uint8_t, uint8_t*"
+Function,+,nrf24_txpacket,uint8_t,"FuriHalSpiBusHandle*, uint8_t*, uint8_t, bool"
 Function,+,notification_internal_message,void,"NotificationApp*, const NotificationSequence*"
 Function,+,notification_internal_message_block,void,"NotificationApp*, const NotificationSequence*"
 Function,+,notification_message,void,"NotificationApp*, const NotificationSequence*"
@@ -2030,7 +2040,7 @@ Function,-,stpncpy,char*,"char*, const char*, size_t"
 Function,-,strcasecmp,int,"const char*, const char*"
 Function,-,strcasecmp_l,int,"const char*, const char*, locale_t"
 Function,+,strcasestr,char*,"const char*, const char*"
-Function,-,strcat,char*,"char*, const char*"
+Function,+,strcat,char*,"char*, const char*"
 Function,+,strchr,char*,"const char*, int"
 Function,-,strchrnul,char*,"const char*, int"
 Function,+,strcmp,int,"const char*, const char*"
@@ -2099,7 +2109,7 @@ Function,-,strtod,double,"const char*, char**"
 Function,-,strtod_l,double,"const char*, char**, locale_t"
 Function,+,strtof,float,"const char*, char**"
 Function,-,strtof_l,float,"const char*, char**, locale_t"
-Function,-,strtok,char*,"char*, const char*"
+Function,+,strtok,char*,"char*, const char*"
 Function,-,strtok_r,char*,"char*, const char*, char**"
 Function,+,strtol,long,"const char*, char**, int"
 Function,-,strtol_l,long,"const char*, char**, int, locale_t"
@@ -2545,7 +2555,7 @@ Variable,+,I_FaceCharging_29x14,const Icon,
 Variable,+,I_FaceConfused_29x14,const Icon,
 Variable,+,I_FaceNopower_29x14,const Icon,
 Variable,+,I_FaceNormal_29x14,const Icon,
-Variable,+,I_HappyFlipper_128x64,const Icon,
+Variable,-,I_HappyFlipper_128x64,const Icon,
 Variable,+,I_Health_16x16,const Icon,
 Variable,+,I_InfraredArrowDown_4x8,const Icon,
 Variable,+,I_InfraredArrowUp_4x8,const Icon,
@@ -2594,7 +2604,7 @@ Variable,+,I_SDcardMounted_11x8,const Icon,
 Variable,+,I_Scanning_123x52,const Icon,
 Variable,+,I_Smile_18x18,const Icon,
 Variable,+,I_Space_65x18,const Icon,
-Variable,+,I_TanksSplashScreen_128x64,const Icon,
+Variable,-,I_TanksSplashScreen_128x64,const Icon,
 Variable,+,I_Temperature_16x16,const Icon,
 Variable,+,I_Unlock_7x8,const Icon,
 Variable,+,I_Up_25x27,const Icon,
@@ -2614,10 +2624,10 @@ Variable,+,I_back_10px,const Icon,
 Variable,+,I_badusb_10px,const Icon,
 Variable,-,I_ble_10px,const Icon,
 Variable,+,I_dir_10px,const Icon,
-Variable,+,I_enemy_down,const Icon,
-Variable,+,I_enemy_left,const Icon,
-Variable,+,I_enemy_right,const Icon,
-Variable,+,I_enemy_up,const Icon,
+Variable,-,I_enemy_down,const Icon,
+Variable,-,I_enemy_left,const Icon,
+Variable,-,I_enemy_right,const Icon,
+Variable,-,I_enemy_up,const Icon,
 Variable,+,I_iButtonDolphinVerySuccess_108x52,const Icon,
 Variable,+,I_iButtonKey_49x44,const Icon,
 Variable,+,I_ibutt_10px,const Icon,
@@ -2635,20 +2645,20 @@ Variable,+,I_passport_left_6x46,const Icon,
 Variable,+,I_passport_okay1_46x49,const Icon,
 Variable,+,I_passport_okay2_46x49,const Icon,
 Variable,+,I_passport_okay3_46x49,const Icon,
-Variable,+,I_projectile_down,const Icon,
-Variable,+,I_projectile_left,const Icon,
-Variable,+,I_projectile_right,const Icon,
-Variable,+,I_projectile_up,const Icon,
+Variable,-,I_projectile_down,const Icon,
+Variable,-,I_projectile_left,const Icon,
+Variable,-,I_projectile_right,const Icon,
+Variable,-,I_projectile_up,const Icon,
 Variable,+,I_sub1_10px,const Icon,
-Variable,+,I_tank_base,const Icon,
-Variable,+,I_tank_down,const Icon,
-Variable,+,I_tank_explosion,const Icon,
-Variable,+,I_tank_hedgehog,const Icon,
-Variable,+,I_tank_left,const Icon,
-Variable,+,I_tank_right,const Icon,
-Variable,+,I_tank_stone,const Icon,
-Variable,+,I_tank_up,const Icon,
-Variable,+,I_tank_wall,const Icon,
+Variable,-,I_tank_base,const Icon,
+Variable,-,I_tank_down,const Icon,
+Variable,-,I_tank_explosion,const Icon,
+Variable,-,I_tank_hedgehog,const Icon,
+Variable,-,I_tank_left,const Icon,
+Variable,-,I_tank_right,const Icon,
+Variable,-,I_tank_stone,const Icon,
+Variable,-,I_tank_up,const Icon,
+Variable,-,I_tank_wall,const Icon,
 Variable,+,I_u2f_10px,const Icon,
 Variable,+,I_unknown_10px,const Icon,
 Variable,+,I_update_10px,const Icon,
@@ -2666,7 +2676,7 @@ Variable,+,furi_hal_i2c_handle_power,FuriHalI2cBusHandle,
 Variable,+,furi_hal_sd_spi_handle,FuriHalSpiBusHandle*,
 Variable,+,furi_hal_spi_bus_d,FuriHalSpiBus,
 Variable,+,furi_hal_spi_bus_handle_display,FuriHalSpiBusHandle,
-Variable,-,furi_hal_spi_bus_handle_external,FuriHalSpiBusHandle,
+Variable,+,furi_hal_spi_bus_handle_external,FuriHalSpiBusHandle,
 Variable,+,furi_hal_spi_bus_handle_nfc,FuriHalSpiBusHandle,
 Variable,+,furi_hal_spi_bus_handle_sd_fast,FuriHalSpiBusHandle,
 Variable,+,furi_hal_spi_bus_handle_sd_slow,FuriHalSpiBusHandle,

lib/drivers/nrf24.h

@@ -361,4 +361,8 @@ void int32_to_bytes(uint32_t val, uint8_t* out, bool bigendian);
  * 
  * @return     32-bit value
  */
-uint32_t bytes_to_int32(uint8_t* bytes, bool bigendian);
+uint32_t bytes_to_int32(uint8_t* bytes, bool bigendian);
+
+#ifdef __cplusplus
+}
+#endif