Quellcode durchsuchen

Merge nrf24channelscanner from https://github.com/xMasterX/all-the-plugins

# Conflicts:
#	nrf24channelscanner/lib/nrf24/nrf24.c
#	nrf24channelscanner/lib/nrf24/nrf24.h
Willy-JL vor 10 Monaten
Ursprung
Commit
b018e09769

+ 1 - 1
nrf24channelscanner/.gitsubtree

@@ -1,2 +1,2 @@
-https://github.com/xMasterX/all-the-plugins dev non_catalog_apps/nrf24channelscanner 4558d74c9da36abc851edd96a95d18f7d5511a75
+https://github.com/xMasterX/all-the-plugins dev non_catalog_apps/nrf24channelscanner 8bc18d5d99262484548b6bbc92690a1472c329a0
 https://github.com/htotoo/NRF24ChannelScanner main NRF24ChannelScanner e92da5db51ebbf0402d5e07b7af3a8d696817be2

+ 1 - 2
nrf24channelscanner/lib/nrf24/nrf24.c

@@ -63,8 +63,7 @@ uint8_t nrf24_write_reg(const FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t
     return rx[0];
 }
 
-uint8_t
-    nrf24_read_reg(const FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t* data, uint8_t size) {
+uint8_t nrf24_read_reg(const FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t* data, uint8_t size) {
     uint8_t tx[size + 1];
     uint8_t rx[size + 1];
     memset(rx, 0, size + 1);

+ 1 - 2
nrf24channelscanner/lib/nrf24/nrf24.h

@@ -71,8 +71,7 @@ uint8_t nrf24_write_reg(const FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t
  *
  * @return     device status
  */
-uint8_t
-    nrf24_read_reg(const FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t* data, uint8_t size);
+uint8_t nrf24_read_reg(const FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t* data, uint8_t size);
 
 /** Power down the radio
  *