Skip to content

Commit

Permalink
StickCs submenu to config pins
Browse files Browse the repository at this point in the history
  • Loading branch information
@bmorcelli
bmorcelli committed Mar 5, 2025
1 parent c0e59ca commit a848827
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 83 deletions.
23 changes: 23 additions & 0 deletions src/core/menu_items/NRF24.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,34 @@ void NRF24Menu::optionsMenu() {

options.push_back({"CH Jammer", [=]() { nrf_channel_jammer(); }});

#if defined(ARDUINO_M5STICK_C_PLUS) || defined(ARDUINO_M5STICK_C_PLUS2)
options.push_back({"Config pins", [=]() { configMenu(); }});
#endif

options.push_back({"Main Menu", [=]() { backToMenu(); }});

loopOptions(options,false,true,"NRF24");
}

void NRF24Menu::configMenu() {
uint8_t opt = 0;
options = {
{"NRF24 (legacy)", [&]() { opt = 1; }},
{"NRF24 (shared SPI)", [&]() { opt = 2; }},
{"Back", [=]() { optionsMenu(); }},
};

loopOptions(options,false,true,"RF Config");
if(opt==1) {
bruceConfig.NRF24_bus = { (gpio_num_t)NRF24_SCK_PIN, (gpio_num_t)NRF24_MISO_PIN, (gpio_num_t)NRF24_MOSI_PIN, (gpio_num_t)NRF24_SS_PIN, (gpio_num_t)NRF24_CE_PIN, GPIO_NUM_NC };
bruceConfig.setSpiPins(bruceConfig.NRF24_bus);
}
if (opt==2) {
bruceConfig.NRF24_bus = { (gpio_num_t)SDCARD_SCK, (gpio_num_t)SDCARD_MISO, (gpio_num_t)SDCARD_MOSI, GPIO_NUM_33, GPIO_NUM_32, GPIO_NUM_NC };
bruceConfig.setSpiPins(bruceConfig.NRF24_bus);
}
}

