Diff: LLComms.cpp

Revision:

38:8d36df9244e9

Parent:

37:37da606f4466

Parent:

35:26d36418e369

Child:

39:e69a6fa12977

--- a/LLComms.cpp	Fri Jul 12 10:35:49 2019 +0000
+++ b/LLComms.cpp	Fri Jul 12 10:47:30 2019 +0000
@@ -4,7 +4,11 @@
 
 LLComms::LLComms() : 
     queue(32 * EVENTS_EVENT_SIZE), //32 //8 * EVENTS_EVENT_SIZE
+<<<<<<< working copy
     pinGate6(PA_5),
+=======
+    pinGate6(PB_4), //pinGate6(PE_11),
+>>>>>>> merge rev
     spi_0(PC_12, PC_11, PC_10),
     spi_1(PF_9, PF_8, PF_7),
     spi_2(PB_15, PC_2, PB_13),
@@ -27,8 +31,16 @@
     spi_2.format(16,2);
     spi_2.frequency(LOW_LEVEL_SPI_FREQUENCY);
 
+<<<<<<< working copy
     PinName LLPins[N_CHANNELS] = {PD_15, PE_10, PD_11, PD_14, PE_7, PB_1, PB_12, PD_13, PB_5};
     for (short int i=0; i<N_CHANNELS; i++) {
+=======
+    //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, PB_1, PB_12, 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++) {
+>>>>>>> merge rev
         isDataReady[i] = 0;
         cs_LL[i] = new DigitalOut(LLPins[i]);
         //cs_ADC[i] = new DigitalOut(ADCPins[i]);