Merge pull request pr3y#153 from bmorcelli/main

Fix initialization to work with CC1101
eadmaster · Aug 8, 2024 · a640c04 · a640c04
2 parents feee5d3 + 9593905
commit a640c04
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -107,6 +107,7 @@ void setup_gpio() {
   #if defined(BACKLIGHT)
   pinMode(BACKLIGHT, OUTPUT);
   #endif
+  initCC1101once(); // Sets GPIO in the CC1101 lib
 }
 
 
@@ -284,7 +285,7 @@ void setup() {
     // start a task to handle serial commands while the webui is running
     startSerialCommandsHandlerTask();
   #endif
-  
+
   delay(200);
   previousMillis = millis();
 }
@@ -305,7 +306,7 @@ void loop() {
   tft.fillRect(0,0,WIDTH,HEIGHT,BGCOLOR);
   setupSdCard();
   getConfigs();
-  if(RfModule==1) initCC1101once();
+
 
   while(1){
     if (returnToMenu) {

diff --git a/src/modules/rf/rf.cpp b/src/modules/rf/rf.cpp
@@ -365,13 +365,17 @@ void initCC1101once() {
         #else
             ELECHOUSE_cc1101.setGDO0(CC1101_GDO0_PIN);  // use Gdo0 for both Tx and Rx
         #endif
+        /*
+        Don't need to start comunications now
         if (ELECHOUSE_cc1101.getCC1101()){       // Check the CC1101 Spi connection.
             Serial.println("cc1101 Connection OK");
         } else {
             Serial.println("cc1101 Connection Error");
             return;
         }
         ELECHOUSE_cc1101.Init();
+        */        
+
     #else
         Serial.println("Error: USE_CC1101_VIA_SPI not defined for this board");
         //TODO: interface using PCA9554
@@ -383,6 +387,7 @@ bool initRfModule(String mode, float frequency) {
 
     if(RfModule == 1) { // CC1101 in use
         #ifdef USE_CC1101_VIA_SPI   
+            ELECHOUSE_cc1101.Init();
             if (ELECHOUSE_cc1101.getCC1101()){       // Check the CC1101 Spi connection.
                 Serial.println("cc1101 Connection OK");
             } else {