Diff: scpi-def.cpp

Revision:

5:0a62140cefa4

Parent:

4:23f467ca9934

Child:

6:074e01954263

--- a/scpi-def.cpp	Tue Aug 18 17:12:26 2015 +0000
+++ b/scpi-def.cpp	Thu Aug 20 02:01:45 2015 +0000
@@ -9,6 +9,10 @@
 
 /******************************************************************************/
 #ifdef TARGET_MOTE_L152RC
+#include "gps.h"
+#include "mma8451q.h"
+#include "mpl3115a2.h"
+#include "sx9500.h"
 
 #define RFSW1                    PC_4 //NorAm_Mote RFSwitch_CNTR_1
 #define RFSW2                    PC_13 //NorAm_Mote RFSwitch_CNTR_2
@@ -60,6 +64,20 @@
 DigitalIn dio4_pin(RADIO_DIO_4);
 DigitalIn dio5_pin(RADIO_DIO_5);
 
+AnalogIn ain_bat(PA_1);
+#define AIN_VREF        3.3     // stm32 internal refernce
+#define AIN_VBAT_DIV    2       // resistor divider
+
+/*  gps(tx, rx, en); */
+GPS gps(PB_6, PB_7, PB_11);
+uint32_t gps_coord_cnt;
+
+DigitalIn i2c_int_pin(PB_4);
+I2C i2c(I2C_SDA, I2C_SCL);
+MMA8451Q mma8451q(i2c, i2c_int_pin);
+MPL3115A2 mpl3115a2(i2c, i2c_int_pin);
+SX9500 sx9500(i2c, PA_9, PA_10);
+
 #else // sx1276 shield...
 //  pin:       3     8     1      7    10    12     5
 //           mosi, miso, sclk,   cs,  rst,  dio0, dio1
@@ -125,6 +143,15 @@
                 break;
         } // ...switch (act)           
     }
+    
+#ifdef TARGET_MOTE_L152RC
+    gps.service();
+    if (gps.LatitudeBinary != 0) {
+        gps.LatitudeBinary = 0;
+        //printf("gps long:%f, lat:%f  Vbat:%.2fV\r\n", gps.Longitude, gps.Latitude, ain_bat->read()*AIN_VREF*AIN_VBAT_DIV);
+        gps_coord_cnt++;
+    }    
+#endif /* TARGET_MOTE_L152RC */
 }
 
 scpi_result_t tx_busyQ(scpi_t * context)
@@ -645,6 +672,7 @@
     for (i = 0; i < len; i++)
         radio.tx_buf[i] = buffer[i];
     
+    radio.RegPaConfig.octet = radio.read_reg(REG_PACONFIG);    
     if (is_lora()) {
         lora.RegPayloadLength = len;
         radio.write_reg(REG_LR_PAYLOADLENGTH, lora.RegPayloadLength);
@@ -1290,6 +1318,120 @@
     SCPI_ResultBool(context, rfsw2.read());
     return SCPI_RES_OK;
 }
