Diff: DeviceController.c

Revision:

167:bedc0a9d559a

Parent:

161:efd949e8d536

Child:

173:7f938afb0447

diff -r c3c0b8a90d81 -r bedc0a9d559a DeviceController.c
--- a/DeviceController.c	Sun May 22 18:59:20 2016 +0000
+++ b/DeviceController.c	Sun Jun 05 11:03:33 2016 +0000
@@ -1,47 +1,53 @@
 #include "Device.h"
 extern Device device;
 
-void InitControllerWithDefaults(void){
+void InitControllerDefaultSettings(void){
   //Init chip
   device.controller.chip = (1768 << 16) | 100; //(LPC) 1768 (FBD) 100
   //Init flash memory
-  InitFlashWithDefaults();
+  InitFlashDefaultSettings();
   //Init timer 1 - measurement timer
-  InitMeasurementTimerWithDefaults();
+  InitMeasurementTimerDefaultSettings();
   //Init timer 2 - regular timer
-  InitRegularTimerWithDefaults();
+  InitRegularTimerDefaultSettings();
   //Init UART0 - service port
-  InitServicePortWithDefaults();
+  InitServicePortDefaultSettings();
   //Init UART1 - user commununication port
-  InitUserPortWithDefaults();
+  InitUserPortDefaultSettings();
   //Init SSP
-  InitSSPWithDefaults();
+  InitSSPDefaultSettings();
   //Init I2C
-  InitI2CWithDefaults();
+  InitI2CDefaultSettings();
   //Init QEI
-  InitQEIWithDefaults();
-  //Init DAC
-  //InitDACWithDefaults();
+  InitQEIDefaultSettings();
 }
 
-void InitController(void){
+void InitControllerState(void){
   //Init flash memory
-  InitFlash();
+  InitFlashState();
   //Init timer 1 - measurement timer
   //DeviceInitMeasurementTimer(7812); //CCLK / 7812 = 12800.819Hz; Vibro: Timer1/32 = 400.025Hz;
-  InitMeasurementTimer();
+  InitMeasurementTimerState();
   //Init timer 2 - regular timer
-  InitRegularTimer();
+  InitRegularTimerState();
   //Init UART0 - service port
-  InitServicePort();
+  InitServicePortState();
   //Init UART1 - user commununication port
-  InitUserPort();
+  InitUserPortState();
   //Init SSP
-  InitSSP();
+  InitSSPState();
   //InitI2C
-  InitI2C();
+  InitI2CState();
   //InitQEI
-  InitQEI();
-  //Init DAC
-  //InitDAC();
+  InitQEIState();
+}
+
+void DeviceStartController(void){
+  DeviceStartServicePort();
+  DeviceStartUserPort();
+  DeviceStartSSP();
+  DeviceStartI2C();
+  DeviceStartQEI();
+  DeviceStartMeasurementTimer();
+  DeviceStartRegularTimer();
 }
\ No newline at end of file