Index: firmware/App/Monitors/Voltages.c =================================================================== diff -u -r862bea855cd392328aad1f4a93a275980ee17f26 -rb6db00cb7b4a62957f3ce0a5c1a6d9cc5a195f6c --- firmware/App/Monitors/Voltages.c (.../Voltages.c) (revision 862bea855cd392328aad1f4a93a275980ee17f26) +++ firmware/App/Monitors/Voltages.c (.../Voltages.c) (revision b6db00cb7b4a62957f3ce0a5c1a6d9cc5a195f6c) @@ -33,13 +33,13 @@ // ********** private definitions ********** -#define VOLTAGES_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the voltages data is published on the CAN bus. -#define VOLTAGES_ALARM_PERSISTENCE_MS ( 1 * MS_PER_SECOND ) ///< Alarm persistence period for voltage monitor alarms in milliseconds. -#define POWER_LOSS_VOLTAGE_PERSISTENCE_MS 500 ///< Power supply voltage out of range persistence in milliseconds. -#define DATA_PUBLISH_COUNTER_START_COUNT 14 ///< Data publish counter start count. -#define MAX_COUNT_AC_MONITORS 55000.0F ///< Max count value for power monitors. The valid range is 0 to 55,000 counts, which equates to 0 to 30A. -#define COUNT_TO_CURRENT( count ) ( ( (F32)count / MAX_COUNT_AC_MONITORS ) * 30.0F ) ///< Count to current conversion -#define COUNT_TO_VOLTAGE( count ) ( ( ( (F32)count / MAX_COUNT_AC_MONITORS ) / 4.0F ) * 1534.0F ) ///< Count to voltage conversion +#define VOLTAGES_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the voltages data is published on the CAN bus. +#define VOLTAGES_ALARM_PERSISTENCE_MS ( 1 * MS_PER_SECOND ) ///< Alarm persistence period for voltage monitor alarms in milliseconds. +#define POWER_LOSS_VOLTAGE_PERSISTENCE_MS 500 ///< Power supply voltage out of range persistence in milliseconds. +#define DATA_PUBLISH_COUNTER_START_COUNT 14 ///< Data publish counter start count. +#define MAX_COUNT_AC_MONITORS 55000.0F ///< Max count value for power monitors. The valid range is 0 to 55,000 counts, which equates to 0 to 30A. +#define COUNT_TO_CURRENT( count ) ( ( (F32)count / MAX_COUNT_AC_MONITORS ) * 30.0F ) ///< FPGA power monitor count to current conversion +#define COUNT_TO_VOLTAGE( count ) ( ( ( (F32)count / MAX_COUNT_AC_MONITORS ) / 4.0F ) * 1534.0F ) ///< FPGA power monitor count to voltage conversion /// Defined states for the voltage monitor state machine. typedef enum Voltages_States