Commit mthomas changes to GCC and port those changes to IAR

[avr_bc100.git] / BaseTinyFirmware / IAR / structs.h

diff --git a/BaseTinyFirmware/IAR/structs.h b/BaseTinyFirmware/IAR/structs.h
index 9b809441bd25a64e92b458b8c553801e81d8bc68..602b3f7ca8c65f910320f5aff79bc49dc49ac320 100644 (file)
--- a/BaseTinyFirmware/IAR/structs.h
+++ b/BaseTinyFirmware/IAR/structs.h
@@ -41,11 +41,20 @@
  */\r
 struct Batteries_struct\r
 {\r
+#if 0\r
+#warning "no bitfield, used for debugging - mthomas"\r
+       unsigned char Present   ; //!< Battery found. (TRUE/FALSE)\r
+       unsigned char Charged   ; //!< Battery fully charged. (TRUE/FALSE)\r
+       unsigned char Low       ; //!< Battery low voltage. (TRUE/FALSE)\r
+       unsigned char Exhausted ; //!< Battery exhausted. (TRUE/FALSE)\r
+       unsigned char HasRID    ; //!< Battery has resistor ID. (TRUE/FALSE)\r
+#else\r
        unsigned char Present   : 1; //!< Battery found. (TRUE/FALSE)\r
        unsigned char Charged   : 1; //!< Battery fully charged. (TRUE/FALSE)\r
        unsigned char Low       : 1; //!< Battery low voltage. (TRUE/FALSE)\r
        unsigned char Exhausted : 1; //!< Battery exhausted. (TRUE/FALSE)\r
        unsigned char HasRID            : 1; //!< Battery has resistor ID. (TRUE/FALSE)\r
+#endif\r
        unsigned char Circuit;       //!< Battery safety circuit (family id).\r
        signed char Temperature;     //!< Battery temperature, in centigrade.\r
        unsigned char ADCSteps;      //!< ADC steps per half degree.\r
@@ -62,10 +71,10 @@ struct Battery_struct
 {\r
        //! Battery valid, enabling allowed. (TRUE/FALSE)\r
        unsigned char Enabled           : 1;\r
-       \r
+\r
        //! Disconnect allowed. (TRUE/FALSE)\r
        unsigned char DisconnectAllowed : 1;\r
-       \r
+\r
        //! Inhibit charging. (TRUE/FALSE) \todo Changed by master?\r
        unsigned char ChargeInhibit     : 1;\r
 };\r