Operation/adding error manager implementaton

radsat-sk/framework/fileio/RFram.c

@@ -8,6 +8,7 @@
 #include <hal/errors.h>
 #include <hal/Storage/FRAM.h>
 #include <RCommon.h>
+#include <RErrorManager.h>
 
 
 /***************************************************************************************************
@@ -34,7 +35,8 @@ int framInit(void) {
 
 	int error = FRAM_start();
 
-	// TODO: record errors (if present) to System Manager
+	if (error != SUCCESS)
+		errorReportComponent(componentHalFram , error);
 
 	return error;
 }
@@ -57,7 +59,8 @@ int framRead(uint8_t* data, uint32_t address, uint32_t size) {
 
 	int error = FRAM_read(data, address, size);
 
-	// TODO: record errors (if present) to System Manager
+	if (error != SUCCESS)
+		errorReportComponent(componentHalFram , error);
 
 	return error;
 }
@@ -80,7 +83,8 @@ int framWrite(uint8_t* data, uint32_t address, uint32_t size) {
 
 	int error = FRAM_writeAndVerify(data, address, size);
 
-	// TODO: record errors (if present) to System Manager
+	if (error != SUCCESS)
+		errorReportComponent(componentHalFram , error);
 
 	return error;
 }

radsat-sk/operation/message/crypt/RKey.c

@@ -7,6 +7,7 @@
 #include <RKey.h>
 #include <RFram.h>
 #include <RDebug.h>
+#include <RErrorManager.h>
 
 
 /***************************************************************************************************
@@ -55,13 +56,22 @@ uint8_t privateKey(void) {
 		int error = 0;
 
 		// read from FRAM
-		error = framRead(&key1, PRIVATE_KEY_ADDR_ONE,   sizeof(key1));
-		if (error) return 0;
+		error = framRead(&key1, PRIVATE_KEY_ADDR_ONE,   sizeof(key1))
+
+		if (error != SUCCESS)
+			errorReportModule(moduleFram , error);
+			return error;
+
 		error = framRead(&key2, PRIVATE_KEY_ADDR_TWO,   sizeof(key2));
-		if (error) return 0;
+
+		if (error != SUCCESS)
+			errorReportModule(moduleFram , error);
+			return error;
 		error = framRead(&key3, PRIVATE_KEY_ADDR_THREE, sizeof(key3));
-		if (error) return 0;
 
+		if (error != SUCCESS)
+			errorReportModule(moduleFram , error);
+			return error;
 		// all of the keys are the same
 		if ((key1 == key2) && (key1 == key3) && (key2 == key3)) {
 			key = key1;
@@ -108,7 +118,6 @@ uint8_t privateKey(void) {
 
 			debugPrint("RKey: all three keys are different (Key1 = %d, Key2 = %d, Key3 = %d). Sending Key1...\n", key1, key2, key3);
 
-			// TODO: report an error to the system manager
 
 			key = key1;
 		}

radsat-sk/operation/services/RFileTransferService.c

@@ -10,6 +10,7 @@
 #include <RMessage.h>
 #include <string.h>
 #include <RCommon.h>
+#include <RErrorManager.h>
 
 
 /**

radsat-sk/operation/subsystems/RAntenna.c

@@ -10,6 +10,7 @@
 #include <hal/errors.h>
 #include <hal/Timing/Time.h>
 #include <RCommon.h>
+#include <RErrorManager.h>
 
 
 /***************************************************************************************************
@@ -54,7 +55,9 @@ int antennaInit(void) {
 	if (error == 0)
 		antennaInitialized = 1;
 
-	// TODO: record errors (if present) to System Manager
+	if (error != SUCCESS)
+			errorReportComponent(moduleFram , error)
+
 	return error;
 }
 
@@ -80,7 +83,7 @@ int antennaDeploymentAttempt(void) {
 		// Error check for requesting antenna status
 		if(error != 0) {
 
-			// TODO: record errors (if present) to System Manager
+			errorReportComponent(componentSsiAntenna,error);
 			return error;
 		}
 
@@ -101,7 +104,9 @@ int antennaDeploymentAttempt(void) {
 			// Error check for Arming A Side
 			if(error != 0) {
 
-				// TODO: record errors (if present) to System Manager
+
+				errorReportComponent(componentSsiAntenna,error);
+
 				return error;
 			}
 
@@ -111,7 +116,8 @@ int antennaDeploymentAttempt(void) {
 			// Error check for antenna status
 			if(error != 0) {
 
-				// TODO: record errors (if present) to System Manager
+				errorReportComponent(componentSsiAntenna,error);
+
 				return error;
 			}
 
@@ -127,7 +133,8 @@ int antennaDeploymentAttempt(void) {
 				// Check if autoDeployment failed
 				if(error != 0) {
 
-					// TODO: record errors (if present) to System Manager
+					errorReportComponent(componentSsiAntenna,error);
+
 					return error;
 				}
 
@@ -137,7 +144,8 @@ int antennaDeploymentAttempt(void) {
 				// Check if disarm failed
 				if(error != 0) {
 
-					// TODO: record errors (if present) to System Manager
+					errorReportComponent(componentSsiAntenna,error);
+
 					return error;
 				}
 			}
@@ -159,7 +167,8 @@ int antennaDeploymentAttempt(void) {
 		// Error check for requesting antenna status
 		if(error != 0) {
 
-			// TODO: record errors (if present) to System Manager
+			errorReportComponent(componentSsiAntenna,error);
+
 			return error;
 		}
 
@@ -180,7 +189,8 @@ int antennaDeploymentAttempt(void) {
 			// Error check for requesting antenna status
 			if(error != 0) {
 
-				// TODO: record errors (if present) to System Manager
+				errorReportComponent(componentSsiAntenna,error);
+
 				return error;
 			}
 
@@ -190,7 +200,8 @@ int antennaDeploymentAttempt(void) {
 			// Error check for antenna status
 			if(error != 0) {
 
-				// TODO: record errors (if present) to System Manager
+				errorReportComponent(componentSsiAntenna,error);
+
 				return error;
 			}
 
@@ -206,7 +217,9 @@ int antennaDeploymentAttempt(void) {
 				// Check if autoDeployment failed
 				if(error != 0) {
 
-					// TODO: record errors (if present) to System Manager
+
+					errorReportComponent(componentSsiAntenna,error);
+
 					return error;
 				}
 
@@ -216,7 +229,8 @@ int antennaDeploymentAttempt(void) {
 				// Check if disarm failed
 				if(error != 0) {
 
-					// TODO: record errors (if present) to System Manager
+					errorReportComponent(componentSsiAntenna,error);
+
 					return error;
 				}
 			}
@@ -253,7 +267,8 @@ int antennaTelemetry(antenna_telemetry_t* telemetry) {
 	// Error check for Isis Antenna function
 	if(error != 0) {
 
-		// TODO: record errors (if present) to System Manager
+		errorReportComponent(componentSsiAntenna,error);
+
 		return error;
 	}
 
@@ -272,7 +287,8 @@ int antennaTelemetry(antenna_telemetry_t* telemetry) {
 	// Error check for Isis Antenna function
 	if(error != 0) {
 
-		// TODO: record errors (if present) to System Manager
+		errorReportComponent(componentSsiAntenna,error);
+
 		return error;
 	}
 
@@ -299,15 +315,17 @@ int antennaReset(void) {
 	int error = IsisAntS_reset(ANTENNA_INDEX, isisants_sideA);
 
 	if (error != SUCCESS) {
-		// TODO: record errors (if present) to System Manager
+
+		errorReportComponent(componentSsiAntenna,error);
+
 		return error;
 	}
 
 	// Reset side B antenna. See section 6.2 of Antenna System User Manual
 	error = IsisAntS_reset(ANTENNA_INDEX, isisants_sideB);
 
-	if (error != SUCCESS) {
-		// TODO: record errors (if present) to System Manager
+	if (error != SUCCESS) {		
+		errorReportComponent(componentSsiAntenna,error);
 	}
 
 	return error;
@@ -328,7 +346,8 @@ int antennaTemperature(float* temperatureOne, float* temperatureTwo) {
 	int error = IsisAntS_getTemperature(ANTENNA_INDEX, isisants_sideA, &temperature);
 
 	if (error != SUCCESS) {
-		// TODO: record errors (if present) to System Manager
+		errorReportComponent(componentSsiAntenna,error);
+
 		return error;
 	}
 
@@ -339,7 +358,7 @@ int antennaTemperature(float* temperatureOne, float* temperatureTwo) {
 	*temperatureTwo = ((float)temperature * -0.2922) + 190.65;
 
 	if (error != SUCCESS) {
-		// TODO: record errors (if present) to System Manager
+		errorReportComponent(componentSsiAntenna,error);
 	}
 
 	return error;

radsat-sk/operation/subsystems/RBattery.c

@@ -110,6 +110,11 @@ static uint32_t batteryTemperatureCommandBytes[4] = {
 		0x10E3B8		// Daughterboard 3 Temperature
 };
 
+/**
+ * Command for Resetting Battery Watchdog (0x2200)
+ */
+static uint8_t batteryWatchdogResetCommand[2] = {0x22, 0x00};
+
 /***************************************************************************************************
                                        PRIVATE FUNCTION STUBS
 ***************************************************************************************************/
