aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/DataDef.h
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2019-03-11 12:09:05 +0200
committerAvi Levkovich <avi@twine-s.com>2019-03-11 12:09:05 +0200
commiteaeb19841e1d5195362ec1bd1fa8fb70557932cc (patch)
treedc975531ace5e20c87b5800639a60b441dcd60d6 /Software/Embedded_SW/Embedded/DataDef.h
parent7256fe1c07cf5ecbe485c3cdac238b88dfc2cd1d (diff)
downloadTango-eaeb19841e1d5195362ec1bd1fa8fb70557932cc.tar.gz
Tango-eaeb19841e1d5195362ec1bd1fa8fb70557932cc.zip
Fix bug in fans status
Diffstat (limited to 'Software/Embedded_SW/Embedded/DataDef.h')
-rw-r--r--Software/Embedded_SW/Embedded/DataDef.h23
1 files changed, 14 insertions, 9 deletions
diff --git a/Software/Embedded_SW/Embedded/DataDef.h b/Software/Embedded_SW/Embedded/DataDef.h
index 4601e971b..1c09f1dd7 100644
--- a/Software/Embedded_SW/Embedded/DataDef.h
+++ b/Software/Embedded_SW/Embedded/DataDef.h
@@ -244,16 +244,21 @@ typedef enum
}CARTREGE;
*/
-typedef struct
+
+typedef union
{
- bool DRAWER_BIG; //bit 0
- bool DRAWER_SMALL0;//bit 1
- bool DRAWER_SMALL1;//bit 2
- bool DRAWER_SMALL2;//bit 3
- bool DRAWER_SMALL3;//bit 4
- bool SYSTEM_FAN0; //bit 5
- bool SYSTEM_FAN1; //bit 6
- bool SYSTEM_FAN2; //bit 7
+ struct
+ {
+ uint8_t DRAWER_BIG:1; //bit 0
+ uint8_t DRAWER_SMALL0:1;//bit 1
+ uint8_t DRAWER_SMALL1:1;//bit 2
+ uint8_t DRAWER_SMALL2:1;//bit 3
+ uint8_t DRAWER_SMALL3:1;//bit 4
+ uint8_t SYSTEM_FAN0:1; //bit 5
+ uint8_t SYSTEM_FAN1:1; //bit 6
+ uint8_t SYSTEM_FAN2:1; //bit 7
+ }bit;
+ uint8_t Uchar;
}FANS_STATUS;
enum