Added support for the LD-board

Author: dberenguer

cores/panstamp/cc1101.cpp

@@ -58,6 +58,8 @@ CC1101::CC1101(void)
   syncWord[0] = CC1101_DEFVAL_SYNC1;
   syncWord[1] = CC1101_DEFVAL_SYNC0;
   devAddress = CC1101_DEFVAL_ADDR;
+
+  hgmEnabled = false;
 }
 
 /**
@@ -391,6 +393,10 @@ void CC1101::setCarrierFreq(byte freq)
  */
 void CC1101::setPowerDownState() 
 {
+  // Disable LNA on LD-board if any
+  if (hgmEnabled)
+    disableLNA();
+
   // Comming from RX state, we need to enter the IDLE state first
   cmdStrobe(CC1101_SIDLE);
   // Enter Power-down state
@@ -532,6 +538,10 @@ void CC1101::setRxState(void)
 {
   cmdStrobe(CC1101_SRX);
   rfState = RFSTATE_RX;
+
+  // Enable LNA on LD-board if any
+  if (hgmEnabled)
+    enableLNA();
 }
 
 /**
@@ -541,6 +551,72 @@ void CC1101::setRxState(void)
  */
 void CC1101::setTxState(void)
 {
-   cmdStrobe(CC1101_STX);
+  // Enable PA on LD-board if any
+  if (hgmEnabled)
+    enablePA();
+
+  cmdStrobe(CC1101_STX);
   rfState = RFSTATE_TX;
 }
+
+/**
+ * enablePA
+ *
+ * Enable PA and disable LNA on the LD-Board
+ */
+void CC1101::enablePA(void)
+{
+ digitalWrite(PA_EN, HIGH);
+ digitalWrite(LNA_EN, LOW);
+}
+
+/**
+ * enableLNA
+ *
+ * Enable LNA and disable PA on the LD-Board
+ */
+void CC1101::enableLNA(void)
+{
+ digitalWrite(LNA_EN, HIGH);
+ digitalWrite(PA_EN, LOW);
+}
+
+/**
+ * disableLNA
+ *
+ * Disable LNA and PA on the LD-Board
+ */
+void CC1101::disableLNA(void)
+{
+ digitalWrite(LNA_EN, LOW);
+ digitalWrite(PA_EN, LOW);
+}
+
+/**
+ * enableHGM
+ *
+ * Enable Long-distance board with CC1190 IC in high-gain mode
+ */
+void CC1101::enableHGM(void)
+{
+ hgmEnabled = true;
+
+ pinMode(HGM, OUTPUT);
+ pinMode(LNA_EN, OUTPUT);
+ pinMode(PA_EN, OUTPUT);
+
+ digitalWrite(HGM, HIGH);
+}
+
+/**
+ * disableHGM
+ *
+ * Disable high-gain mode on the LD-Board
+ */
+void CC1101::disableHGM(void)
+{
+ hgmEnabled = false;
+
+ digitalWrite(HGM, LOW);
+}
+

cores/panstamp/cc1101.h

@@ -28,7 +28,6 @@
 #include "simplespi.h"
 #include "ccpacket.h"
 
-
 /**
  * Carrier frequencies
  */
@@ -353,6 +352,32 @@ class CC1101
      */
     void setRegsFromEeprom(void);
 
+    /**
+     * High-gain mode enabled on the LD-board
+     */
+    bool hgmEnabled;
+
+    /**
+     * enablePA
+     *
+     * Enable PA and disable LNA on the LD-Board
+     */
+     void enablePA(void);
+
+    /**
+     * enableLNA
+     *
+     * Enable LNA and disable PA on the LD-Board
+     */
+     void enableLNA(void);
+
+    /**
+     * disableLNA
+     *
+     * Disable LNA and PA on the LD-Board
+     */
+     void disableLNA(void);
+
   public:
     /*
      * RF state
@@ -553,8 +578,22 @@ class CC1101
      */
     inline void setTxPowerAmp(uint8_t paLevel)
     {
-        writeReg(CC1101_PATABLE, paLevel);
+      writeReg(CC1101_PATABLE, paLevel);
     }
+
+    /**
+     * enableHGM
+     *
+     * Enable Long-distance board with CC1190 IC in high-gain mode
+     */
+     void enableHGM(void);
+
+    /**
+     * disableHGM
+     *
+     * Disable high-gain mode on the LD-Board
+     */
+     void disableHGM(void);
 };
 
 #endif

variants/panstamp_avr_2.0/pins_arduino.h

@@ -44,15 +44,17 @@
 #define LED      ONBOARD_LED
 #define INIT_ONBOARD_LED()    pinMode(ONBOARD_LED, OUTPUT)
 
+// LD-BOARD definitions
+#define HGM     20
+#define LNA_EN  19
+#define PA_EN   18
+
 #define NUM_DIGITAL_PINS            23
 #define NUM_ANALOG_INPUTS           8
 #define analogInputToDigitalPin(p)  ((p < 6) ? (p) + 14 : -1)
 
-#if defined(__AVR_ATmega8__)
-#define digitalPinHasPWM(p)         ((p) == 9 || (p) == 10 || (p) == 11)
-#else
-#define digitalPinHasPWM(p)         ((p) == 3 || (p) == 5 || (p) == 6 || (p) == 9 || (p) == 10 || (p) == 11)
-#endif
+#define digitalPinHasPWM(p)         ((p) == 1 || (p) == 2 || (p) == 3 || (p) == 4 || (p) == 18 || (p) == 19)
+
 
 static const uint8_t SS   = 22;
 static const uint8_t MOSI = 0;
@@ -82,12 +84,12 @@ static const uint8_t A7 = 13;
 // ADC resolution
 #define ADC_RESOLUTION  1023
 
-#define digitalPinToPCICR(p)    (((p) >= 0 && (p) <= 21) ? (&PCICR) : ((uint8_t *)0))
-#define digitalPinToPCICRbit(p) (((p) <= 7) ? 2 : (((p) <= 13) ? 0 : 1))
-#define digitalPinToPCMSK(p)    (((p) <= 7) ? (&PCMSK2) : (((p) <= 13) ? (&PCMSK0) : (((p) <= 21) ? (&PCMSK1) : ((uint8_t *)0))))
-#define digitalPinToPCMSKbit(p) (((p) <= 7) ? (p) : (((p) <= 13) ? ((p) - 8) : ((p) - 14)))
+#define digitalPinToPCICR(p)    (((p) >= 0 && (p) <= 22) ? (&PCICR) : ((uint8_t *)0))
+#define digitalPinToPCICRbit(p) (((p) <= 22 && (p) >= 18 || (p) == 0 || (p) == 1) ? 2 : (((p) <= 11 && (p) >= 3) ? 1 : 0))
+#define digitalPinToPCMSK(p)    (((p) <= 22 && (p) >= 18 || (p) == 0 || (p) == 1) ? (&PCMSK2) : (((p) <= 11 && (p) >= 3) ? (&PCMSK1) : (&PCMSK0))))
+#define digitalPinToPCMSKbit(p) digital_pin_to_bit_mask_PGM[p]
 
-#define digitalPinToInterrupt(p)  ((p) == 2 ? 0 : ((p) == 3 ? 1 : NOT_AN_INTERRUPT))
+#define digitalPinToInterrupt(p)  ((p) == 18 ? 1 : NOT_AN_INTERRUPT)
 
 #ifdef ARDUINO_MAIN