leahi-dialin

Clone Tools

Stats

Commits this week: 15
Total Committers: 12
Last Commit: 11 Dec
Commits this week: 15

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 minutes ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Wednesday 23 Apr
4:06 pm

Behrouz NematiPour

Merge branch 'LDT-237-MainTreatmentScreen-SW-SimulatorCleanup' into staging

Options
    • -1
    • +22
    /leahi_dialin/fp/__init__.py
    • -5
    • +5
    /leahi_dialin/protocols/CAN.py
    • -248
    • +0
    /leahi_dialin/fp/reverse_osmosis.py
4:06 pm

Behrouz NematiPour

Merge branch staging into master

Options
    • -1
    • +22
    /leahi_dialin/fp/__init__.py
    • -5
    • +5
    /leahi_dialin/protocols/CAN.py
    • -248
    • +0
    /leahi_dialin/fp/reverse_osmosis.py
3:49 pm

Behrouz NematiPour

test

Options
    • -0
    • +22
    /leahi_dialin/fp/__init__.py
    • -0
    • +0
    /leahi_dialin/fp/modules/__init__.py
    • -0
    • +255
    /leahi_dialin/fp/modules/boost_pump.py
    • -0
    • +230
    /leahi_dialin/fp/modules/conductivity_sensors.py
    • -0
    • +18
    /leahi_dialin/fp/modules/constants.py
    • -0
    • +175
    /leahi_dialin/fp/modules/flow_sensors.py
    • -0
    • +128
    /leahi_dialin/fp/modules/levels.py
    • -0
    • +220
    /leahi_dialin/fp/modules/pressure_sensors.py
    • -0
    • +294
    /leahi_dialin/fp/modules/valves.py
    • -0
    • +248
    /leahi_dialin/fp/reverse_osmosis.py
    • -22
    • +0
    /leahi_dialin/ro/__init__.py
    • -0
    • +0
    /leahi_dialin/ro/modules/__init__.py
    • -255
    • +0
    /leahi_dialin/ro/modules/boost_pump.py
    • -230
    • +0
    /leahi_dialin/ro/modules/conductivity_sensors.py
    • -18
    • +0
    /leahi_dialin/ro/modules/constants.py
  16. … 5 more files in changeset.
3:11 pm

Michael Garthwaite

Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into staging

Options
3:11 pm

Michael Garthwaite

Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

Options
2:33 pm

Behrouz NematiPour

Revert "Merge branch 'LDT-237-MainTreatmentScreen-SW-SimulatorCleanup' into develop"

This reverts commit 2ef54f5cc7ef9ce2cf49c528a6205f77933d8a77, reversing

changes made to 9403e6711adf53da699ff25b4b7342286bf49b92.

Options
    • -2
    • +2
    /leahi_dialin/common/__init__.py
    • -22
    • +1
    /leahi_dialin/dd/__init__.py
    • -4
    • +3
    /leahi_dialin/protocols/CAN.py
    • -2
    • +2
    /leahi_dialin/protocols/__init__.py
    • -22
    • +0
    /leahi_dialin/ro/__init__.py
    • -22
    • +1
    /leahi_dialin/td/__init__.py
    • -4
    • +4
    /leahi_dialin/ui/td_messaging.py
    • -2
    • +2
    /leahi_dialin/utils/__init__.py
2:25 pm

Michael Garthwaite

Merge branch 'staging' into LEAH-261-fw-ro-flow-sensor-driver

Options
2:24 pm

Michael Garthwaite

leahi-261: code review

Options
    • -1
    • +6
    /leahi_dialin/fp/filtration_purification.py
1:54 pm

Behrouz NematiPour

LDT-242 Main Treatment Screen - SW - Simulator Cleanup - 05: DEV - Feature Implementation

- Rename the RO to FP.

