Diff: hal.cpp

Revision:

12:febc37010b64

Parent:

11:671d85a0f15b

--- a/hal.cpp	Tue Feb 09 00:28:59 2016 +0000
+++ b/hal.cpp	Thu Feb 18 01:28:06 2016 +0000
@@ -10,8 +10,8 @@
 #define RADIO_NSS       PTD4
 //#define RESET_PIN       PTC1 /* *** TODO *** */
 
-//#define RFSW1                    PTC1 //NorAm_Mote RFSwitch_CNTR_1 *** TODO ***
-//#define RFSW2                    PTC1 //NorAm_Mote RFSwitch_CNTR_2 *** TODO ***
+//#define RFSW1                    PTC6 //NorAm_Mote RFSwitch_CNTR_1 *** TODO ***
+#define RFSW2                    PTC6 //NorAm_Mote RFSwitch_CNTR_2 *** TODO ***
 
 static DigitalOut nss(PTD4);
 static SPI spi(RADIO_MOSI, RADIO_MISO, RADIO_SCLK); // (mosi, miso, sclk)
@@ -19,7 +19,7 @@
 //static DigitalInOut rst(RESET_PIN);
 
 //DigitalOut rfsw1(RFSW1);
-//DigitalOut rfsw2(RFSW2);
+DigitalOut rfsw2(RFSW2);
 
 //DigitalOut hdr_fem_csd(PTC1);   /* *** TODO *** */
 
@@ -110,7 +110,7 @@
     spi.frequency(1000000);
     spi.format(8, 0);
     nss = 1;
-    //RFSwitch_CNTR_2 = 1;
+   // RFSwitch_CNTR_2 = 1;
 #endif
 
     set_time(0);    // initialize RTC
@@ -304,7 +304,7 @@
     return(res);
 }
 
-// 0=RX     1=TX
+ //0=RX     1=TX
 /*void hal_pin_rxtx (u1_t val)
 {
     rxtx = !val;
@@ -322,24 +322,24 @@
 void hal_opmode(u1_t mode, u1_t pa_boost)
 {
    debugSW("hal_opmode %02X %02X\r\n",mode, pa_boost);
-//    if (mode == OPMODE_TX) {  // start of transmission
-//        if (pa_boost) {
-//            rfsw2 = 0;
+    if (mode == OPMODE_TX) {  // start of transmission
+        if (pa_boost) {
+            rfsw2 = 1; //revised to match PE4259 switch controls
 //            rfsw1 = 1;
-//        } else {
-//            rfsw2 = 1;
-//            rfsw1 = 0;          
-//        }
+        } else {
+            rfsw2 = 1;  //revised to match PE4259 switch controls
+//           rfsw1 = 0;          
+        }
 //        hdr_fem_csd = 0;    // debug   
-//    } else if (mode == OPMODE_RX || mode == OPMODE_RX_SINGLE || mode == OPMODE_CAD) { // start of reception
-//        rfsw2 = 1;
-//        rfsw1 = 1; 
+    } else if (mode == OPMODE_RX || mode == OPMODE_RX_SINGLE || mode == OPMODE_CAD) { // start of reception
+        rfsw2 = 0;  //revised to match PE4259 switch controls
+//       rfsw1 = 1; 
 //       hdr_fem_csd = 1;    // debug        
-//    } else { // RF switch shutdown
-//        rfsw2 = 0;
+    } else { // RF switch shutdown
+        rfsw2 = 1;  //revised to match PE4259 switch controls
 //        rfsw1 = 0;
-//        hdr_fem_csd = 0;    // debug   
-//    }
+//       hdr_fem_csd = 0;    // debug   
+    }
    debugSW("hal_opmode exit\r\n");
 }