Index: firmware/App/HDCommon.h =================================================================== diff -u -r2acda0ccdd00334bec87bfbe61c4e78e867925de -r0785222033c051524fbe19e49c08ba7f3f7a347c --- firmware/App/HDCommon.h (.../HDCommon.h) (revision 2acda0ccdd00334bec87bfbe61c4e78e867925de) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision 0785222033c051524fbe19e49c08ba7f3f7a347c) @@ -25,7 +25,7 @@ #define HD_VERSION_MAJOR 0 #define HD_VERSION_MINOR 4 #define HD_VERSION_MICRO 5 -#define HD_VERSION_BUILD 8 +#define HD_VERSION_BUILD 0 // ********** development build switches ********** Index: firmware/App/Modes/ModeTreatment.c =================================================================== diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -r0785222033c051524fbe19e49c08ba7f3f7a347c --- firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8) +++ firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision 0785222033c051524fbe19e49c08ba7f3f7a347c) @@ -294,11 +294,11 @@ lastTreatmentTimeStamp = getMSTimerCount(); // get prescription settings TODO - hard-coded for now - presTreatmentTimeSecs = 3600; + presTreatmentTimeSecs = 14400; presBloodFlowRate = 300; presDialysateFlowRate = 300; - presMaxUFVolumeML = 600.0; - presUFRate = 10.0; + presMaxUFVolumeML = 2400.0; + presUFRate = 0.0; // kick dialysis sub-mode off setDialysisParams( presBloodFlowRate, presDialysateFlowRate, presMaxUFVolumeML, presUFRate ); Index: firmware/App/Modes/ModeTreatmentParams.c =================================================================== diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -r0785222033c051524fbe19e49c08ba7f3f7a347c --- firmware/App/Modes/ModeTreatmentParams.c (.../ModeTreatmentParams.c) (revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8) +++ firmware/App/Modes/ModeTreatmentParams.c (.../ModeTreatmentParams.c) (revision 0785222033c051524fbe19e49c08ba7f3f7a347c) @@ -96,7 +96,7 @@ static BOOL checkTreatmentParamsDependencies( U32 *reasons ); static BOOL isTreatmentParamInRange( TREATMENT_PARAM_T param, CRITICAL_DATAS_T value ); static void extractTreatmentParamsFromPayload( TREATMENT_PARAMS_DATA_PAYLOAD_T payload ); -static void sendTreatmentParamsResponse( BOOL valid, U32 *reasons ); +static void sendTreatmentParamsResponse( BOOL rejected, U32 *reasons ); /*********************************************************************//** * @brief @@ -538,17 +538,17 @@ * @details * Inputs : none * Outputs : Response to treatment parameters message constructed and sent. - * @param valid 1 if valid, 0 if not + * @param rejected 1 if rejected, 0 if parameters ok * @param reasons array of reject reason codes for each parameter (0=not rejected) * @return none *************************************************************************/ -static void sendTreatmentParamsResponse( BOOL valid, U32 *reasons ) +static void sendTreatmentParamsResponse( BOOL rejected, U32 *reasons ) { U32 respPayload[NUM_OF_TREATMENT_PARAMS]; memcpy( &respPayload[0], &reasons[0], sizeof(TREATMENT_PARAMS_DATA_PAYLOAD_T) ); - sendTreatmentParametersResponseMsg( valid, (U08*)(&respPayload[0]), ( NUM_OF_TREATMENT_PARAMS - 1 ) * sizeof(U32) ); // UF vol. param not included in reject reasons + sendTreatmentParametersResponseMsg( rejected, (U08*)(&respPayload[0]), ( NUM_OF_TREATMENT_PARAMS - 1 ) * sizeof(U32) ); // UF vol. param not included in reject reasons } /*********************************************************************//** Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r515a40fb83e3fc13384dae12dba25b45aeeea904 -r0785222033c051524fbe19e49c08ba7f3f7a347c --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 515a40fb83e3fc13384dae12dba25b45aeeea904) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 0785222033c051524fbe19e49c08ba7f3f7a347c) @@ -1692,12 +1692,12 @@ * @details * Inputs : none * Outputs : Treatment parameters response msg constructed and queued. - * @param accepted T/F - are settings ok? + * @param rejected T/F - are settings rejected? * @param rejectReasons reasons each parameter was rejected (if not accepted) * @param byteLength number of bytes that array of reject reasons takes * @return TRUE if msg successfully queued for transmit, FALSE if not *************************************************************************/ -BOOL sendTreatmentParametersResponseMsg( BOOL accepted, U08 *rejectReasons, U32 byteLength ) +BOOL sendTreatmentParametersResponseMsg( BOOL rejected, U08 *rejectReasons, U32 byteLength ) { BOOL result; MESSAGE_T msg; @@ -1708,7 +1708,7 @@ msg.hdr.msgID = MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE; msg.hdr.payloadLen = sizeof( BOOL ) + byteLength; - memcpy( payloadPtr, &accepted, sizeof( BOOL ) ); + memcpy( payloadPtr, &rejected, sizeof( BOOL ) ); payloadPtr += sizeof( BOOL ); memcpy( payloadPtr, rejectReasons, byteLength ); Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -r515a40fb83e3fc13384dae12dba25b45aeeea904 -r0785222033c051524fbe19e49c08ba7f3f7a347c --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 515a40fb83e3fc13384dae12dba25b45aeeea904) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 0785222033c051524fbe19e49c08ba7f3f7a347c) @@ -94,7 +94,7 @@ void handleTreatmentParametersFromUI( MESSAGE_T *message ); // MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE -BOOL sendTreatmentParametersResponseMsg( BOOL accepted, U08 *rejectReasons, U32 byteLength ); +BOOL sendTreatmentParametersResponseMsg( BOOL rejected, U08 *rejectReasons, U32 byteLength ); // MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS void handleUIUserConfirmTreatmentParameters( MESSAGE_T *message );