Dependencies:   ros_lib_kinetic

Revision:
34:54e9ebe9e87f
Parent:
33:9877ca32e43c
Child:
35:26d36418e369
Child:
36:4459be8296e9
--- a/LLComms.cpp	Wed Mar 13 11:59:58 2019 +0000
+++ b/LLComms.cpp	Mon Apr 15 15:12:51 2019 +0000
@@ -13,7 +13,8 @@
     pinGate2(PF_15),
     pinGate3(PF_12),
     pinGate4(PF_3),
-    pinGate5(PF_13),
+    pinGate5(PC_7),
+    //pinGate5(PF_13),
     //pinGate6(PE_11), // See above nonsense
     pinGate7(PE_13),
     pinReset(PD_2)
@@ -24,20 +25,20 @@
     spi_1.format(16,2);
     spi_1.frequency(LOW_LEVEL_SPI_FREQUENCY);
 
-    PinName LLPins[8] = {PD_15, PE_10, PD_11, PD_14, PE_7, PD_12, PF_10, PD_13};
-    //PinName LLPins[8] = {PD_15, PE_10, PD_14, PD_11, PE_7, PD_12, PF_10, PD_13};
-    PinName ADCPins[8] = {PG_12, PG_9, PE_1, PG_0, PD_0, PD_1, PF_0, PF_1};
+    PinName LLPins[8] = {PD_15, PE_10, PD_11, PD_14, PE_7, PB_1, PF_10, PD_13};
+    //PinName LLPins[8] = {PD_15, PE_10, PD_11, PD_14, PE_7, PD_12, PF_10, PD_13};
+    //PinName ADCPins[8] = {PG_12, PG_9, PE_1, PG_0, PD_0, PD_1, PF_0, PF_1};
     for (short int i = 0; i < 8; i++) {
         isDataReady[i] = 0;
         cs_LL[i] = new DigitalOut(LLPins[i]);
-        cs_ADC[i] = new DigitalOut(ADCPins[i]);
+        //cs_ADC[i] = new DigitalOut(ADCPins[i]);
     }
     
     // Initialise relevant variables
     for(short int i = 0; i<N_CHANNELS; i++) {
         // All chip selects in off state
         *cs_LL[i] = 1;
-        *cs_ADC[i] = 1;
+        //*cs_ADC[i] = 1;
         // Initialise pressures/positions
         pressureSensor_uint[i] = 0.0;
         pressureSensor_bar[i] = -1.0;