Skip to content

Commit c2904f0

Browse files
authored
Update Strings Seen By Customers For Salinity App (#349)
Update bm_core commit hash Update strings seen by customers to aanderaa_conductivity
1 parent 350b4aa commit c2904f0

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

src/apps/bridge/sensorController.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ template <typename T> struct SensorSubscriptionCtx {
6060
static sensorsControllerCtx_t _ctx;
6161

6262
static const SensorSubscriptionCtx<AanderaaConductivity_t> aanderaa_conductivity_ctx = {
63-
.app_name = "aanderaa_conductivity",
63+
.app_name = "aanderaa_salinity",
6464
.sensor_type = SENSOR_TYPE_AANDERAA_CONDUCTIVITY,
6565
.reading_period =
6666
{

src/apps/bridge/sensor_drivers/aanderaaConductivitySensor.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,7 @@ void AanderaaConductivitySensor::setup_sensor_pointers(report_builder_element_t
227227
BmErr AanderaaConductivitySensor::send_spotter_log_individual(
228228
const AanderaaConductivityMsg::Data &m) {
229229
BmErr err = AbstractSensor::send_spotter_log_individual(
230-
"aanderaa_conductivity", m.header,
231-
DEFAULT_AANDERAA_CONDUCTIVITY_READING_PERIOD_MS + 1000U,
230+
"aanderaa_salinity", m.header, DEFAULT_AANDERAA_CONDUCTIVITY_READING_PERIOD_MS + 1000U,
232231
"%.4f," // conductivity_ms_cm
233232
"%.3f," // temperature_deg_c
234233
"%.3f," // salinity_psu
@@ -257,7 +256,7 @@ BmErr AanderaaConductivitySensor::send_spotter_log_aggregate(
257256
const AanderaaConductivityAggregations &agg) {
258257

259258
BmErr err = AbstractSensor::send_spotter_log_aggregate(
260-
"aanderaa_conductivity", agg.reading_count,
259+
"aanderaa_salinity", agg.reading_count,
261260
"%.4f," // conductivity_mean_ms_cm
262261
"%.3f," // temperature_mean_deg_c
263262
"%.3f," // salinity_mean_psu

src/apps/bridge/topology_sampler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,7 @@ static void _update_sensor_type_list(uint64_t node_id, char *app_name, uint32_t
817817
(void)app_name_len;
818818
for (uint8_t i = 0; i < TOPOLOGY_SAMPLER_MAX_NODE_LIST_SIZE; i++) {
819819
if (_node_list.nodes[i] == node_id) {
820-
if (strncmp(app_name, "aanderaa_conductivity", strlen("aanderaa_conductivity")) == 0) {
820+
if (strncmp(app_name, "aanderaa_salinity", strlen("aanderaa_salinity")) == 0) {
821821
_node_list.sensor_type[i] = SENSOR_TYPE_AANDERAA_CONDUCTIVITY;
822822
break;
823823
} else if (strncmp(app_name, "aanderaa", strlen("aanderaa")) == 0) {

src/lib/bm_core

0 commit comments

Comments
 (0)