Diff: Device.h

Revision:

177:672ef279c8e0

Parent:

174:0f86eedd511c

Child:

182:2bd8ec44998f

--- a/Device.h	Thu Jun 30 09:04:22 2016 +0000
+++ b/Device.h	Sun Jul 03 13:40:48 2016 +0000
@@ -1,11 +1,6 @@
 #ifndef __DEVICE_H__
 #define __DEVICE_H__
 
-#define DEV_BOARD_HAOYU
-#ifdef DEV_BOARD_HAOYU
-#warning "Program config: development board!!!"
-#endif
-
 #include "LPC17xx.h"
 //#include "system_LPC17xx.h"
 #include "DeviceController.h"
@@ -20,6 +15,7 @@
 #include "DeviceTSS.h"
 #include "DeviceCCS.h"
 #include "DeviceErrorModel.h"
+//#include "DeviceDebug.h"
 
 typedef enum _DeviceLatchMode {
   DeviceLatch10kHz,   //internal latch  by pulses 10 kHz (power on default mode)
@@ -96,7 +92,7 @@
   //Control cycle
   DeviceRegularCycle regular;
   //Counting
-  DeviceLatchState latch;
+  //DeviceLatchState latch;
   DeviceCounters counters;
   //Controller
   DeviceController controller;
@@ -113,6 +109,9 @@
   DeviceTSS tss;              //Temperature sense system
   DeviceCCS ccs;              //Current control system
   DeviceEM em;                //Error model
+  #ifdef __DEVICE_DEBUG_H__
+  DeviceDebug debug;
+  #endif
 } Device;
 
 typedef struct _HashParam {
@@ -121,7 +120,7 @@
   uint32_t size;
 } HashParam;
 
-#define HASH_PARAM_COUNT 755
+#define HASH_PARAM_COUNT 884
 
 typedef struct _HashFunc {
   uint32_t hash;