- Updated keywords.txt file

- Added support for Saboten v1.1 at 900 MHz - Added feature to turn off amps for sleep mode on long range board
freaklabs · Oct 25, 2013 · beebb52 · beebb52
1 parent 1e0034e
commit beebb52
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 14 deletions.
diff --git a/HOWTO Using the chibiArduino Wireless Protocol Stack.pdf b/HOWTO Using the chibiArduino Wireless Protocol Stack.pdf
diff --git a/keywords.txt b/keywords.txt
@@ -9,24 +9,36 @@
 #######################################
 # Methods and Functions (KEYWORD2)
 #######################################
-chibiInit	KEYWORD2
+chibiInit	        KEYWORD2
 chibiSetShortAddr	KEYWORD2
 chibiGetShortAddr	KEYWORD2
 chibiSetIEEEAddr	KEYWORD2
 chibiGetIEEEAddr	KEYWORD2
-chibiRegRead	KEYWORD2
-chibiRegWrite	KEYWORD2
+chibiRegRead	    KEYWORD2
+chibiRegWrite	    KEYWORD2
 chibiTx	KEYWORD2	
-chibiDataRcvd	KEYWORD2
-chibiGetData	KEYWORD2
-chibiGetRSSI	KEYWORD2
-chibiGetSrcAddr	KEYWORD2
-chibiSetChannel	KEYWORD2
-chibiSleepRadio	KEYWORD2
-chibiCmdInit	KEYWORD2
-chibiCmdPoll	KEYWORD2
-chibiCmdAdd	KEYWORD2
-chibiCmdStr2Num	KEYWORD2
+chibiDataRcvd	    KEYWORD2
+chibiGetData	    KEYWORD2
+chibiGetRSSI	    KEYWORD2
+chibiGetSrcAddr	    KEYWORD2
+chibiSetChannel	    KEYWORD2
+chibiSleepRadio	    KEYWORD2
+chibiCmdInit	    KEYWORD2
+chibiCmdPoll	    KEYWORD2
+chibiCmdAdd         KEYWORD2
+chibiCmdStr2Num	    KEYWORD2
+chibiGetPartID      KEYWORD2
+chibiAesInit        KEYWORD2
+chibiAesEncrypt     KEYWORD2
+chibiAesDecrypt     KEYWORD2
+chibiSetDataRate    KEYWORD2
+chibiGetRand        KEYWORD2
+chibiSetMode        KEYWORD2
+chibiHighGainModeEnable     KEYWORD2
+chibiHighGainModeDisable    KEYWORD2
+
+
+
 
 #######################################
 # Constants (LITERAL1)

diff --git a/src/chb_drvr.c b/src/chb_drvr.c
@@ -757,7 +757,7 @@ static void chb_radio_init()
             chb_reg_read_mod_write(TRX_CTRL1, 1 << 5, 1 << 5);
         #endif
 
-        #if (FREAKDUINO_LONG_RANGE == 1)            
+        #if ((FREAKDUINO_LONG_RANGE == 1) || (SABOTEN == 1))            
           // enable the rf front end controller
           tmp = chibiRegRead(TRX_CTRL1);
           tmp |= 0x80;
@@ -775,6 +775,9 @@ static void chb_radio_init()
           #if (ARASHI_ENET_GATEWAY == 1)
             DDRC |= 1<<5;
             PORTC |= 1<<5; 
+          #elif (SABOTEN == 1)
+            DDRC |= 1<<6;
+            PORTC |= 1<<6;
           #else
             DDRB |= 1<<7;
             PORTB |= (1<<7);
@@ -862,10 +865,17 @@ void chb_drvr_init()
 /**************************************************************************/
 void chb_sleep(U8 enb)
 {
+    uint8_t tmp;
+
     if (enb)
     {
         // if we're using a long range device, disable the high gain mode pin
         #if (FREAKDUINO_LONG_RANGE == 1)    
+            // disable RF front end
+            tmp = chibiRegRead(TRX_CTRL1);
+            tmp &= ~(0x80);
+            chibiRegWrite(TRX_CTRL1, tmp);
+
             chb_high_gain_mode_disable();
         #endif
 
@@ -884,6 +894,11 @@ void chb_sleep(U8 enb)
     {
         // if we're using a long range device, enable the high gain mode pin
         #if (FREAKDUINO_LONG_RANGE == 1)    
+            // enable the RF front end
+            tmp = chibiRegRead(TRX_CTRL1);
+            tmp |= 0x80;
+            chibiRegWrite(TRX_CTRL1, tmp);
+
             chb_high_gain_mode_enable();
         #endif