orion-rffd69163
add remaining onoe cc1101 in device check
+11 −25
1 file changed
- M firmware/device_check.cpp +11 −25
| @@ -37,35 +37,20 @@ bool checkNRF(RF24 &radio) | |||
| 37 | 37 | } | |
| 38 | 38 | ||
| 39 | 39 | // ===== CC1101 CHECK ===== | |
| 40 | − | bool checkCC1101_1() | |
| 40 | + | bool checkCC1101(uint8_t csPin) | |
| 41 | 41 | { | |
| 42 | 42 | ELECHOUSE_cc1101.setSpiPin( | |
| 43 | 43 | cc1101_SCK, | |
| 44 | 44 | cc1101_MISO, | |
| 45 | 45 | cc1101_MOSI, | |
| 46 | − | CC1101_CS | |
| 46 | + | csPin | |
| 47 | 47 | ); | |
| 48 | 48 | ||
| 49 | − | delay(5); // important stabilization | |
| 49 | + | delay(5); | |
| 50 | 50 | ||
| 51 | 51 | return ELECHOUSE_cc1101.getCC1101(); | |
| 52 | 52 | } | |
| 53 | 53 | ||
| 54 | − | bool checkCC1101_2() | |
| 55 | − | { | |
| 56 | − | ELECHOUSE_cc1101.setSpiPin( | |
| 57 | − | cc1101_SCK, | |
| 58 | − | cc1101_MISO, | |
| 59 | − | cc1101_MOSI, | |
| 60 | − | CC1101_2_CS | |
| 61 | − | ); | |
| 62 | − | ||
| 63 | − | delay(5); // important stabilization | |
| 64 | − | ||
| 65 | − | return ELECHOUSE_cc1101.getCC1101(); | |
| 66 | − | } | |
| 67 | − | ||
| 68 | − | ||
| 69 | 54 | // ===== BUTTON CHECK ===== | |
| 70 | 55 | bool checkButtons() | |
| 71 | 56 | { | |
| @@ -81,7 +66,9 @@ bool checkButtons() | |||
| 81 | 66 | if (!digitalRead(BTN_UP) || | |
| 82 | 67 | !digitalRead(BTN_DOWN) || | |
| 83 | 68 | !digitalRead(BTN_SELECT) || | |
| 84 | − | !digitalRead(BTN_BACK)) | |
| 69 | + | !digitalRead(BTN_BACK) || | |
| 70 | + | !digitalRead(BTN_RIGHT) || | |
| 71 | + | !digitalRead(BTN_LEFT)) | |
| 85 | 72 | { | |
| 86 | 73 | return true; | |
| 87 | 74 | } | |
| @@ -97,8 +84,8 @@ bool checkButtons() | |||
| 97 | 84 | const char* labels[MAX_ITEMS] = { | |
| 98 | 85 | "NRF1", | |
| 99 | 86 | "NRF2", | |
| 100 | − | "CC1101_1", | |
| 101 | − | "CC1101_2", | |
| 87 | + | "CC1101-1", | |
| 88 | + | "CC1101-2", | |
| 102 | 89 | "BUTTONS", | |
| 103 | 90 | "OLED" | |
| 104 | 91 | }; | |
| @@ -117,6 +104,7 @@ void drawStatus(DeviceStatus &s) | |||
| 117 | 104 | values[4] = s.buttons; | |
| 118 | 105 | values[5] = s.oled; | |
| 119 | 106 | ||
| 107 | + | ||
| 120 | 108 | u8g2.clearBuffer(); | |
| 121 | 109 | u8g2.setFont(u8g2_font_6x10_tr); | |
| 122 | 110 | ||
| @@ -154,7 +142,6 @@ void drawStatus(DeviceStatus &s) | |||
| 154 | 142 | u8g2.sendBuffer(); | |
| 155 | 143 | } | |
| 156 | 144 | ||
| 157 | − | ||
| 158 | 145 | // ===== MAIN ===== | |
| 159 | 146 | void device_check_run() | |
| 160 | 147 | { | |
| @@ -163,13 +150,12 @@ void device_check_run() | |||
| 163 | 150 | Serial.println("Running device diagnostics..."); | |
| 164 | 151 | ||
| 165 | 152 | // NRF | |
| 166 | − | // NRF link test | |
| 167 | 153 | status.nrf1 = checkNRF(radio1); | |
| 168 | 154 | status.nrf2 = checkNRF(radio2); | |
| 169 | 155 | ||
| 170 | 156 | // CC1101 | |
| 171 | − | status.cc1101_1 = checkCC1101_1(); | |
| 172 | − | status.cc1101_2 = checkCC1101_1(); | |
| 157 | + | status.cc1101_1 = checkCC1101(CC1101_CS); | |
| 158 | + | status.cc1101_2 = checkCC1101(CC1101_2_CS); | |
| 173 | 159 | ||
| 174 | 160 | // Buttons | |
| 175 | 161 | status.buttons = checkButtons(); | |