hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'master' into DEN-1312-hd-dialysate-inlet-pump-drive-flow-sensor-control

    • -1
    • +1
    /firmware/App/Modes/ModePrescription.c
  1. … 14 more files in changeset.
Addressed code review comment.

Final UT/IT changes.

    • -1363
    • +4651
    /results/VectorCAST.log
Minor improvements to CAN communications. +review HD-DEN-1312-1

Addressed code review feedback. +review HD-DEN-1312-1

Updated PIControllers to behave in classic manner. Added more thread protection to CAN comm buffers. +review HD-DEN-1312-1

    • -4
    • +1
    /firmware/App/Controllers/DialInFlow.c
    • -12
    • +15
    /firmware/App/Services/AlarmMgmt.h
    • -13
    • +19
    /firmware/App/Services/CommBuffers.c
    • -17
    • +30
    /firmware/App/Services/PIControllers.c
    • -1
    • +1
    /firmware/App/Services/PIControllers.h
Added IT for DialInFlow module. Updated other IT. +review HD-DEN-1312-1

Updated UT for SystemComm and SystemCommMessages modules.

    • -33
    • +28
    /firmware/App/Services/SystemComm.c
Updated UT for AlarmMgmt module.

Updated BloodFlow and DialInFlow modules per UT. Added new UT for DialInFlow.

    • -12
    • +10
    /firmware/App/Controllers/DialInFlow.c
Removed DialOutFlow module - Leo added to separate branch. Fixed alarm lamp POST.

    • -2
    • +2
    /firmware/App/Controllers/DialInFlow.c
    • -838
    • +0
    /firmware/App/Controllers/DialOutUF.c
    • -58
    • +0
    /firmware/App/Controllers/DialOutUF.h
    • -1
    • +0
    /firmware/App/Modes/ModePrescription.c
    • -28
    • +38
    /firmware/App/Services/SystemComm.c
  1. … 4 more files in changeset.
Updated the Copyright with the current year and replaced tabs with 4 spaces

    • -1
    • +1
    /firmware/App/Drivers/SafetyShutdown.c
    • -1
    • +1
    /firmware/App/Drivers/SafetyShutdown.h
  1. … 50 more files in changeset.
Updated HALCoGen GIO pins.

Added dialin messages for dialysate inlet pump. Fixes to watchdog expired fault. Updates to existing UT.

    • -3
    • +3
    /firmware/App/Controllers/DialInFlow.c
    • -0
    • +28
    /firmware/App/Services/SystemComm.c
Fixed high priority alarm lamp blink frequency. Added alarm functionality for silence, escalation, and flags. Added a new boolean flag for whether there is at least one alarm pending escalation.

    • -7
    • +139
    /firmware/App/Services/AlarmMgmt.c
Added PIControllers module. Used new PIControllers module in BloodFlow and DialInFlow modules. Moved Watchdog POST to first POST test. Prevent watchdog expired fault during watchdog POST test.

    • -26
    • +11
    /firmware/App/Controllers/BloodFlow.c
    • -26
    • +11
    /firmware/App/Controllers/DialInFlow.c
    • -21
    • +15
    /firmware/App/Modes/ModeInitPOST.c
    • -0
    • +205
    /firmware/App/Services/PIControllers.c
    • -0
    • +54
    /firmware/App/Services/PIControllers.h
    • -5
    • +18
    /firmware/App/Services/WatchdogMgmt.c
Updated FPGA registers. Removed some CAN debug code. Removed html reports from vectorcast.

    • -13
    • +0
    /firmware/App/Services/CommBuffers.c
    • -17
    • +7
    /firmware/App/Services/SystemComm.c
Updated CAN interrupts config. Added a watchdog expired alarm. Added PWM duty cycle to blood flow broadcast.

    • -12
    • +12
    /firmware/App/Services/SystemComm.c
  1. … 4 more files in changeset.
Added some more CAN debug code. Minor updates to blood and dialysate pump modules.

    • -13
    • +12
    /firmware/App/Controllers/DialInFlow.c
    • -0
    • +13
    /firmware/App/Services/CommBuffers.c
Added SPI driver for GPIO. Set appropriate motor dir and stop pins for dialysate pump modules. Added calls to init dialysate pump modules. Added exec calls from tasks for dialysate pump modules.

    • -8
    • +9
    /firmware/App/Controllers/DialInFlow.c
    • -1
    • +10
    /firmware/App/Services/SystemComm.c
    • -0
    • +746
    /firmware/source/spi.c
Added DialInFlow and DialOutUF modules. Added alarms associated with dialysate pumps.

    • -0
    • +983
    /firmware/App/Controllers/DialInFlow.c
    • -0
    • +58
    /firmware/App/Controllers/DialInFlow.h
    • -0
    • +837
    /firmware/App/Controllers/DialOutUF.c
    • -0
    • +58
    /firmware/App/Controllers/DialOutUF.h
