Index: firmware/App/DGCommon.h =================================================================== diff -u -r3f3729899d6811c763bc8e5ef9baf54a2d5c9cfe -rc5e1315bfeb11335f66f7439e00857f26649e25b --- firmware/App/DGCommon.h (.../DGCommon.h) (revision 3f3729899d6811c763bc8e5ef9baf54a2d5c9cfe) +++ firmware/App/DGCommon.h (.../DGCommon.h) (revision c5e1315bfeb11335f66f7439e00857f26649e25b) @@ -34,11 +34,10 @@ // #define RM46_EVAL_BOARD_TARGET 1 // #define SIMULATE_UI 1 // #define TASK_TIMING_OUTPUT_ENABLED 1 // re-purposes drain pump enable pin for task timing -// #define BETA_V1_BUILD 1 -// #define DISABLE_HEATERS_AND_TEMPS 1 - #define ENABLE_DIP_SWITCHES 1 - #define EMC_TEST_BUILD 1 - #define ALARMS_DEBUG 1 + #define DISABLE_HEATERS_AND_TEMPS 1 +// #define ENABLE_DIP_SWITCHES 1 +// #define EMC_TEST_BUILD 1 +// #define ALARMS_DEBUG 1 // #define HEATERS_DEBUG 1 // #define PRESSURES_DEBUG 1 #include Index: firmware/App/Modes/ModeDrain.c =================================================================== diff -u -r8f5feed92f41a476d5656038bcdfe884e17bd593 -rc5e1315bfeb11335f66f7439e00857f26649e25b --- firmware/App/Modes/ModeDrain.c (.../ModeDrain.c) (revision 8f5feed92f41a476d5656038bcdfe884e17bd593) +++ firmware/App/Modes/ModeDrain.c (.../ModeDrain.c) (revision c5e1315bfeb11335f66f7439e00857f26649e25b) @@ -116,11 +116,7 @@ LOAD_CELL_ID_T drainWeightLoadCell = LOAD_CELL_A1; // determine which load cell to use for drain volume - we want weight of inactive reservoir -#ifndef BETA_V1_BUILD if ( RESERVOIR_1 == getActiveReservoir() ) -#else - if ( RESERVOIR_2 == getActiveReservoir() ) -#endif { drainWeightLoadCell = LOAD_CELL_B1; } Index: firmware/App/Modes/ModeFill.c =================================================================== diff -u -r8f5feed92f41a476d5656038bcdfe884e17bd593 -rc5e1315bfeb11335f66f7439e00857f26649e25b --- firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision 8f5feed92f41a476d5656038bcdfe884e17bd593) +++ firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision c5e1315bfeb11335f66f7439e00857f26649e25b) @@ -157,11 +157,7 @@ // determine which load cell to use for fill volume - we want weight of inactive reservoir -#ifndef BETA_V1_BUILD if ( RESERVOIR_1 == getActiveReservoir() ) -#else - if ( RESERVOIR_2 == getActiveReservoir() ) -#endif { fillWeightLoadCell = LOAD_CELL_B1; } Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -r8f5feed92f41a476d5656038bcdfe884e17bd593 -rc5e1315bfeb11335f66f7439e00857f26649e25b --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 8f5feed92f41a476d5656038bcdfe884e17bd593) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision c5e1315bfeb11335f66f7439e00857f26649e25b) @@ -124,20 +124,19 @@ if ( FALSE == alarmIsActive[ alarm ].data ) { broadcastAlarmTriggered( (U16)alarm, blankAlarmData, blankAlarmData ); - } - activateAlarm( alarm ); -#ifdef DEBUG_ENABLED +#ifdef DEBUG_ENABLED #ifdef ALARMS_DEBUG - if ( FALSE == alarmIsActive[ alarm ].data ) - { - // TODO - temporary debug code - remove later - char debugStr[ 256 ]; - sprintf( debugStr, "ALARM trig:%5d \n", alarm ); - sendDebugData( (U08*)debugStr, strlen(debugStr) ); - sendDebugDataToUI( (U08*)debugStr ); + { + // TODO - temporary debug code - remove later + char debugStr[ 256 ]; + sprintf( debugStr, "ALARM trig:%5d \n", alarm ); + sendDebugData( (U08*)debugStr, strlen(debugStr) ); + sendDebugDataToUI( (U08*)debugStr ); + } +#endif +#endif } -#endif -#endif + activateAlarm( alarm ); } /************************************************************************* @@ -158,20 +157,19 @@ if ( FALSE == alarmIsActive[ alarm ].data ) { broadcastAlarmTriggered( (U16)alarm, alarmData, blankAlarmData ); - } - activateAlarm( alarm ); -#ifdef DEBUG_ENABLED +#ifdef DEBUG_ENABLED #ifdef ALARMS_DEBUG - if ( FALSE == alarmIsActive[ alarm ].data ) - { - // TODO - temporary debug code - remove later - char debugStr[ 256 ]; - sprintf( debugStr, "ALARM trig:%5d %8X \n", alarm, alarmData.data.uInt.data ); - sendDebugData( (U08*)debugStr, strlen(debugStr) ); - sendDebugDataToUI( (U08*)debugStr ); + { + // TODO - temporary debug code - remove later + char debugStr[ 256 ]; + sprintf( debugStr, "ALARM trig:%5d %8X \n", alarm, alarmData.data.uInt.data ); + sendDebugData( (U08*)debugStr, strlen(debugStr) ); + sendDebugDataToUI( (U08*)debugStr ); + } +#endif +#endif } -#endif -#endif + activateAlarm( alarm ); } /************************************************************************* @@ -193,20 +191,19 @@ if ( FALSE == alarmIsActive[ alarm ].data ) { broadcastAlarmTriggered( (U16)alarm, alarmData1, alarmData2 ); +#ifdef DEBUG_ENABLED +#ifdef ALARMS_DEBUG + { + // TODO - temporary debug code - remove later + char debugStr[ 256 ]; + sprintf( debugStr, "ALARM trig:%5d %8X %8X \n", alarm, alarmData1.data.uInt.data, alarmData2.data.uInt.data ); + sendDebugData( (U08*)debugStr, strlen(debugStr) ); + sendDebugDataToUI( (U08*)debugStr ); + } +#endif +#endif } activateAlarm( alarm ); -#ifdef DEBUG_ENABLED -#ifdef ALARMS_DEBUG - if ( FALSE == alarmIsActive[ alarm ].data ) - { - // TODO - temporary debug code - remove later - char debugStr[ 256 ]; - sprintf( debugStr, "ALARM trig:%5d %8X %8X \n", alarm, alarmData1.data.uInt.data, alarmData2.data.uInt.data ); - sendDebugData( (U08*)debugStr, strlen(debugStr) ); - sendDebugDataToUI( (U08*)debugStr ); - } -#endif -#endif } /************************************************************************* @@ -231,7 +228,6 @@ alarmIsActive[ alarm ].data = FALSE; #ifdef DEBUG_ENABLED #ifdef ALARMS_DEBUG - if ( FALSE == alarmIsActive[ alarm ].data ) { // TODO - temporary debug code - remove later char debugStr[ 256 ]; Index: firmware/App/Services/Interrupts.c =================================================================== diff -u -ree52cb8a255151dca7716a651a933eb5603902ef -rc5e1315bfeb11335f66f7439e00857f26649e25b --- firmware/App/Services/Interrupts.c (.../Interrupts.c) (revision ee52cb8a255151dca7716a651a933eb5603902ef) +++ firmware/App/Services/Interrupts.c (.../Interrupts.c) (revision c5e1315bfeb11335f66f7439e00857f26649e25b) @@ -90,7 +90,7 @@ // TODO - what to do with phantom interrupts? #ifdef DEBUG_ENABLED { - char debugStr[ 256 ]; + char debugStr[ 50 ]; sprintf( debugStr, "DG-phantom interrupt\n" ); sendDebugData( (U08*)debugStr, strlen(debugStr) ); Index: firmware/App/Services/Reservoirs.c =================================================================== diff -u -r8f5feed92f41a476d5656038bcdfe884e17bd593 -rc5e1315bfeb11335f66f7439e00857f26649e25b --- firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision 8f5feed92f41a476d5656038bcdfe884e17bd593) +++ firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision c5e1315bfeb11335f66f7439e00857f26649e25b) @@ -39,7 +39,7 @@ #define MAX_FILL_VOLUME_ML MAX_RESERVOIR_VOLUME_ML ///> Maximum fill volume in mL. #define DEFAULT_DRAIN_VOLUME_ML 100 ///> Default drain volume in mL. #define MAX_DRAIN_VOLUME_ML MAX_RESERVOIR_VOLUME_ML ///> Maximum drain volume in mL. -#define MIN_DRAIN_VOLUME_ML 0 ///> Minimum drain volume in mL. +#define MIN_DRAIN_VOLUME_ML 100 ///> Minimum drain volume in mL. #define RESERVOIR_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ///< interval (ms/task time) at which the reservoir data is published on the CAN bus. @@ -115,33 +115,19 @@ case RESERVOIR_1: activeReservoir.data = (U32)resID; result = TRUE; -#ifndef BETA_V1_BUILD setValveState( VRF, VALVE_STATE_R2_C_TO_NO ); setValveState( VRD, VALVE_STATE_R2_C_TO_NO ); setValveState( VRO, VALVE_STATE_R1_C_TO_NO ); setValveState( VRI, VALVE_STATE_R1_C_TO_NO ); -#else - setValveState( VRF, VALVE_STATE_R1_C_TO_NC ); // TODO - valve states are reversed for the two reservoirs for now - revert back when load cells are fixed. - setValveState( VRD, VALVE_STATE_R1_C_TO_NC ); - setValveState( VRO, VALVE_STATE_R2_C_TO_NC ); - setValveState( VRI, VALVE_STATE_R2_C_TO_NC ); -#endif break; case RESERVOIR_2: activeReservoir.data = (U32)resID; result = TRUE; -#ifndef BETA_V1_BUILD setValveState( VRF, VALVE_STATE_R1_C_TO_NC ); // TODO - valve states are reversed for the two reservoirs for now - revert back when load cells are fixed. setValveState( VRD, VALVE_STATE_R1_C_TO_NC ); setValveState( VRO, VALVE_STATE_R2_C_TO_NC ); setValveState( VRI, VALVE_STATE_R2_C_TO_NC ); -#else - setValveState( VRF, VALVE_STATE_R2_C_TO_NO ); - setValveState( VRD, VALVE_STATE_R2_C_TO_NO ); - setValveState( VRO, VALVE_STATE_R1_C_TO_NO ); - setValveState( VRI, VALVE_STATE_R1_C_TO_NO ); -#endif break; default: @@ -222,7 +208,7 @@ if ( DG_MODE_CIRC == getCurrentOperationMode() ) { // validate parameters - if ( ( drainToVolMl > MIN_DRAIN_VOLUME_ML ) && ( drainToVolMl < MAX_DRAIN_VOLUME_ML ) ) + if ( ( drainToVolMl >= MIN_DRAIN_VOLUME_ML ) && ( drainToVolMl <= MAX_DRAIN_VOLUME_ML ) ) { drainVolumeTargetMl.data = drainToVolMl; requestNewOperationMode( DG_MODE_DRAI ); Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r8f5feed92f41a476d5656038bcdfe884e17bd593 -rc5e1315bfeb11335f66f7439e00857f26649e25b --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 8f5feed92f41a476d5656038bcdfe884e17bd593) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision c5e1315bfeb11335f66f7439e00857f26649e25b) @@ -1033,7 +1033,7 @@ memcpy( payloadPtr, str, txtLen + 1 ); // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer - //serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_UI, ACK_NOT_REQUIRED ); + serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_UI, ACK_NOT_REQUIRED ); } } #endif