Diff: src/all_io.cpp

Revision:

41:bd54c88e3334

Parent:

40:5e675a9bcb6e

Child:

42:3ae73b61f657

--- a/src/all_io.cpp	Fri Mar 08 20:44:56 2019 +0000
+++ b/src/all_io.cpp	Sat Mar 09 19:55:05 2019 +0000
@@ -43,68 +43,65 @@
 //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);
-I2C I2C_SCL(PB6)
-I2C I2C_SDA(PB7)
+I2C i2c(PB_6, PB_7);
 
 
 // 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.
-DigitalInOut SWDIO(PA13)
-DigitalOut fan_on(PA15)
-DigitalOut vdoc(PA4)
+DigitalInOut SWDIO(PA_13);
+DigitalOut fan_on(PA_15);
+AnalogOut vdac(PA_4);
 
 // Use extchlat to latch new wr_out signals to the external slots via ribbon cable.
 //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)
+DigitalOut ec2(PC_0);
+DigitalOut ec15(PC_1);
+DigitalOut ec28(PC_2);
+DigitalOut ec6(PC_3);
+DigitalOut ec12(PC_4);
+DigitalOut ec25(PC_5);
+DigitalOut ec36(PC_6);
+DigitalOut ec31(PC_7);
+DigitalOut ec9(PC_8);
+DigitalOut ec5(PC_9);
+DigitalOut ec24(PC_10);
+DigitalOut ec11(PC_11);
+DigitalOut ec1(PC_12);
+DigitalOut ec10(PC_13);
+DigitalOut ec23(PC_14);
+DigitalOut ec7(PC_15);
+DigitalOut ec18(PA_8);
+DigitalOut ec14(PA_9);
+DigitalOut ec27(PA_10);
+DigitalOut ec19(PA_11);
+DigitalOut ec32(PA_12);
+DigitalOut ec35(PB_0);
+DigitalOut ec21(PB_1);
+DigitalOut ec30(PB_2);
+DigitalOut ec33(PB_4);
+DigitalOut ec20(PB_5);
+DigitalOut ec34(PB_8);
+DigitalOut ec29(PB_9);
+DigitalOut ec8(PB_10);
+DigitalOut ec4(PB_11);
+DigitalOut ec17(PB_12);
+DigitalOut ec13(PB_13);
+DigitalOut ec26(PB_14);
+DigitalOut ec22(PB_15);
 
 // 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 ILR_enable(PA0)
-DigitalIn SWDCLK(PA14)
-DigitalIn fan_pwn(PB3)
-DigitalIn MS(PA1)
+DigitalIn ILR_enable(PA_0);
+DigitalIn SWDCLK(PA_14);
+DigitalIn fan_pwn(PB_3);
+DigitalIn MS(PA_1);
 
 // Analog IO
 //
-AnalogIn 48Vfilt(PA7);
+AnalogIn Vfilt48(PA_7);
 //AnalogIn VIN24(PC_4);
-AnalogIn 12Vfilt(PA6);
+AnalogIn Vfilt12(PA_6);
 //AnalogIn IIN48(PC_2);
 //AnalogIn IIN24(PC_1);
-AnalogIn 12ifilt(PA5);
-
-//DigitalOut myled(LED1);
+AnalogIn Ifilt12(PA_5);
\ No newline at end of file