Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into develop

    • -14
    • +10
    ./modules/conductivity_sensors.py
  1. … 1 more file in changeset.
fixed. thanks!

fixed. thanks!

fixed. thanks

fixed. thanks

LDT-4734: code review comments

  1. … 1 more file in changeset.
Add uncompensated conductivity to the init too

Add uncompensated conductivity to the init too

Add uncompensated conductivity to the init too

Add uncompensated conductivity to the init too

LDT-4734: updates to conductivity message

  1. … 2 more files in changeset.
Merge branch 'LDT-4734-temp-comp-conductivity' into develop

  1. … 4 more files in changeset.
LDT-4734: updates to conductivity messaging.

  1. … 2 more files in changeset.
LEAHI-DIALIN-LDT-4734_Water Treatment and Degassing - FW Iteration - 5/4:
LEAHI-DIALIN-LDT-4734_Water Treatment and Degassing - FW Iteration - 5/4:
Merge branch 'LDT-4732-fpga_version_fix' into develop

  1. … 3 more files in changeset.
Please consult the FW-SW integration xls file for MSG_ID reservations. Please add the ones you need to that list as without missing any reservations for IDs the randomly added IDs will be overwritt...

Please consult the FW-SW integration xls file for MSG_ID reservations.
Please add the ones you need to that list as without missing any reservations for IDs the randomly added IDs will be overwritten by reserved ones.

Instead of removing, could you move them to the bottom of the list to prevent exceptions being thrown?

Instead of removing, could you move them to the bottom of the list to prevent exceptions being thrown?

LEAHI-DIALIN-LDT-4732_(Dialin) Dialin version should be included in the all system logs
LEAHI-DIALIN-LDT-4732_(Dialin) Dialin version should be included in the all system logs
Updated msg IDs Updated version handling

  1. … 3 more files in changeset.
Merge branch 'LDT-4721-extra_param' into develop

  1. … 14 more files in changeset.
event fix

  1. … 2 more files in changeset.
fixes

  1. … 6 more files in changeset.
Fixes

  1. … 4 more files in changeset.
Fixing naming from DenaliChannels to CanChannels

  1. … 5 more files in changeset.
LEAHI-DIALIN-LDT-4721_Add extra parameter to start pregen request
LEAHI-DIALIN-LDT-4721_Add extra parameter to start pregen request