Index: firmware/source/sys_main.c =================================================================== diff -u -rdcbd821e41803adc6e582d909207bc97f85ff939 -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd --- firmware/source/sys_main.c (.../sys_main.c) (revision dcbd821e41803adc6e582d909207bc97f85ff939) +++ firmware/source/sys_main.c (.../sys_main.c) (revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd) @@ -52,19 +52,23 @@ /* USER CODE BEGIN (1) */ #include "system.h" #include "sys_dma.h" +#include "adc.h" #include "can.h" +#include "etpwm.h" #include "gio.h" #include "mibspi.h" #include "sci.h" #include "rti.h" -#include "Common.h" -#include "AlarmLamp.h" +#include "DGCommon.h" +#include "AlarmMgmt.h" #include "CommBuffers.h" #include "CPLD.h" #include "FPGA.h" +#include "InternalADC.h" #include "MsgQueues.h" #include "OperationModes.h" +#include "RTC.h" #include "SafetyShutdown.h" #include "SystemComm.h" #include "TaskBG.h" @@ -122,7 +126,15 @@ static void initProcessor( void ) { gioInit(); // configure GPIO pins - mibspiInit(); // re-purposing MIBSPI5 I/O/C pins as GPIO + adcInit(); // configure internal ADC channels + mibspiInit(); // configure MIBSPI3 and re-purpose MIBSPI1 & 5 pins for GPIO + etpwmInit(); // configure PWMs + etpwmSetCmpA( etpwmREG1, 0 ); + etpwmSetCmpA( etpwmREG2, 0 ); + etpwmSetCmpA( etpwmREG3, 0 ); + etpwmSetCmpA( etpwmREG4, 0 ); + etpwmSetCmpA( etpwmREG6, 0 ); + etpwmSetCmpA( etpwmREG7, 0 ); canInit(); // CAN1 = CAN, re-purposing CAN2 and CAN3 Rx and Tx pins as GPIO sciInit(); // SCI1 used for PC serial interface, SCI2 used for FPGA serial interface dmaEnable(); // enable DMA @@ -141,9 +153,11 @@ initTimers(); initSafetyShutdown(); initCPLD(); - initAlarmLamp(); + initAlarmMgmt(); initWatchdogMgmt(); initFPGA(); + initInternalADC(); + initRTC(); initCommBuffers(); initMsgQueues(); initSystemComm();