void NRF24Menu::drawIcon(float scale) {
clearIconArea();

Expand Down
1 change: 1 addition & 0 deletions src/core/menu_items/NRF24.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class NRF24Menu : public MenuItemInterface {
NRF24Menu() : MenuItemInterface("NRF24") {}

void optionsMenu(void);
void configMenu(void);
void drawIcon(float scale);
};

Expand Down
142 changes: 59 additions & 83 deletions src/modules/NRF24/nrf_jammer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,43 @@ void nrf_jammer() {
NRFradio.setAddressWidth(3);//optional
NRFradio.setPayloadSize(2);//optional
if(!NRFradio.setDataRate(RF24_2MBPS)) Serial.println("Fail setting data Rate");

bool redraw = true;
drawMainBorder();
tft.setCursor(10,35);
tft.setTextSize(FM);
tft.println("NRF X Jammer ");
tft.setCursor(10,tft.getCursorY()+35);
tft.println("STATUS : ACTIVE");
delay(200);

while(!check(SelPress)) {
if(redraw) {
tft.setCursor(10,35);
tft.setTextSize(FM);
tft.println("NRF X Jammer ");
tft.setCursor(10,tft.getCursorY()+25);
tft.println("STATUS : ACTIVE");
tft.setCursor(10,100);
tft.print("MODE : " + NRF_MODE);
if (NRF_MODE_N == 1) {
NRF_MODE = "WiFi ";
Serial.println("WiFi");
} else if (NRF_MODE_N == 2) {
NRF_MODE = "BLE ";
Serial.println("BLE");
} else if (NRF_MODE_N == 3) {
NRF_MODE = "Bluetooth ";
Serial.println("Bluetooth");
} else if (NRF_MODE_N == 4) {
NRF_MODE = "USB ";
Serial.println("USB");
} else if (NRF_MODE_N == 5) {
NRF_MODE = "Video Stream";
Serial.println("Video Stream");
} else if (NRF_MODE_N == 6) {
NRF_MODE = "RC ";
Serial.println("RC");
} else if (NRF_MODE_N == 7) {
NRF_MODE = "Full ";
Serial.println("Full");
}
tft.drawRoundRect(5, 5, tftWidth - 10, tftHeight - 10, 5, bruceConfig.priColor);
delay(200);
redraw = false;
}
ptr_hop++;
if (NRF_MODE_N == 1) {

Expand All @@ -73,45 +100,13 @@ void nrf_jammer() {
}

// Change channel

if (NRF_MODE_N != NRF_MODE_N_X) {
tft.fillRect(80, 115, 150, 30, bruceConfig.bgColor);
tft.setCursor(10,120);
tft.print("MODE : " + NRF_MODE);
NRF_MODE_N_X = NRF_MODE_N;
}

if (check(NextPress)){
if (NRF_MODE_N < 7) {
NRF_MODE_N++;
} else {
NRF_MODE_N = 1;
}

if (NRF_MODE_N == 1) {
NRF_MODE = "WiFi ";
Serial.println("WiFi");
} else if (NRF_MODE_N == 2) {
NRF_MODE = "BLE ";
Serial.println("BLE");
} else if (NRF_MODE_N == 3) {
NRF_MODE = "Bluetooth ";
Serial.println("Bluetooth");
} else if (NRF_MODE_N == 4) {
NRF_MODE = "USB ";
Serial.println("USB");
} else if (NRF_MODE_N == 5) {
NRF_MODE = "Video Stream";
Serial.println("Video Stream");
} else if (NRF_MODE_N == 6) {
NRF_MODE = "RC ";
Serial.println("RC");
} else if (NRF_MODE_N == 7) {
NRF_MODE = "Full ";
Serial.println("Full");
}
ptr_hop = 0;
delay(200);
}

if (check(PrevPress)) {
Expand All @@ -120,32 +115,12 @@ void nrf_jammer() {
} else {
NRF_MODE_N--;
}

if (NRF_MODE_N == 1) {
NRF_MODE = "WiFi ";
Serial.println("WiFi");
} else if (NRF_MODE_N == 2) {
NRF_MODE = "BLE ";
Serial.println("BLE");
} else if (NRF_MODE_N == 3) {
NRF_MODE = "Bluetooth ";
Serial.println("Bluetooth");
} else if (NRF_MODE_N == 4) {
NRF_MODE = "USB ";
Serial.println("USB");
} else if (NRF_MODE_N == 5) {
NRF_MODE = "Video Stream";
Serial.println("Video Stream");
} else if (NRF_MODE_N == 6) {
NRF_MODE = "RC ";
Serial.println("RC");
} else if (NRF_MODE_N == 7) {
NRF_MODE = "Full ";
Serial.println("Full");
}
ptr_hop = 0;
delay(200);
}

if (NRF_MODE_N != NRF_MODE_N_X) {
redraw = true;
NRF_MODE_N_X = NRF_MODE_N;
}
}

Expand All @@ -170,7 +145,7 @@ void nrf_channel_jammer() {

int NRF_MODE_N = 1;
int NRF_MODE_N_X = 0;
String NRF_MODE = "CH1";
String NRF_MODE = "CH 1 ";

String NRF_STATUS = "OFF";
int NRF_STATUS_X = 0;
Expand All @@ -183,21 +158,22 @@ void nrf_channel_jammer() {
NRFradio.setPayloadSize(2);//optional
if(!NRFradio.setDataRate(RF24_2MBPS)) Serial.println("Fail setting data Rate");

bool redraw = true;
drawMainBorder();
tft.setCursor(10,35);
tft.setTextSize(FM);
tft.println("NRF Channel Jammer ");
tft.setCursor(10,tft.getCursorY()+35);
tft.println("STATUS : ACTIVE");
delay(200);

while(!check(SelPress)) {

if (NRF_MODE_N != NRF_MODE_N_X) {
tft.fillRect(80, 115, 150, 30, bruceConfig.bgColor);
tft.setCursor(10,120);
if(redraw) {
tft.setCursor(10,35);
tft.setTextSize(FM);
tft.println("NRF Channel Jammer");
tft.setCursor(10,tft.getCursorY()+25);
tft.println("STATUS : ACTIVE");
tft.setCursor(10,100);
tft.print("MODE : " + NRF_MODE + " ");
NRF_MODE_N_X = NRF_MODE_N;
Serial.println("CH "+String(NRF_MODE_N));
tft.drawRoundRect(5, 5, tftWidth - 10, tftHeight - 10, 5, bruceConfig.priColor);
redraw = false;
delay(200);

}

if (check(NextPress)){
Expand All @@ -206,21 +182,21 @@ void nrf_channel_jammer() {
} else {
NRF_MODE_N = 1;
}
NRF_MODE = "CH"+String(NRF_MODE_N);
Serial.println("CH"+String(NRF_MODE_N));
NRF_MODE = "CH "+String(NRF_MODE_N);
NRFradio.setChannel(NRF_MODE_N);
delay(200);
}
if (check(PrevPress)) {
if (NRF_MODE_N < 2) {
NRF_MODE_N = 127;
} else {
NRF_MODE_N--;
}
NRF_MODE = "CH"+String(NRF_MODE_N);
Serial.println("CH"+String(NRF_MODE_N));
NRF_MODE = "CH "+String(NRF_MODE_N);
NRFradio.setChannel(NRF_MODE_N);
delay(200);
}
if (NRF_MODE_N != NRF_MODE_N_X) {
NRF_MODE_N_X = NRF_MODE_N;
redraw = true;
}

}
Expand Down

0 comments on commit a848827

Please sign in to comment.