Diff: src/all_io.cpp

Revision:

39:bdd06cbaf9c3

Parent:

20:5de24e4ae1c5

Child:

40:5e675a9bcb6e

--- a/src/all_io.cpp	Wed Mar 06 23:43:54 2019 +0000
+++ b/src/all_io.cpp	Fri Mar 08 20:37:28 2019 +0000
@@ -35,33 +35,77 @@
 // Slots 12 to 0 are activated with the wr_out signals
 // wr_out[13] = slots[12:0]
 // BusOut signals are specified LSB first
-BusOut wr_out(PA_10, PA_11, PA_12, PA_13, PA_14, PA_15, PC_6, PC_7, PC_8, PC_9, PC_10, PC_11, PC_12); //RK: Need to change ADC inputs to PC_0-PC_5
+//BusOut wr_out(PA_10, PA_11, PA_12, PA_13, PA_14, PA_15, PC_6, PC_7, PC_8, PC_9, PC_10, PC_11, PC_12); //RK: Need to change ADC inputs to PC_0-PC_5
 
 // en_out are binary weighted signals that activate groups of DC-DC converters on the slot cards.
 // en_out[6] = {en32, en16, en8, en4, en2, en1}
 //BusOut en_out(PA_9, PA_8, PA_7, PA_6, PC_14, PA_4); //RK: debug 11/26/2018
 //BusOut signals are specified LSB first
-BusOut en_out(PA_4, PC_13, PA_6, PA_7, PA_8, PA_9);
-DigitalIn pc14(PC_14);
+//BusOut en_out(PA_4, PC_13, PA_6, PA_7, PA_8, PA_9);
+//DigitalIn pc14(PC_14);
+I2C I2C_SCL(PB6)
+I2C I2C_SDA(PB7)
 
 
 // Expansion port signals
 // eport[16] = eport[18:3]
-DigitalIn  eport[16] = {PB_15, PB_14, PB_13, PB_12, PC_15, PB_10, PB_9, PB_8, PB_7, PB_6, PB_5, PB_4, PB_3, PB_2, PB_1, PB_0}; //RK 11/24/2018 PB_11 throws an error. Identifier "PB_11" is undefined. PB_11 is connected to VCAP1.
+//DigitalIn  eport[16] = {PB_15, PB_14, PB_13, PB_12, PC_15, PB_10, PB_9, PB_8, PB_7, PB_6, PB_5, PB_4, PB_3, PB_2, PB_1, PB_0}; //RK 11/24/2018 PB_11 throws an error. Identifier "PB_11" is undefined. PB_11 is connected to VCAP1.
+DigitalInOut SWDIO(PA13)
+DigitalOut fan_on(PA15)
+DigitalOut UART_TX(PA2)
+DigitalOut UART_RX(PA3)
+DigitalOut vdoc(PA4)
 
 // Use extchlat to latch new wr_out signals to the external slots via ribbon cable.
-DigitalOut extchlat(PA_1);
+//DigitalOut extchlat(PA_1);
+DigitalOut ec2(PC0)
+DigitalOut ec15(PC1)
+DigitalOut ec26(PC2)
+DigitalOut ec6(PC3)
+DigitalOut ec12(PC4)
+DigitalOut ec25(PC5)
+DigitalOut ec36(PC6)
+DigitalOut ec31(PC7)
+DigitalOut ec9(PC8)
+DigitalOut ec5(PC9)
+DigitalOut ec24(PC10)
+DigitalOut ec11(PC11)
+DigitalOut ec1(PC12)
+DigitalOut ec10(PC13)
+DigitalOut ec23(PC14)
+DigitalOut ec7(PC15)
+DigitalOut ec18(PA8)
+DigitalOut ec14(PA9)
+DigitalOut ec27(PA10)
+DigitalOut ec19(PA11)
+DigitalOut ec32(PA12)
+DigitalOut ec35(PB0)
+DigitalOut ec21(PB1)
+DigitalOut ec30(PB2)
+DigitalOut ec33(PB4)
+DigitalOut ec20(PB5)
+DigitalOut ec34(PB8)
+DigitalOut ec29(PB9)
+DigitalOut ec8(PB10)
+DigitalOut ec4(PB11)
+DigitalOut ec17(PB12)
+DigitalOut ec13(PB13)
+DigitalOut ec26(PB14)
+DigitalOut ec22(PB15)
 
 // all_on indicates that the load demanded a high amount of current and all DC-DC converters are enabled.
-DigitalIn  all_on(PA_0);
+//DigitalIn  all_on(PA_0);
+DigitalIn ILR_enable(PA0)
+DigitalIn SWDCLK(PA14)
+DigitalIn fan_pwn(PB3)
 
 // Analog IO
 //
-AnalogIn VIN48(PC_3);
-AnalogIn VIN24(PC_4);
-AnalogIn VIN12(PC_5);
-AnalogIn IIN48(PC_2);
-AnalogIn IIN24(PC_1);
-AnalogIn IIN12(PC_0);
+AnalogIn 48Vfilt(PA7);
+//AnalogIn VIN24(PC_4);
+AnalogIn 12Vfilt(PA6);
+//AnalogIn IIN48(PC_2);
+//AnalogIn IIN24(PC_1);
+AnalogIn 12ifilt(PA5);
 
-DigitalOut myled(LED1);
+//DigitalOut myled(LED1);