Lots of refactoring

source/timer.c

@@ -21,6 +21,7 @@
 #include "adc.h"
 #include "utils.h"
 #include "usbComms.h"
+#include "System/system.h"
 
 /*******************************************************************************
  * Definitions
@@ -62,7 +63,7 @@ uint16_t Low_Bat_timer,Estop_timer,Shut_down_tmr,Vchktmr, Over_Voltage_tmr,PSU_C
 uint16_t Key_Lock_Out_tmr,ByPass_tmr;
 uint32_t TX_TIME[4] = {TIME_1HR,TIME_2HR,TIME_0HR,TIME_0HR};
 
-extern ADC_t adc;
+extern SYSTEM_DATA_t sys;
 uint32_t systemTime = 0;	// 10mS ticks
 
 /*******************************************************************************
@@ -131,7 +132,7 @@ void ctimer_match0_callback(uint32_t flags)	// ISR every 10mS
 		 Display_warning_tmr--;
 
 
-     if(adc.measure)
+     if(sys.adc.measure)
      {
            ADC_Update();
      }