@@ -246,6 +251,21 @@ int batteryIsNotSafe(uint8_t* safeFlag) {
 	return SUCCESS;
 }
 
+/**
+ * Pet the Communications watchdog on the Battery using code 0x22
+ * @return either an error if it occurred, or 0
+ */
+int batteryPetWatchDog(void) {
+	// One way communication so just use transmit using reset watchdog command 0x22
+	int error = i2cTransmit(BATTERY_I2C_SLAVE_ADDR, batteryWatchdogResetCommand, BATTERY_COMMAND_LENGTH);
+
+	if (error != SUCCESS) {
+		return error;
+	}
+
+	return SUCCESS;
+}
+
 
 /***************************************************************************************************
                                          PRIVATE FUNCTIONS

radsat-sk/operation/subsystems/RBattery.h

@@ -42,6 +42,6 @@ typedef struct _battery_status_t {
 
 int batteryTelemetry(battery_status_t* dataStorage);
 int batteryIsNotSafe(uint8_t* safeFlag);
-
+int batteryPetWatchdog(void);
 
 #endif /* RBATTERY_H_ */

radsat-sk/operation/subsystems/RObc.c

@@ -9,6 +9,7 @@
 #include <hal/errors.h>
 #include <hal/Timing/WatchDogTimer.h>
 #include <hal/Timing/RTC.h>
+#include <RErrorManager.h>
 
 /***************************************************************************************************
                                              PUBLIC API
@@ -24,7 +25,7 @@ int obcTelemetry(obc_telemetry_t* telemetry){
 	int error = RTC_getTemperature(&temperature);
 
 	if (error != SUCCESS) {
-		// TODO: record errors (if present) to System Manager
+		errorReportComponent(componentObc,error);
 		return error;
 	}
 

radsat-sk/operation/subsystems/RPdb.c

@@ -8,6 +8,7 @@
 #include <RI2c.h>
 #include <string.h>
 #include <RCommon.h>
+#include <RErrorManager.h>
 
 
 /***************************************************************************************************

radsat-sk/operation/subsystems/RPdb.h

@@ -49,6 +49,6 @@ typedef struct _pdb_status_t {
 
 int pdbSunSensorData(sun_sensor_status_t* sunData);
 int pdbTelemetry(pdb_status_t* dataStorage);
-int pdbPetWatchdog(void);
+int pdbPetWatchDog(void);
 
 #endif /* RPdb_H_ */