Corrections with SpaceWire Channels first config and backup SpW channels

NSEE · Jul 6, 2021 · 4c76133 · 4c76133
1 parent 3f29396
commit 4c76133
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 7 deletions.
diff --git a/G3U_HW_V02_2GB/Qsys_Project/software/Simucam_R0_UART/Simucam_R0_UART.elf b/G3U_HW_V02_2GB/Qsys_Project/software/Simucam_R0_UART/Simucam_R0_UART.elf
diff --git a/G3U_HW_V02_2GB/Qsys_Project/software/Simucam_R0_UART/simucam_definitions.h b/G3U_HW_V02_2GB/Qsys_Project/software/Simucam_R0_UART/simucam_definitions.h
@@ -29,7 +29,7 @@
 
 /* HW and FW release version */
 #define SIMUCAM_RELEASE                 "D3"
-#define SIMUCAM_HW_VERSION              "0.4"
+#define SIMUCAM_HW_VERSION              "0.5"
 #define SIMUCAM_FW_VERSION              "0.0"
 
 #define N_OF_FastFEE    	1

diff --git a/G3U_HW_V02_2GB/Software_Project/Firmware/rtos/fee_taskV3.c b/G3U_HW_V02_2GB/Software_Project/Firmware/rtos/fee_taskV3.c
@@ -58,7 +58,6 @@ void vFeeTaskV3(void *task_data) {
 				for (ucIL = 0; ucIL < 8; ucIL++){
 					xTinMode[ucIL].ucAebNumber  = 0;
 					xTinMode[ucIL].ucSideCcd    = eDpktCcdSideE;
-					xTinMode[ucIL].ucSpWChannel = 0;
 					xTinMode[ucIL].bDataOn      = FALSE;
 					xTinMode[ucIL].bPattern     = FALSE;
 					xTinMode[ucIL].bSent        = FALSE;
@@ -195,7 +194,6 @@ void vFeeTaskV3(void *task_data) {
 				for (ucIL = 0; ucIL < 8; ucIL++){
 					xTinMode[ucIL].ucAebNumber  = 0;
 					xTinMode[ucIL].ucSideCcd    = eDpktCcdSideE;
-					xTinMode[ucIL].ucSpWChannel = 0;
 					xTinMode[ucIL].bDataOn      = FALSE;
 					xTinMode[ucIL].bPattern     = FALSE;
 					xTinMode[ucIL].bSent        = FALSE;

diff --git a/G3U_HW_V02_2GB/Software_Project/Firmware/rtos/initialization_task.c b/G3U_HW_V02_2GB/Software_Project/Firmware/rtos/initialization_task.c
@@ -306,6 +306,21 @@ void vInitialTask(void *task_data)
 	vChangeSyncSource(&xSimMeb, xDefaults.ucSyncSource);
 	vChangeEPValue(&xSimMeb, xDefaults.usiExposurePeriod);
 
+	/* Set SpaceWire Channels for the Simulation */
+	if (FALSE == xDefaults.bUseBackupSpwChannels) {
+		/* Configure Communication Channel 1-4 Demux for A-B-C-D */
+		bSpwdCh1DemuxSelect(eSpwdCh1DemuxSelIdChA);
+		bSpwdCh2DemuxSelect(eSpwdCh2DemuxSelIdChB);
+		bSpwdCh3DemuxSelect(eSpwdCh3DemuxSelIdChC);
+		bSpwdCh4DemuxSelect(eSpwdCh4DemuxSelIdChD);
+	} else {
+		/* Configure Communication Channel 1-4 Demux for E-F-G-H */
+		bSpwdCh1DemuxSelect(eSpwdCh1DemuxSelIdChE);
+		bSpwdCh2DemuxSelect(eSpwdCh2DemuxSelIdChF);
+		bSpwdCh3DemuxSelect(eSpwdCh3DemuxSelIdChG);
+		bSpwdCh4DemuxSelect(eSpwdCh4DemuxSelIdChH);
+	}
+
 #if DEBUG_ON
 //		if ( xDefaults.ucDebugLevel <= dlMinorMessage ) {
 	if ( xDefaults.ucDebugLevel <= dlMajorMessage ) {

diff --git a/G3U_HW_V02_2GB/Software_Project/Firmware/utils/initialization_simucam.c b/G3U_HW_V02_2GB/Software_Project/Firmware/utils/initialization_simucam.c
@@ -40,16 +40,16 @@ void vInitSimucamBasicHW(void) {
 	vRstcHoldDeviceReset(RSTC_DEV_RS232_RST_CTRL_MSK);
 	vRstcReleaseDeviceReset(RSTC_DEV_RS232_RST_CTRL_MSK);
 
-	/* Configure SCommunication Channel 1 Demux */
+	/* Configure Communication Channel 1 Demux */
 	bSpwdCh1DemuxSelect(eSpwdCh1DemuxSelIdChA);
 
-	/* Configure SCommunication Channel 2 Demux */
+	/* Configure Communication Channel 2 Demux */
 	bSpwdCh2DemuxSelect(eSpwdCh2DemuxSelIdChB);
 
-	/* Configure SCommunication Channel 3 Demux */
+	/* Configure Communication Channel 3 Demux */
 	bSpwdCh3DemuxSelect(eSpwdCh3DemuxSelIdChC);
 
-	/* Configure SCommunication Channel 4 Demux */
+	/* Configure Communication Channel 4 Demux */
 	bSpwdCh4DemuxSelect(eSpwdCh4DemuxSelIdChD);
 
 	/* Disable the Isolation and LVDS driver boards*/

diff --git a/Program_Flash_DE4/D3_0_5.sof b/Program_Flash_DE4/D3_0_5.sof
diff --git a/Program_Flash_DE4/D3_0_5_0_0.elf b/Program_Flash_DE4/D3_0_5_0_0.elf
diff --git a/Program_Flash_DE4/D3_0_5_DE4530.sof b/Program_Flash_DE4/D3_0_5_DE4530.sof