Revision 27:650cffb6c8ff, committed 2021-10-18

Comitter:

mfwic

Date:

Mon Oct 18 22:07:14 2021 +0000

Parent:

26:55e8e1a9cc84

Commit message:

Test publish

Changed in this revision

--- a/src/all_io.cpp	Tue Jan 22 19:56:22 2019 +0000
+++ b/src/all_io.cpp	Mon Oct 18 22:07:14 2021 +0000
@@ -32,36 +32,57 @@
 
 // Digital IO
 //
-// 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
+DigitalInOut SWDIO(PA_13);
+DigitalOut fan_on(PA_15);
+DigitalOut vdoc(PA_4);
 
-// 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);
-
-
-// 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.
-
-// Use extchlat to latch new wr_out signals to the external slots via ribbon cable.
-DigitalOut extchlat(PA_1);
+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  all_on(PA_0);
+DigitalIn ILR_enable(PA_0);
+DigitalIn SWDCLK(PA_14);
+DigitalIn fan_pwn(PB_3);
+DigitalIn MS(PA_1);
 
 // 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);
-
-DigitalOut myled(LED1);
+AnalogIn Vfilt48(PA_7);
+//AnalogIn VIN24(PC_4);
+AnalogIn Vfilt12(PA_6);
+//AnalogIn IIN48(PC_2);
+//AnalogIn IIN24(PC_1);
+AnalogIn Ifilt12(PA_5);

--- a/src/lut.cpp	Tue Jan 22 19:56:22 2019 +0000
+++ b/src/lut.cpp	Mon Oct 18 22:07:14 2021 +0000
@@ -37,17 +37,17 @@
 #include "lut_data_en_v1p5_1.h"
 #include "lut_data_slot_v1p5_1.h"
 
-#include "lut_data_en_v1p5_2.h"
-#include "lut_data_slot_v1p5_2.h"
+//#include "lut_data_en_v1p5_2.h"
+//#include "lut_data_slot_v1p5_2.h"
 
-#include "lut_data_en_v1p5_3.h"
-#include "lut_data_slot_v1p5_3.h"
+//#include "lut_data_en_v1p5_3.h"
+//#include "lut_data_slot_v1p5_3.h"
 
-#include "lut_data_en_v1p5_12.h"
-#include "lut_data_slot_v1p5_12.h"
+//#include "lut_data_en_v1p5_12.h"
+//#include "lut_data_slot_v1p5_12.h"
 
-#include "lut_data_en_v1p5_13.h"
-#include "lut_data_slot_v1p5_13.h"
+//#include "lut_data_en_v1p5_13.h"
+//#include "lut_data_slot_v1p5_13.h"
 
 /*******************************************************************************
 getLUT_binCodeArray - gets output codes from LUT using row reference.
@@ -65,7 +65,7 @@
                 }
             }
             break;
-        case 2  :
+        /*case 2  :
             if(row<MAX_LUT_ENTRIES_2){
                 for(unsigned int b=0;b<max_boards;b++){
                     bCodeRow[b] = binC_2[row][b];
@@ -96,7 +96,7 @@
                 for(unsigned int b=0;b<max_boards;b++){
                     bCodeRow[b] = binC_3[MAX_LUT_ENTRIES_3-1][b];
                 }
-            }
+            }*/
     }
 }
 
@@ -105,7 +105,7 @@
 *******************************************************************************/
 unsigned int getLUT_binCode(unsigned short row){
     unsigned int binC;
-    switch(max_boards) {
+    /*switch(max_boards) {
         case 12  :
             if(row<MAX_LUT_ENTRIES_12){
                 binC = binC_12[row];
@@ -126,7 +126,7 @@
             }else{
                 binC = binC_13[MAX_LUT_ENTRIES_13-1];
             }
-    }
+    }*/
     return binC;
 }
 
@@ -143,7 +143,7 @@
                 thermC = thermC_1[MAX_LUT_ENTRIES_1-1];
             }
             break;
-        case 2  :
+        /*case 2  :
             if(row<MAX_LUT_ENTRIES_2){
                 thermC = thermC_2[row];
             }else{
@@ -176,7 +176,7 @@
                 thermC = thermC_13[row];
             }else{
                 thermC = thermC_13[MAX_LUT_ENTRIES_13-1];
-            }
+            }*/
     }
     return thermC;
 }
\ No newline at end of file