Просмотр исходного кода

Merge branch 'master' of https://github.com/vad7/nrf24scan

vad7 2 лет назад
Родитель
Сommit
e2c9b4045d
2 измененных файлов с 10 добавлено и 1 удалено
  1. 3 1
      README.md
  2. 7 0
      nrf24scan.c

+ 3 - 1
README.md

@@ -65,7 +65,9 @@ Big board:<br>
 Gerber for full board (https://raw.githubusercontent.com/vad7/nrf24scan/master/Gerber_PCB_Flipper%20Zero%20nRF24%20board_v1_0.zip)<br>
 Gerber for full board (https://raw.githubusercontent.com/vad7/nrf24scan/master/Gerber_PCB_Flipper%20Zero%20nRF24%20board_v1_0.zip)<br>
 Easyeda source (https://oshwlab.com/vad7/flipper-zero-nrf24-board).
 Easyeda source (https://oshwlab.com/vad7/flipper-zero-nrf24-board).
 <br><br>
 <br><br>
-Mini board:
+Mini board:<br>
+<img src="https://raw.githubusercontent.com/vad7/nRF24-Batch/main/Pics/NRF24_mini_3D.png">
+<br>
 <img src="https://raw.githubusercontent.com/vad7/nrf24scan/master/scheme2.png">
 <img src="https://raw.githubusercontent.com/vad7/nrf24scan/master/scheme2.png">
 <br>
 <br>
 Gerber for mini board with 5V - 3.3V converter LM1117-3.3 (https://raw.githubusercontent.com/vad7/nrf24scan/master/Gerber_PCB_Flipper%20Zero%20nRF24%20board%20mini_v1_0.zip)<br>
 Gerber for mini board with 5V - 3.3V converter LM1117-3.3 (https://raw.githubusercontent.com/vad7/nrf24scan/master/Gerber_PCB_Flipper%20Zero%20nRF24%20board%20mini_v1_0.zip)<br>

+ 7 - 0
nrf24scan.c

@@ -70,6 +70,7 @@ uint8_t NRF_Payload = 32;// Payload len in bytes or Minimum payload in sniff mod
 uint8_t NRF_Payload_sniff_min = 0;
 uint8_t NRF_Payload_sniff_min = 0;
 uint8_t NRF_AA_OFF = 0;	// Disable Auto Acknowledgement
 uint8_t NRF_AA_OFF = 0;	// Disable Auto Acknowledgement
 bool NRF_ERROR = 0;
 bool NRF_ERROR = 0;
+bool NRF_BOARD_POWER_5V = false;
 
 
 struct ADDRS {
 struct ADDRS {
 	uint8_t addr_P0[5];		// MSB first
 	uint8_t addr_P0[5];		// MSB first
@@ -1128,6 +1129,11 @@ int32_t nrf24scan_app(void* p) {
 
 
 	memset((uint8_t*)&addrs, 0, sizeof(addrs));
 	memset((uint8_t*)&addrs, 0, sizeof(addrs));
 	memset((uint8_t*)&addrs_sniff, 0, sizeof(addrs_sniff));
 	memset((uint8_t*)&addrs_sniff, 0, sizeof(addrs_sniff));
+	if(!furi_hal_power_is_otg_enabled()) {
+		furi_hal_power_enable_otg();
+		NRF_BOARD_POWER_5V = true;
+		furi_delay_ms(100);
+	}
 	nrf24_init();
 	nrf24_init();
 
 
 	// Set system callbacks
 	// Set system callbacks
@@ -1370,6 +1376,7 @@ int32_t nrf24scan_app(void* p) {
 		write_to_log_file(APP->storage, false);
 		write_to_log_file(APP->storage, false);
 	}
 	}
 	nrf24_deinit();
 	nrf24_deinit();
+	if(NRF_BOARD_POWER_5V) furi_hal_power_disable_otg();
 
 
 	view_port_enabled_set(APP->view_port, false);
 	view_port_enabled_set(APP->view_port, false);
 	gui_remove_view_port(APP->gui, APP->view_port);
 	gui_remove_view_port(APP->gui, APP->view_port);