dgfirmware / firmware / App

Controllers

Clone Tools

Stats

Commits this week: 0
Total Committers: 16
Last Commit: 19 Nov 25
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
Thursday 01 Dec 2022
2:26 pm

Dara Navaei

Merged DEN-14253

Options
    • -8
    • +8
    ./Heaters.c
    • -6
    • +5
    ./Pressures.c
    • -30
    • +31
    ./ROPump.c
    • -5
    • +4
    ./ROPump.h
  5. … 7 more files in changeset.
10:51 am

Dara Navaei

DEN-14253 updated the code so the trimmer heater with no flow uses the raw dialysate flow prior to applying the calibration to it.

Options
    • -12
    • +27
    ./FlowSensors.c
    • -2
    • +3
    ./FlowSensors.h
    • -8
    • +8
    ./Heaters.c
  4. … 1 more file in changeset.
10:46 am

Dara Navaei

DG-DEN-14253_Dialysate Flow Too Low Alarm Occurs AT 100 ML Min
DG-DEN-14253_Dialysate Flow Too Low Alarm Occurs AT 100 ML Min
9:38 am

jtaylor  (deleted user)

9:27 am

Dara Navaei

DG-DEN-14403_DG Voltages Alarm 77 Not Triggered
DG-DEN-14403_DG Voltages Alarm 77 Not Triggered
Wednesday 30 Nov 2022
5:02 pm

James Walter Taylor <jtaylor@diality.com>

DEN-14403-dg-voltages-alarm-77-not-triggered FPGA 1V alarm limits modified to +/-5% from +/-10%, to match requirements

Options
    • -2
    • +7
    ./Voltages.c
Tuesday 22 Nov 2022
4:20 pm

Dara Navaei

4:18 pm

Dara Navaei

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Options
    • -1
    • +1
    ./Pressures.c
4:06 pm

Sean Nash , Michael Garthwaite and jtaylor  (deleted user)

4:05 pm

Sean Nash

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

12:39 pm

Dara Navaei

DEN-14356 addressed the code review comment

Options
    • -4
    • +4
    ./Pressures.c
12:38 pm

Dara Navaei

I renamed the #define to be consistent with the latest changes.

I renamed the #define to be consistent with the latest changes.

12:01 pm

Sean Nash

Seems like this is a minimum (not a maximum). Pressure below this level is an alarm which enforces a minimum pressure of 14 PSI.

Seems like this is a minimum (not a maximum). Pressure below this level is an alarm which enforces a minimum pressure of 14 PSI.

11:55 am

Dara Navaei

DEN-14536 updated the minimum acceptable inlet pressure

Options
    • -2
    • +1
    ./Pressures.c
11:53 am

Dara Navaei

DG-DEN-14356_Change DG Inlet Pressure Limit
DG-DEN-14356_Change DG Inlet Pressure Limit
Monday 21 Nov 2022
4:56 pm

Michael Garthwaite

4:51 pm

Dara Navaei

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Options
    • -2
    • +2
    ./ROPump.c
    • -2
    • +2
    ./ROPump.h
  3. … 11 more files in changeset.
4:49 pm

Sean Nash , jtaylor  (deleted user) , Dara Navaei and wbracken  (deleted user)

4:44 pm

jtaylor  (deleted user)

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

3:37 pm

wbracken  (deleted user)

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

3:29 pm

Michael Garthwaite

DEN-14197: Code review changes. Pre-merge fixes.

Options
    • -1
    • +1
    ./ROPump.c
    • -2
    • +2
    ./ROPump.h
  3. … 2 more files in changeset.
3:17 pm

Michael Garthwaite

Merge branch 'staging' into DEN-14197-sw-s83-mg-pi-optimizations

Options
    • -3
    • +4
    ./ROPump.c
  2. … 5 more files in changeset.
2:56 pm

Sean Nash

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

2:55 pm

Michael Garthwaite

Correct. Fixed. Thanks!

Correct. Fixed. Thanks!

2:55 pm

Michael Garthwaite

DEN-14197: Addressed code review comments.

Options
    • -3
    • +2
    ./ROPump.c
2:51 pm

Sean Nash

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

2:51 pm

Sean Nash

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

2:51 pm

Sean Nash

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

2:48 pm

Sean Nash

getROFeedbackVoltage() has been renamed, right?

getROFeedbackVoltage() has been renamed, right?

2:45 pm

Michael Garthwaite

inactiveReservoir is the correct variable name. it is defined at line 752 within this same function. In our current staging branch, this is named inactiveRsrvr. In develop, it's inactiveReservoir....

inactiveReservoir is the correct variable name. it is defined at line 752 within this same function.

In our current staging branch, this is named inactiveRsrvr. In develop, it's inactiveReservoir. Note that commit 2b6abbe does not show the change of name.

Regardless, it compiled when merging the working branch into develop. using crtl+f within the file shows that no other variable has the name inactiveRsrvr in my working branch. Using code composer's "Open declaration" of the variable points to to this data structure with this name.

/// Heaters data structure
typedef struct

F32 targetTemp; ///< Heater target temperature.
HEATERS_STATE_T state; ///< Heater state.
BOOL startHeaterSignal; ///< Heater start indication flag.
BOOL isHeaterOn; ///< Heater on/off status flag.
F32 dutyCycle; ///< Heater duty cycle.
F32 targetFlow; ///< Heater target flow.
BOOL hasTargetTempChanged; ///< Heater target temperature change flag indicator.
F32 heaterEstGain; ///< Heater estimation gain during the run.
BOOL hasTargetBeenReached; ///< Heater flag to indicate whether the target temperature has been reached.
F32 calculatedTemperature; ///< Heater calculated temperature.
DG_RESERVOIR_ID_T inactiveRsrvr; ///< Heater inactive reservoir.
HEATER_STATUS_T;

in heaters.c


So this is an odd one. maybe something got mixed up in a merge conflict?