+
+scpi_result_t vbatQ(scpi_t* context)
+{
+    SCPI_ResultDouble(context, ain_bat.read()*AIN_VREF*AIN_VBAT_DIV);
+    return SCPI_RES_OK;      
+}
+
+scpi_result_t gps_enable(scpi_t* context)
+{
+    scpi_bool_t param1;
+    
+    if (!SCPI_ParamBool(context, &param1, TRUE))
+        return SCPI_RES_ERR;    
+        
+    gps.enable(param1);
+    return SCPI_RES_OK;
+}
+
+scpi_result_t gps_enableQ(scpi_t* context)
+{
+    SCPI_ResultBool(context, gps.enabled());
+    
+    return SCPI_RES_OK;      
+}
+
+scpi_result_t gps_numCords(scpi_t* context)
+{
+    int32_t i;
+    
+    if (!SCPI_ParamInt(context, &i, TRUE))
+        return SCPI_RES_ERR;   
+        
+    gps_coord_cnt = i; 
+    return SCPI_RES_OK;
+}
+
+scpi_result_t gps_numCordsQ(scpi_t* context)
+{
+    SCPI_ResultInt(context, gps_coord_cnt);    
+    return SCPI_RES_OK;    
+}
+
+scpi_result_t gps_longitude(scpi_t* context)
+{
+    if (!SCPI_ParamDouble(context, &gps.Longitude, TRUE))
+        return SCPI_RES_ERR;   
+        
+    return SCPI_RES_OK;         
+}
+
+scpi_result_t gps_longitudeQ(scpi_t* context)
+{
+    SCPI_ResultDouble(context, gps.Longitude);
+    return SCPI_RES_OK;     
+}
+
+scpi_result_t gps_latitude(scpi_t* context)
+{
+    if (!SCPI_ParamDouble(context, &gps.Latitude, TRUE))
+        return SCPI_RES_ERR;   
+        
+    return SCPI_RES_OK;           
+}
+
+scpi_result_t gps_latitudeQ(scpi_t* context)
+{
+    SCPI_ResultDouble(context, gps.Latitude);
+    return SCPI_RES_OK; 
+} 
+
+scpi_result_t mma_idQ(scpi_t* context)
+{
+    SCPI_ResultIntBase(context, mma8451q.read_single(MMA8451_ID), 16);
+    return SCPI_RES_OK;      
+}
+
+scpi_result_t mpl_idQ(scpi_t* context)
+{
+    SCPI_ResultIntBase(context, mpl3115a2.read(MPL3115_ID), 16);
+    return SCPI_RES_OK;       
+}
+
+scpi_result_t sx9500_reset(scpi_t* context)
+{
+    sx9500.reset();
+    return SCPI_RES_OK;
+}
+
+scpi_result_t sx9500_reg(scpi_t* context)
+{
+    int32_t addr, data;
+
+    if (!SCPI_ParamInt(context, &addr, TRUE))
+        return SCPI_RES_ERR;  
+        
+    if (!SCPI_ParamInt(context, &data, TRUE))
+        return SCPI_RES_ERR;  
+
+    sx9500.write(addr, data);
+        
+    return SCPI_RES_OK;
+}
+
+scpi_result_t sx9500_regQ(scpi_t* context)
+{
+    int32_t addr;
+    
+    if (!SCPI_ParamInt(context, &addr, TRUE))
+        return SCPI_RES_ERR; 
+     
+    SCPI_ResultIntBase(context, sx9500.read_single(addr), 16);
+    return SCPI_RES_OK;     
+}
+
 #endif /* TARGET_MOTE_L152RC */
 
 static const scpi_command_t scpi_commands[] = {
@@ -1414,6 +1556,25 @@
     {.pattern = "PD2", .callback = pd2_set,},
     {.pattern = "PD2?", .callback = pd2_get,},
     {.pattern = "RFSW?", .callback = rfswQ,},
+    {.pattern = "VBAT?", .callback = vbatQ,},
+    
+    {.pattern = "GPS:ENable", .callback = gps_enable,},
+    {.pattern = "GPS:ENable?", .callback = gps_enableQ,},
+    {.pattern = "GPS:NUMCoords", .callback = gps_numCords,},
+    {.pattern = "GPS:NUMCoords?", .callback = gps_numCordsQ,},   
+    {.pattern = "GPS:LOngitude", .callback = gps_longitude,},
+    {.pattern = "GPS:LOngitude?", .callback = gps_longitudeQ,},  
+    {.pattern = "GPS:LAtitude", .callback = gps_latitude,},
+    {.pattern = "GPS:LAtitude?", .callback = gps_latitudeQ,},  
+    
+    {.pattern = "MMA:ID?", .callback = mma_idQ,}, 
+    
+    {.pattern = "MPL:ID?", .callback = mpl_idQ,},
+    
+    {.pattern = "SX9500:RST", .callback = sx9500_reset,},
+    {.pattern = "SX9500:REGister", .callback = sx9500_reg,},
+    {.pattern = "SX9500:REGister?", .callback = sx9500_regQ,},
+    
 #endif /* TARGET_MOTE_L152RC */
     
     SCPI_CMD_LIST_END
@@ -1447,4 +1608,10 @@
 {
     radio.rf_switch.attach(rfsw_callback);
     radio.get_frf_MHz();    // get HF bit
+    
+#ifdef TARGET_MOTE_L152RC
+    /* V3 mote */
+    gps.init();
+    gps.en_invert = false;
+#endif /* TARGET_MOTE_L152RC */
 }