orion-rfbf0a032
remove BLE Scan from firmware.ino as it is redundant
+33 −41
2 files changed
- M firmware/device_check.cpp +19 −19
- M firmware/firmware.ino +14 −22
| @@ -213,29 +213,29 @@ void device_check_run() | |||
| 213 | 213 | ||
| 214 | 214 | Serial.println("Diagnostics complete"); | |
| 215 | 215 | ||
| 216 | − | while (1) | |
| 216 | + | while (1) | |
| 217 | 217 | { | |
| 218 | − | drawStatus(status); | |
| 218 | + | drawStatus(status); | |
| 219 | 219 | ||
| 220 | − | if (btnUp()) | |
| 221 | − | { | |
| 222 | − | selectedIndex--; | |
| 223 | − | if (selectedIndex < 0) selectedIndex = MAX_ITEMS - 1; | |
| 224 | − | delay(150); | |
| 225 | − | } | |
| 220 | + | if (btnUp()) | |
| 221 | + | { | |
| 222 | + | selectedIndex--; | |
| 223 | + | if (selectedIndex < 0) selectedIndex = MAX_ITEMS - 1; | |
| 224 | + | delay(150); | |
| 225 | + | } | |
| 226 | 226 | ||
| 227 | − | if (btnDown()) | |
| 228 | − | { | |
| 229 | − | selectedIndex++; | |
| 230 | − | if (selectedIndex >= MAX_ITEMS) selectedIndex = 0; | |
| 231 | − | delay(150); | |
| 232 | − | } | |
| 227 | + | if (btnDown()) | |
| 228 | + | { | |
| 229 | + | selectedIndex++; | |
| 230 | + | if (selectedIndex >= MAX_ITEMS) selectedIndex = 0; | |
| 231 | + | delay(150); | |
| 232 | + | } | |
| 233 | 233 | ||
| 234 | − | if (btnBack()) | |
| 235 | − | { | |
| 236 | − | delay(150); | |
| 237 | − | break; | |
| 238 | − | } | |
| 234 | + | if (btnBack()) | |
| 235 | + | { | |
| 236 | + | delay(150); | |
| 237 | + | break; | |
| 238 | + | } | |
| 239 | 239 | }} | |
| 240 | 240 | ||
| 241 | 241 | ||
| @@ -39,24 +39,16 @@ RF24 radio2(CE2_PIN, CSN2_PIN); | |||
| 39 | 39 | SPIClass *RADIO_SPI; | |
| 40 | 40 | ||
| 41 | 41 | ||
| 42 | + | void deactivateNRF1() { | |
| 43 | + | digitalWrite(CSN1_PIN, HIGH); | |
| 44 | + | digitalWrite(CE1_PIN, LOW); | |
| 45 | + | } | |
| 42 | 46 | ||
| 47 | + | void deactivateNRF2() { | |
| 48 | + | digitalWrite(CSN2_PIN, HIGH); | |
| 49 | + | digitalWrite(CE2_PIN, LOW); | |
| 50 | + | } | |
| 43 | 51 | ||
| 44 | − | // ================= BLE SCAN ================= | |
| 45 | − | //BLEScan *pBLEScan; | |
| 46 | − | // | |
| 47 | − | // | |
| 48 | − | //void startBLEScan() | |
| 49 | − | //{ | |
| 50 | − | // BLEDevice::init(""); | |
| 51 | − | // | |
| 52 | − | // pBLEScan = BLEDevice::getScan(); | |
| 53 | − | // | |
| 54 | − | // pBLEScan->setActiveScan(true); | |
| 55 | − | // | |
| 56 | − | // pBLEScan->start(5); | |
| 57 | − | // | |
| 58 | − | // Serial.println("BLE scan complete"); | |
| 59 | − | //} | |
| 60 | 52 | ||
| 61 | 53 | // ================= SYSTEM INFO ================= | |
| 62 | 54 | void printSystemUsage() | |
| @@ -110,16 +102,16 @@ void setup() | |||
| 110 | 102 | USB.begin(); | |
| 111 | 103 | Keyboard.begin(); | |
| 112 | 104 | ||
| 113 | − | // Begin Ble mouse | |
| 114 | − | bleMouse.begin(); | |
| 115 | 105 | ||
| 116 | 106 | ||
| 117 | 107 | // NRF SPI safety | |
| 118 | − | pinMode(CSN1_PIN, OUTPUT); | |
| 119 | − | digitalWrite(CSN1_PIN, HIGH); | |
| 108 | + | //pinMode(CSN1_PIN, OUTPUT); | |
| 109 | + | //digitalWrite(CSN1_PIN, HIGH); | |
| 120 | 110 | ||
| 121 | − | pinMode(CSN2_PIN, OUTPUT); | |
| 122 | − | digitalWrite(CSN2_PIN, HIGH); | |
| 111 | + | //pinMode(CSN2_PIN, OUTPUT); | |
| 112 | + | //digitalWrite(CSN2_PIN, HIGH); | |
| 113 | + | deactivateNRF1(); | |
| 114 | + | deactivateNRF2(); | |
| 123 | 115 | ||
| 124 | 116 | RADIO_SPI = new SPIClass(FSPI); | |
| 125 | 117 | RADIO_SPI->begin(NRF_SCK, NRF_MISO, NRF_MOSI); | |