Updated flow filter in BloodFlow per discussion with Blaine. Added ADC channels for dialysate pumps. Added some debug code for CAN tranmit issue. Added GPIO for dialysate pumps to HALCoGen.

    • -27
    • +140
    /firmware/App/Controllers/BloodFlow.c
    • -13
    • +13
    /firmware/App/Services/SystemComm.c
  1. … 5 more files in changeset.
Added bloodflow overrides for not yet implemented sensors. Condensed published alarms status message.

Increased delay between CAN bus recovery attempts. Added a little handling for UART frame/overrun errors. Updated UT. +review HD-DEN-759-1

Removed Vectorcast results. +review HD-DEN-759-1

    • -5314
    • +0
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_ALARMLAMP_execution_results_report.html
    • -12108
    • +0
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_ALARMMGMT_execution_results_report.html
    • -19216
    • +0
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_BLOODFLOW_execution_results_report.html
    • -9196
    • +0
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_BUTTONS_execution_results_report.html
    • -5106
    • +0
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_COMMBUFFERS_execution_results_report.html
    • -3636
    • +0
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_COMM_execution_results_report.html
    • -2074
    • +0
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_CPLD_execution_results_report.html
    • -13552
    • +0
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_FPGA_execution_results_report.html
    • -3450
    • +0
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_INTERRUPTS_execution_results_report.html
    • -1736
    • +0
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_INT_ALARMLAMP_execution_results_report.html
    • -1298
    • +0
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_INT_ALARMMGMT_execution_results_report.html
    • -1134
    • +0
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_INT_BLOODFLOW_execution_results_report.html
    • -2694
    • +0
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_INT_BUTTONS_execution_results_report.html
    • -1706
    • +0
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_INT_COMMBUFFERS_execution_results_report.html
    • -1442
    • +0
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_INT_CPLD_execution_results_report.html
  1. … 49 more files in changeset.
Fixed code review issue. +review HD-DEN-759-1

Code review fix. Adding rounding to BloodFlow module. +review HD-DEN-759-1

    • -1040
    • +533
    /results/VectorCAST.log
    • -52
    • +53
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_ALARMLAMP_execution_results_report.html
    • -116
    • +117
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_ALARMMGMT_execution_results_report.html
    • -192
    • +193
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_BLOODFLOW_execution_results_report.html
    • -100
    • +101
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_BUTTONS_execution_results_report.html
    • -42
    • +43
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_COMMBUFFERS_execution_results_report.html
    • -48
    • +49
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_COMM_execution_results_report.html
    • -26
    • +27
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_CPLD_execution_results_report.html
    • -110
    • +111
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_FPGA_execution_results_report.html
    • -42
    • +43
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_INTERRUPTS_execution_results_report.html
    • -14
    • +15
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_INT_ALARMLAMP_execution_results_report.html
    • -10
    • +11
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_INT_ALARMMGMT_execution_results_report.html
  1. … 53 more files in changeset.
Fixed white space between brackets throughout. Added some debug code to help troubleshoot comm issue. Updated power off messaging. +review HD-DEN-759-1

    • -14
    • +59
    /firmware/App/Controllers/Buttons.c
    • -20
    • +20
    /firmware/App/Drivers/InternalADC.c
    • -33
    • +41
    /firmware/App/Services/AlarmMgmt.c
    • -27
    • +27
    /firmware/App/Services/CommBuffers.c
    • -0
    • +51
    /firmware/App/Services/Interrupts.c
    • -16
    • +16
    /firmware/App/Services/MsgQueues.c
    • -17
    • +17
    /firmware/App/Services/SystemComm.c
  1. … 70 more files in changeset.
Added place holders for 2 sensors not yet ready for BloodFlow module. Refactored IT for CPLD and SafetyShutdown modules to move from target run to MinGW run tests. Updated UT for SystemComm and SystemCommMessages modules. +review HD-DEN-759-1

    • -26
    • +82
    /firmware/App/Controllers/BloodFlow.c
Ran the test suite. Added test suite results folder.

    • -0
    • +12306
    /results/VectorCAST.log
    • -0
    • +122
    /results/cppcheck.log
    • -0
    • +569
    /results/cppcheckError.log
    • -0
    • +5313
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_ALARMLAMP_execution_results_report.html
    • -0
    • +12107
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_ALARMMGMT_execution_results_report.html
    • -0
    • +16851
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_BLOODFLOW_execution_results_report.html
    • -0
    • +8833
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_BUTTONS_execution_results_report.html
    • -0
    • +5105
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_COMMBUFFERS_execution_results_report.html
    • -0
    • +3635
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_COMM_execution_results_report.html
    • -0
    • +2073
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_CPLD_execution_results_report.html
    • -0
    • +13551
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_FPGA_execution_results_report.html
    • -0
    • +3449
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_INTERRUPTS_execution_results_report.html
    • -0
    • +1735
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_INT_ALARMLAMP_execution_results_report.html
    • -0
    • +1297
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_INT_ALARMMGMT_execution_results_report.html
    • -0
    • +1101
    /results/execution/VectorCAST_MinGW_C_LinuxTestSuite_INT_BLOODFLOW_execution_results_report.html
  1. … 48 more files in changeset.