Mitig: TMR some fan control variables and function calls

common/src/i2c_slave.c

@@ -26,7 +26,7 @@ static uint16_t last_byte_read_got_nack __xMR;
 static cmd_space_t *cmds;
 static cmd_space_t *ext_cmds;
 
-uint8_t use_pec = 0;
+uint16_t use_pec __xMR = 0;
 static uint8_t pec_checksum;
 static uint8_t checksum_from_m;
 static uint8_t added_tx_pec = 0;

main_fw/include/pid.h

@@ -2,6 +2,7 @@
 #define _PID_H
 
 #include <atmel_start.h>
+#include <COAST.h>
 
 // #define DEBUG_PID
 

main_fw/src/i2c_impl.c

@@ -17,7 +17,7 @@ const char MFR_SER[] = "123456789";
 void page_chk();
 uint16_t page __xMR;
 
-extern uint8_t use_pec;
+extern uint16_t use_pec __xMR;
 uint8_t use_pec_local;
 void set_pec();
 
@@ -42,12 +42,12 @@ uint32_t TMR_ERROR_CNT;
 
 void set_frpms();
 uint16_t setfrpms_lin[3];
-extern uint16_t setfrpms[3];
+extern uint16_t setfrpms[3] __xMR;
 
 void set_tc_curve();
 uint16_t temp_curve_points_data[6];
-extern float temp_curve_points_x[3];
-extern float temp_curve_points_y[3];
+extern float temp_curve_points_x[3] __xMR;
+extern float temp_curve_points_y[3] __xMR;
 
 void set_tc_matrix();
 void set_tc_onoff();
@@ -55,15 +55,15 @@ uint16_t temp_matrix_row1[3]; // these mix the 3 temps to compute fan 1 RPM
 uint16_t temp_matrix_row2[3]; //           >>             >>  for fan 2
 uint16_t temp_matrix_row3[3]; //           >>             >>  for fan 3
 uint8_t tc_on;
-extern float temp_matrix[3][3];
-extern uint16_t temp_control_on;
+extern float temp_matrix[3][3] __xMR;
+extern uint16_t temp_control_on __xMR;
 
 uint8_t fan_config_1_2;
 uint8_t fan_config_3_4;
 void fan_config();
-extern uint16_t fan_installed[3];
-extern uint16_t fan_cmdrpm[3];
-extern uint16_t fan_ppr[3];
+extern uint16_t fan_installed[3] __xMR;
+extern uint16_t fan_cmdrpm[3] __xMR;
+extern uint16_t fan_ppr[3] __xMR;
 
 static int8_t cmd_data_lengths[] = {
         1,                         // 0x00
@@ -216,7 +216,7 @@ void query_prp()
 }
 
 
-void fan_config()
+void __xMR fan_config()
 {
         fan_installed[0] = (fan_config_1_2 >> 7) & 0x1;
         fan_cmdrpm[0] = (fan_config_1_2 >> 6) & 0x1;
@@ -232,7 +232,7 @@ void fan_config()
 }
 
 
-void set_frpms()
+void __xMR set_frpms()
 {
         setfrpms[0] = linear_to_float(setfrpms_lin[0]);
         setfrpms[1] = linear_to_float(setfrpms_lin[1]);
@@ -240,13 +240,13 @@ void set_frpms()
 }
 
 
-void set_pec()
+void __xMR set_pec()
 {
         use_pec = use_pec_local;
 }
 
 
-void set_tc_curve()
+void __xMR set_tc_curve()
 {
         for (uint8_t i = 0; i < 3; ++i) {
                 temp_curve_points_x[i] = linear_to_float(temp_curve_points_data[2*i]);
@@ -255,7 +255,7 @@ void set_tc_curve()
 }
 
 
-void set_tc_matrix()
+void __xMR set_tc_matrix()
 {
         for (uint8_t i = 0; i < 3; ++i) {
                 temp_matrix[0][i] = linear_to_float(temp_matrix_row1[i]);
@@ -265,7 +265,7 @@ void set_tc_matrix()
 }
 
 
-void set_tc_onoff()
+void __xMR set_tc_onoff()
 {
         temp_control_on = tc_on;
 }

main_fw/src/main.c

@@ -47,7 +47,7 @@ uint16_t fan_installed[3] __xMR = {1, 1, 1};
 uint16_t fan_cmdrpm[3] __xMR = {1, 1, 1};
 uint16_t fan_ppr[3] __xMR = {1, 1, 1}; // a 1 here means 2 pulses per revolution
 
-uint16_t setfrpms[3] = {1500, 1500, 1500};
+uint16_t setfrpms[3] __xMR = {1500, 1500, 1500};
 
 pid_cntrl_t PID1;
 pid_cntrl_t PID2;

main_fw/src/pid.c

@@ -19,7 +19,7 @@ const float pid_outMax = 500;
 
 const float pid_ifMax = 50;
 
-float pid_compute(pid_cntrl_t *pid_inst, float input)
+float __xMR pid_compute(pid_cntrl_t *pid_inst, float input)
 {
         /*Compute all the working error variables*/
         float error = pid_inst->setpoint - input;