dgfirmware

Clone Tools

Stats

Commits this week: 0
Total Committers: 17
Last Commit: 10 Jun
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Tuesday 22 Mar 2022
4:21 pm

Hung Nguyen <hnguyen@diality.com>

DEN-11928 Updated code - No long jump to paused state

Options
    • -3
    • +2
    /firmware/App/Modes/ModeFill.c
4:17 pm

Dara Navaei

This needs to be a #define line BAD_FILL_TARGET_VOLUME_ML

This needs to be a #define line BAD_FILL_TARGET_VOLUME_ML

3:43 pm

Hung Nguyen <hnguyen@diality.com>

DEN-11928 Updated per peer review comments

Options
    • -2
    • +2
    /firmware/App/Controllers/ConductivitySensors.c
3:08 pm

hnguyen  (deleted user)

When transition to case DG_MODE_STAN: currentSubMode = transitionToStandbyMode(); break; transitionToStandbyMode is called and deenergizeActuators() is invoked to init all actuators to desired stat...

When transition to
case DG_MODE_STAN:
currentSubMode = transitionToStandbyMode();
break;
transitionToStandbyMode is called and deenergizeActuators() is invoked to init all actuators to desired state.

// Turn off the UV reactors
turnOffUVReactor( INLET_UV_REACTOR );
turnOffUVReactor( OUTLET_UV_REACTOR );

