Lots of refactoring

source/init.c

@@ -8,10 +8,10 @@
 #include		"arm_math.h"
 #include <stdbool.h>
 #include <stdint.h>
+#include <ctype.h>
 
 #include	"init.h"
 #include	"taps.h"
-#include	"measure.h"
 #include 	"ports.h"
 #include	"utils.h"
 #include	"frq.h"
@@ -38,7 +38,6 @@
 #include "System/system.h"
 
 extern uint8_t OverVolts_Flag,catch_up_flag; // global OverVoltsFlag
-extern ADC_t adc;
 extern MODE_REC_t mode_Array[MODE_MAX_NUM];
 extern	uint8_t Cur_Mode, Old_Mode;
 extern uint8_t Port_State[];
@@ -60,12 +59,13 @@ extern uint8_t	Safety_Select,Suspend_Step_Chk;
 uint8_t Safe_Mode, Init_Done;
 extern uint16_t Estop_timer,Sys_Chk_tmr,Pot_Value[],Vchktmr,Key_Lock_Out_tmr;
 extern uint8_t Dds_Pot_Val[]; // 2 byte Data for SPI
-float32_t Max_Power_Limit;
 extern uint32_t TX_TIME[];
 extern uint32_t Sys_Timer,Tx_timer;
 extern float32_t last_Ohms;
 extern uint16_t PSU_Check_tmr,Power_tmr;
 
+extern SYSTEM_DATA_t sys;
+
 void Init_vars()
 {
 	Taps_adjust_timer = DELAY_ONE_SECOND;
@@ -81,9 +81,9 @@ void Init_vars()
 //    Tx_timer = TX_TIME[0]; // reload the timer
 
     Safety_Select = false;
-    Over_Voltage_Flag = false;
+    sys.status[OVERVOLTAGE] = false;
     Safe_Mode = false;
-    Test_Mode = false; //
+    Test_Mode = false;
 
     char *ver = SW_VERSION;
 
@@ -102,7 +102,7 @@ void Init_vars()
     Key_Lock_Out_tmr = 0;
     step_count = 0;
     PSU_Check_tmr = PSU_DELAY;
-    Max_Power_Limit = 5.0; // default until battery type determined.
+    sys.maxPowerLimit = POWER_LIMIT_ALKALINE; // default until battery type determined.
     last_Ohms = 1;
     Taps_Flag = false;
     catch_up_flag= false;
@@ -141,7 +141,7 @@ void Init_Ports() // Ensure all ports are set to safe when powering up
 
 // [Not BYPASSED,PSU OFF, ALL AMPS SWITCHED OFF, BACKLIGHT ON.]
 
-	Select_Estop(ON);
+	Select_Estop(ISOLATED);
 	Port_State[TOP_SR] = 0x00; //
 
 	Port_State[MID_SR] = 0x00; // U12
@@ -163,7 +163,7 @@ void Clear_Flags()
 void Init_Output(void)
 {
 
-	if(adc.V_CHK < EXCEDED)	// Read external voltage disable if present
+	if(sys.adc.V_CHK < EXCEDED)	// Read external voltage disable if present
 	{
 
 //	Read_Tx_Ports();	// check for what's connected is controlled from timer interrupt
@@ -194,18 +194,9 @@ uint8_t i;
 	for(i = 0; i <= MODE_MAX_NUM; i++ )
 	{
 		mode_Array[i].Selected = true;
-		mode_Array[i].Plugged = true;
 
 	}
 	mode_Array[BROADCAST].Selected = true; //default BCAST always available
-	mode_Array[BROADCAST].Plugged = BROADCAST;
-	mode_Array[PORT1_A].Plugged = ID_TX_SINGLE_DIRECT;
-
-	mode_Array[PORT1_B].Plugged = EMPTY;
-
-	mode_Array[PORT2_A].Plugged = ID_TX_DUAL_DIRECT;
-	mode_Array[PORT2_B].Plugged = ID_TX_DUAL_DIRECT;
-
 	mode_Array[PORT2_A].Selected = false;
 	mode_Array[PORT2_B].Selected = false;
 
@@ -288,8 +279,6 @@ void Normal_Init(void)
 
 	Init_vars();
 
-//	Init_peripherals(); 2/9/24
-//	Init_sys(); 2/9/24
 
 	BL_ReadInfo();
 	EE_LoadData();		//Read saved data
@@ -299,16 +288,9 @@ void Normal_Init(void)
 	Delay_Ticks(200);	// execute short delay
 	KEY_Init();		//Init keys after splash delay to prevent POWER short press on startup
 
-//	USB_Init();
-
-	//   Read_Tx_Ports();		// Read output ports and determine what is connected
-	//   Select_Amplifier();	// Select correct amplifier according to frequency
 
 	Init_Mode(); //
 
-	//init_PWM();
-	//   PWM_Setup(32768, BC_Duty_Cycle);//freqArray[frequency].frequency1
-	//   PWM_Setup(29430, BC_Duty_Cycle);
 	PWM_Setup(15890, 0); // switches off PWM
 
 
@@ -329,18 +311,17 @@ void Normal_Init(void)
 	for( i=0; i < 15; i++);
 	{
 		Delay_Ticks(10);
-	//		ADC_Update();
 		Read_Tx_Ports(); // check for whats plugged in at the ports every 100mS.
 	}
 
-	if ((adc.V_ID2 > 3.0) && (adc.V_ID1 > 3.0))
-		{
+	if ((sys.adc.V_ID2 > 3.0) && (sys.adc.V_ID1 > 3.0))
+	{
 		Cur_Mode = BROADCAST;
 		Port_changed_flag= 1;
 		init_flag = 1;
-		}
+	}
 
-	Disconnect(2);
+	Disconnect(ACCY_PORT_2);
 	Delay_Ticks(30);
 
 	Check_For_Clamp_On_Pwr_Up();
@@ -361,6 +342,7 @@ void Normal_Init(void)
 	Update_Frequency();
 //	Select_Bypass(OFF);
 
+	// HACK
 	Select_Estop(OFF);	// Ensure output is ISOLATED from connections
 
 	Init_Amplitude();