Vendor - TEL - Santhoshkumar Reddy Alasandagutti

UI sync issues with custom data types got corrected

Merge branch 'staging' into bugfix/LDT-4160-request-get-function-for-full-d

Merge branch 'staging' into bugfix/LDT-4160-request-get-function-for-full-d

naming convcention fix

Merge branch 'staging' into bugfix/LDT-4160-request-get-function-for-full-d

Merge fixes

Merge branch 'bugfix/LDT-4539-provide-event-on-service-state-' into staging

Merge fixes

    • -2
    • +12
    /firmware/App/Controllers/DryBiCart.c
    • -2
    • +14
    /firmware/App/Controllers/Heaters.c
Merge branch 'bugfix/LDT-4539-provide-event-on-service-state-' into develop

staging ocnflict

Merge branch 'staging' into bugfix/LDT-4160-request-get-function-for-full-d

staging conflict resolved

resolved conflicts

    • -393
    • +396
    /firmware/App/Services/AlarmMgmtTD.c
Merge branch 'staging' into bugfix/LDT-4160-request-get-function-for-full-d

Merge branch 'staging' into bugfix/LDT-4160-request-get-function-for-full-d

Fixed warning and resolved commnets

resolved conflicts and mismatches

    • -25
    • +2
    /firmware/App/Controllers/DryBiCart.c
Merge conflicts with staging resolved and comments

    • -955
    • +427
    /firmware/App/Controllers/DryBiCart.c
Merge remote-tracking branch 'origin/staging' into bugfix/LDT-4539-provide-event-on-service-state-

a

Data Type Issues fixed for CAN Channel transmission

Bug Fix in Enum

Code changes for CR

    • -3
    • +15
    /firmware/App/Controllers/Heaters.c
Fixed payload

Fixed payload

    • -14
    • +33
    /firmware/App/Services/AlarmMgmtTD.c
Fixed missing indent in messaging file

Fixed indents for the message ids in MSDefs

LDT-4160- Added a new functaion to pull the alarm properties

    • -0
    • +33
    /firmware/App/Services/AlarmMgmtTD.c
Added new message ids for alarm properties request and response

LDT-4539 Enum Updation for state changes event

LDT-4539: Add state-change event logging to DD modules (BalancingChamber, DryBiCart, Heaters, Ultrafiltration)

    • -0
    • +10
    /firmware/App/Controllers/DryBiCart.c