// De-energize all the valves
setValveStateDelayed( VPI, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
setValveStateDelayed( VBF, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
setValveStateDelayed( VSP, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
setValveStateDelayed( VPD, VALVE_STATE_DRAIN_C_TO_NO, DELAY_VALVE_MS );
setValveStateDelayed( VPO, VALVE_STATE_NOFILL_C_TO_NO, DELAY_VALVE_MS );
setValveStateDelayed( VDR, VALVE_STATE_DRAIN_C_TO_NO, DELAY_VALVE_MS );
setValveStateDelayed( VRC, VALVE_STATE_DRAIN_C_TO_NO, DELAY_VALVE_MS );
setValveStateDelayed( VRO, VALVE_STATE_R1_C_TO_NO, DELAY_VALVE_MS );
setValveStateDelayed( VRD1, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
setValveStateDelayed( VRD2, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
setValveStateDelayed( VRI, VALVE_STATE_R1_C_TO_NO, DELAY_VALVE_MS );
setValveStateDelayed( VRF, VALVE_STATE_R2_C_TO_NO, DELAY_VALVE_MS );

requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID );
requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB );
signalROPumpHardStop();
signalDrainPumpHardStop();
stopHeater( DG_PRIMARY_HEATER );
stopHeater( DG_TRIMMER_HEATER );

3:03 pm

Dara Navaei

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Options
    • -1
    • +1
    /firmware/App/DGCommon.h
3:00 pm

Darren Cox <darren_m@cox.net>

Merge branch 'DEN-12215-sw_dev_sprint_65_darren' into staging

Options
2:35 pm

Dara Navaei

We should stop all the actuators prior to transitioning to standby.

We should stop all the actuators prior to transitioning to standby.

2:12 pm

hnguyen  (deleted user)

Ok

Ok

2:11 pm

hnguyen  (deleted user)

Those #define below will not be removed until they are added into the calibration records. #define ACID_NORMAL_CONDUCTIVITY 11645.05 #define BICARB_NORMAL_CONDUCTIVITY 13734.88

Those #define below will not be removed until they are added into the calibration records.
#define ACID_NORMAL_CONDUCTIVITY 11645.05
#define BICARB_NORMAL_CONDUCTIVITY 13734.88

2:08 pm

hnguyen  (deleted user)

Updated to BOOL const isConductTooLow = ( conductivity <= COND_SENSOR_CPI_MIN_VALUE ) ? TRUE : FALSE; BOOL const isConductTooHigh = ( conductivity >= COND_SENSOR_CPI_WARNING_HIGH ) ? TRUE : FALSE ;

Updated to
BOOL const isConductTooLow = ( conductivity <= COND_SENSOR_CPI_MIN_VALUE ) ? TRUE : FALSE;

BOOL const isConductTooHigh = ( conductivity >= COND_SENSOR_CPI_WARNING_HIGH ) ? TRUE : FALSE ;

2:02 pm

Dara Navaei

Per our coding style, please use ternary for these two booleans: isConductTooLow = ( conductivity <= COND_SENSOR... ? TRUE : FALSE )

Per our coding style, please use ternary for these two booleans: isConductTooLow = ( conductivity <= COND_SENSOR... ? TRUE : FALSE )

1:45 pm

Dara Navaei

Please do not remove the #defines until the calibration records are updated.

Please do not remove the #defines until the calibration records are updated.

1:41 pm

Dara Navaei

Add doxygen comment.

Add doxygen comment.

1:39 pm

Dara Navaei

Add doxygen comment.

Add doxygen comment.

1:13 pm

hnguyen  (deleted user)

Added internal signal flag handleBadFillFlag

Added internal signal flag handleBadFillFlag

1:12 pm

Hung Nguyen <hnguyen@diality.com>

DEN-11928 Addressed code review - set internal signal flag to move to normal flush water state

Options
    • -5
    • +5
    /firmware/App/Modes/ModeDrain.c
    • -3
    • +10
    /firmware/App/Modes/ModeGenIdle.c
11:00 am

hnguyen  (deleted user)

Removed flush lines

Removed flush lines

11:00 am

hnguyen  (deleted user)

The fillStatus.fillEmptyAcidBottleDetected is set to TRUE to signal drain mode that empty bottle is detected This flag is checked at the end of the drain mode.

The fillStatus.fillEmptyAcidBottleDetected is set to TRUE to signal drain mode that empty bottle is detected
This flag is checked at the end of the drain mode.

10:53 am

hnguyen  (deleted user)

Corrected Initialized in case DG_GEN_IDLE_MODE_STATE_START: // Execute current generation idle state switch ( genIdleState ) { case DG_GEN_IDLE_MODE_STATE_START: badFillState = DG_HANDLE_BAD_FILL_...

Corrected
Initialized in case DG_GEN_IDLE_MODE_STATE_START:

// Execute current generation idle state
switch ( genIdleState )
{
case DG_GEN_IDLE_MODE_STATE_START:
badFillState = DG_HANDLE_BAD_FILL_STATE_START;
genIdleState = handleIdleStartState();
break;

Monday 21 Mar 2022
6:59 pm

Hung Nguyen <hnguyen@diality.com>

DEN-11928 Updated per code review - reject moving to fill if alarm is active

Options
    • -1
    • +5
    /firmware/App/Services/Reservoirs.c
6:36 pm

Hung Nguyen <hnguyen@diality.com>

DEN-11928 Updated per code review comments

Options
    • -15
    • +15
    /firmware/App/Modes/ModeDrain.c
    • -1
    • +1
    /firmware/App/Modes/ModeFill.c
    • -5
    • +6
    /firmware/App/Modes/ModeGenIdle.c
6:30 pm

hnguyen  (deleted user)

At the end of drain, check for empty bottles

At the end of drain, check for empty bottles

6:24 pm

hnguyen  (deleted user)

Replaced else if ( ( FALSE == isAlarmActive( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME ) ) || ( FALSE == isAlarmActive( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME ) ) ) { with else {

Replaced
else if ( ( FALSE == isAlarmActive( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME ) ) ||
( FALSE == isAlarmActive( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME ) ) )
{
with
else
{

6:02 pm

hnguyen  (deleted user)

Removed setBottlesNeedPrimeFlag and use function setThisFirstFillFlag().

Removed setBottlesNeedPrimeFlag and use function setThisFirstFillFlag().

5:58 pm

hnguyen  (deleted user)

Removed fillBottlesNeedPrimeFlag and use the existing isThisFirstFill

Removed fillBottlesNeedPrimeFlag and use the existing isThisFirstFill

5:57 pm

hnguyen  (deleted user)

isAvgConductivityOutOfRange is now called in ModeGenIdle

isAvgConductivityOutOfRange is now called in ModeGenIdle

5:48 pm

hnguyen  (deleted user)

Added startFillCmd( targetFillVolumeML, getTargetFillFlowRateLPM() ); // refill to the saved target fill volume (~1500 mL)

Added
startFillCmd( targetFillVolumeML, getTargetFillFlowRateLPM() ); // refill to the saved target fill volume (~1500 mL)

5:14 pm

hnguyen  (deleted user)

Assigned MSG_ID_DG_FILL_MODE_DATA = 0xAE, ///< DG broadcast of fill mode data such as used acid & bicarb volume Updated Message List.xlsx (Denali Tab, Row = 142) with 0xAE00 DG Fill Mode Data

Assigned MSG_ID_DG_FILL_MODE_DATA = 0xAE, ///< DG broadcast of fill mode data such as used acid & bicarb volume
Updated Message List.xlsx (Denali Tab, Row = 142) with 0xAE00 DG Fill Mode Data

12:30 pm

Dara Navaei

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Options
    • -1
    • +1
    /firmware/App/DGCommon.h
12:20 pm

Dara Navaei

Merged DEN-12224

Options
    • -83
    • +124
    /firmware/App/Controllers/ConcentratePumps.c
    • -10
    • +14
    /firmware/App/Controllers/ConductivitySensors.c
    • -1
    • +1
    /firmware/App/DGCommon.h