Options
    • -0
    • +22
    /leahi_dialin/fp/__init__.py
    • -0
    • +0
    /leahi_dialin/fp/modules/__init__.py
    • -0
    • +255
    /leahi_dialin/fp/modules/boost_pump.py
    • -0
    • +230
    /leahi_dialin/fp/modules/conductivity_sensors.py
    • -0
    • +18
    /leahi_dialin/fp/modules/constants.py
    • -0
    • +175
    /leahi_dialin/fp/modules/flow_sensors.py
    • -0
    • +128
    /leahi_dialin/fp/modules/levels.py
    • -0
    • +220
    /leahi_dialin/fp/modules/pressure_sensors.py
    • -0
    • +294
    /leahi_dialin/fp/modules/valves.py
    • -0
    • +248
    /leahi_dialin/fp/reverse_osmosis.py
    • -22
    • +0
    /leahi_dialin/ro/__init__.py
    • -0
    • +0
    /leahi_dialin/ro/modules/__init__.py
    • -255
    • +0
    /leahi_dialin/ro/modules/boost_pump.py
    • -230
    • +0
    /leahi_dialin/ro/modules/conductivity_sensors.py
    • -18
    • +0
    /leahi_dialin/ro/modules/constants.py
  16. … 5 more files in changeset.
1:46 pm

Behrouz NematiPour

Merge branch 'LDT-237-MainTreatmentScreen-SW-SimulatorCleanup' into develop

Options
    • -3
    • +4
    /leahi_dialin/protocols/CAN.py
12:24 pm

Behrouz NematiPour

LDT-242 Main Treatment Screen - SW - Simulator Cleanup - 05: DEV - Feature Implementation

- Fixed the issues caused SWVV main test to fail.

Options
    • -2
    • +2
    /leahi_dialin/common/__init__.py
    • -1
    • +22
    /leahi_dialin/dd/__init__.py
    • -5
    • +5
    /leahi_dialin/protocols/CAN.py
    • -2
    • +2
    /leahi_dialin/protocols/__init__.py
    • -1
    • +22
    /leahi_dialin/ro/__init__.py
    • -1
    • +22
    /leahi_dialin/td/__init__.py
    • -4
    • +4
    /leahi_dialin/ui/td_messaging.py
    • -2
    • +2
    /leahi_dialin/utils/__init__.py
8:33 am

Michael Garthwaite

WIP on develop

LEAHI-261: code review comments

Options
    • -192
    • +1
    /leahi_dialin/common/dd_defs.py
    • -275
    • +1
    /leahi_dialin/common/td_defs.py
    • -1
    • +0
    /leahi_dialin/td/modules/air_pump.py
    • -1
    • +1
    /leahi_dialin/td/modules/bubble_detector.py
Tuesday 22 Apr
9:51 am

Tiffany Mejia

Merge remote-tracking branch 'origin/LEAH-261-fw-ro-flow-sensor-driver' into LDT-261-MainTreatmentScreen-SW-DiagnosticsScreen

Options
Tuesday 15 Apr
3:17 pm

Behrouz NematiPour

Merge branch 'LDT-237-MainTreatmentScreen-SW-SimulatorCleanup' into staging

Options
Monday 14 Apr
7:06 pm

Behrouz NematiPour

Merge branch 'LDT-237-MainTreatmentScreen-SW-SimulatorCleanup' into develop

Options
Thursday 10 Apr
3:13 pm

Behrouz NematiPour

LDT-242 Main Treatment Screen - SW - Simulator Cleanup - 05: DEV - Feature Implementation

- Refactored HD to TD and simplified the function names that going to use the format later as well.

Options
    • -4
    • +4
    /leahi_dialin/ui/td_messaging.py
1:30 pm

Michael Garthwaite

Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

Options
    • -9
    • +9
    /leahi_dialin/fp/modules/valves.py
1:30 pm

Michael Garthwaite

LEAHI-261: fixed fp valve naming

Options
    • -9
    • +9
    /leahi_dialin/fp/modules/valves.py
Wednesday 09 Apr
7:49 pm

Behrouz NematiPour

LDT-242 Main Treatment Screen - SW - Simulator Cleanup - 05: DEV - Feature Implementation

