123
Fork of LG by
Diff: Device.h
- Revision:
- 173:7f938afb0447
- Parent:
- 167:bedc0a9d559a
- Child:
- 174:0f86eedd511c
diff -r ef7bf1663645 -r 7f938afb0447 Device.h --- a/Device.h Fri Jun 17 13:54:50 2016 +0000 +++ b/Device.h Sun Jun 19 03:54:35 2016 +0000 @@ -7,7 +7,7 @@ #endif #include "LPC17xx.h" -#include "system_LPC17xx.h" +//#include "system_LPC17xx.h" #include "DeviceController.h" //#include "DeviceDAC.h" #include "DeviceUserProtocol.h" @@ -15,6 +15,7 @@ #include "DeviceDither.h" #include "DeviceLightUp.h" #include "DeviceISACS.h" +#include "DeviceSequencer.h" #include "DevicePLCS.h" typedef enum _DeviceLatchMode { @@ -97,14 +98,14 @@ //Controller DeviceController controller; //Protocols - Service service; //Service communication protocol - asynchronous serial port 0 - DeviceUserProtocol user; //Host communication protocol - asynchronous serial port 1 + Service service; //Service communication protocol - asynchronous serial port 0 + DeviceUserProtocol user; //User communication protocol - asynchronous serial port 1 //Units DeviceSensor sensor; DeviceLightUp lightUp; DeviceDither dither; - //DeviceDAC dac; //2-channel DAC of isas & plcs - DeviceISACS isacs; //Information signal amplitude stabilizer + DeviceISACS isacs; //Information signal amplitude stabilizer + DeviceSequencer sequencer; //Sequencer DevicePathLengthControlSystem plcs; //Path length control system } Device; @@ -114,7 +115,7 @@ uint32_t size; } HashParam; -#define HASH_PARAM_COUNT 533 +#define HASH_PARAM_COUNT 683 typedef struct _HashFunc { uint32_t hash; @@ -125,12 +126,12 @@ #define HASH_FUNC_COUNT 3 -void InitDevice(void); -void DeviceStart(void); - void DeviceInitDefaultSettings(void); void DeviceInitState(void); +void DeviceInit(void); +void DeviceStart(void); + void InitHashParamTable(void); void InitHashFuncTable(void); @@ -139,7 +140,7 @@ void DeviceRegularEvent1KHz(void); void DeviceRegularEvent10KHz(void); void DeviceRegularEvent100KHz(void); - void DeviceMeasurementInterruptHandler(void); void DeviceRegularInterruptHandler(void); + #endif /* __DEVICE_H__ */ \ No newline at end of file