Clone
 

michael garthwaite <mgarthwaite@diality.com> in dd-firmware

WIP on LDT-1773-dd-valve-pwm

LDT-1773: Valve pwm implementation for beta.

    • -35
    • +348
    /firmware/App/Services/FpgaDD.c
Merge branch 'staging' into LDT-1773-dd-valve-pwm-beta

Merge branch 'staging_alpha' into LDT-1773-dd-valve-pwm

Merge branch 'staging' into LDT-1773-dd-valve-pwm-beta

Merge branch 'LDT-2004-dialysate-composition-dd' into LDT-2004-dialysate-composition-dd_MG

Merge remote-tracking branch 'origin/LDT-2936-iofp---update-m12-and-boost-pum' into LDT-2936-iofp---update-m12-and-boost-pum

LDT-2004: fixed op mode transition fault codes. fixed IOFP not faulting when dd requests pre-gen when not in IOFP standby

    • -4
    • +4
    /firmware/App/Modes/FPModes/FPOperationModes.c
    • -1
    • +10
    /firmware/App/Services/TDInterface.c
LDT-2004: fixed op mode transition fault codes. fixed IOFP not faulting when dd requests pre-gen when not in IOFP standby

    • -4
    • +4
    /firmware/App/Modes/FPModes/FPOperationModes.c
    • -1
    • +10
    /firmware/App/Services/TDInterface.c
LDT-2004: fixed automated recv. Reordered functions teensy file to be grouped. Hooked teensy conductivty driver to rest of the application. created build flag for teensy. Added stop CMD to start of q on init. removed unneeded code related to DMA.

    • -399
    • +323
    /firmware/App/Drivers/ConductivityTeensy.c
    • -0
    • +4
    /firmware/App/Modes/ModeGenDialysate.c
    • -21
    • +21
    /firmware/App/Monitors/Conductivity.c
    • -1
    • +17
    /firmware/App/Monitors/Temperature.c
WIP on LDT-2004-dialysate-composition-dd_MG

    • -0
    • +10
    /firmware/App/Monitors/Conductivity.c
Merge branch 'LDT-2004-dialysate-composition-dd' into LDT-2004-dialysate-composition-dd_MG

LDT-2662: code review comments.

Merge branch 'LDT-2004-dialysate-composition-dd' into LDT-2004-dialysate-composition-dd_MG

LDT-2662: added result changes if the FP can not transition to respective gen modes

    • -0
    • +15
    /firmware/App/Services/TDInterface.c
LDT-2662: code review comments

    • -2
    • +2
    /firmware/App/Modes/FPModes/FPOperationModes.c
LDT-2662: code review comments

    • -6
    • +22
    /firmware/App/Modes/FPModes/FPOperationModes.c
LDT-2004: updates to TX RX comm via DMA for teensy board. Updated SCI configuration. Implemented INIT_SENSORS cmd to teensy.

    • -438
    • +266
    /firmware/App/Drivers/ConductivityTeensy.c
Merge branch 'LDT-2004-dialysate-composition-dd' into LDT-2004-dialysate-composition-dd_MG

    • -172
    • +468
    /firmware/App/Drivers/ConductivityTeensy.c
LDT-2004: Conductivity Sensor state machine skeleton

    • -117
    • +313
    /firmware/App/Drivers/ConductivityTeensy.c
Merge branch 'LDT-2662-beta-1.0-fw-integration-part2--' into develop

Merge branch 'staging' into develop

    • -36
    • +166
    /firmware/App/Services/Messaging.c
Merge branch 'staging' into LDT-1773-dd-valve-pwm-beta

LDT-2787: reworked requesting op modes from DD to FP as well as created a set command to set signals of starting/stopping generate permeate.

    • -3
    • +85
    /firmware/App/Modes/FPModes/FPOperationModes.c
    • -0
    • +3
    /firmware/App/Modes/FPModes/FPOperationModes.h
LDT-2198: updated p25 and d6 floater values.

LDT-1773: implementation of valve PWM for dd alpha

Merge branch 'staging_alpha' into LDT-1773-dd-valve-pwm

LDT-2198: code review comments. removed M4 control from dd side, should be IO/FP only.

    • -3
    • +3
    /firmware/App/Modes/FPModes/FPOperationModes.c
    • -4
    • +0
    /firmware/App/Modes/ModeGenDialysate.c
LDT-2198: code review comments for levels driver

LDT-2198: updates to level monitor merge. Added FP overrides that were missing in messaging table.

    • -21
    • +107
    /firmware/App/Monitors/Level.c