- Renamed the td_messaging.py to lowercase to match the rest of the modules.

Options
    • -54
    • +0
    /leahi_dialin/ui/TD_Messaging.py
    • -0
    • +54
    /leahi_dialin/ui/td_messaging.py
7:01 pm

Behrouz NematiPour

LDT-242 Main Treatment Screen - SW - Simulator Cleanup - 05: DEV - Feature Implementation

- Add a configuration named coinfig.json.

- For now one only SW key to bypass the imports in __init__.py files.

- Added TS_Messaging class.

- Added TD_OpMode message send function.

- Created a simpler singleton with decorator (may need more testing.)

- Updated data_logger to use the relative import.

Options
    • -5
    • +25
    /leahi_dialin/common/__init__.py
    • -4
    • +22
    /leahi_dialin/protocols/__init__.py
    • -9
    • +18
    /leahi_dialin/ui/TD_Messaging.py
    • -4
    • +6
    /leahi_dialin/ui/utils.py
    • -10
    • +30
    /leahi_dialin/utils/__init__.py
    • -1
    • +1
    /leahi_dialin/utils/data_logger.py
Monday 07 Apr
1:07 pm

Behrouz NematiPour

LDT-242 Main Treatment Screen - SW - Simulator Cleanup - 05: DEV - Feature Implementation

- initial implementation of the TD_Messaging

- need to commit to add the utils/basse.py in sparse

Options
    • -1
    • +1
    /.gitignore
    • -0
    • +45
    /leahi_dialin/ui/TD_Messaging.py
    • -0
    • +15
    /leahi_dialin/ui/utils.py
Saturday 05 Apr
1:33 am

Behrouz NematiPour

LDT-242 Main Treatment Screen - SW - Simulator Cleanup - 05: DEV - Feature Implementation

- copied the utils.py from Denali.

- it may need cleanup.

Options
    • -1
    • +1
    /.gitignore
    • -0
    • +200
    /leahi_dialin/ui/utils.py
Monday 24 Mar
3:52 pm

Vinayakam Mani

Merge branch 'develop' of bitbucket.org:diality-cloud/leahi-dialin into develop

Options
8:58 am

Michael Garthwaite

Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

Options
8:58 am

Michael Garthwaite

fixed init for fp. fixed dd naming

Options
    • -14
    • +14
    /leahi_dialin/dd/modules/valves.py
    • -0
    • +1
    /leahi_dialin/fp/filtration_purification.py
Tuesday 18 Mar
9:37 am

Michael Garthwaite

Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

Options
    • -36
    • +36
    /leahi_dialin/fp/modules/valves.py
9:37 am

Michael Garthwaite

LEAHI-261: updated valve naming. Added FP temperature sensor module, monitoring only.

Options
    • -0
    • +1
    /leahi_dialin/common/msg_ids.py
    • -1
    • +1
    /leahi_dialin/dd/modules/temperature_sensors.py
    • -6
    • +6
    /leahi_dialin/dd/modules/valves.py
    • -0
    • +1
    /leahi_dialin/fp/filtration_purification.py
    • -0
    • +114
    /leahi_dialin/fp/modules/temperatures.py
    • -36
    • +36
    /leahi_dialin/fp/modules/valves.py
    • -4
    • +4
    /leahi_dialin/td/modules/valves.py
Monday 17 Mar
12:38 pm

Michael Garthwaite

Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

Options
    • -9
    • +9
    /leahi_dialin/fp/modules/valves.py
12:37 pm

Michael Garthwaite

updated naming to be in line with leahi component naming

Options
    • -7
    • +7
    /leahi_dialin/fp/modules/conductivity_sensors.py
    • -12
    • +12
    /leahi_dialin/fp/modules/flow_sensors.py
    • -43
    • +43
    /leahi_dialin/fp/modules/pressure_sensors.py
    • -9
    • +9
    /leahi_dialin/fp/modules/valves.py
Monday 03 Mar
1:51 pm

Michael Garthwaite

Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

Options