From 90cdc4920bda9558f324d16d080f27958c6f3fa0 Mon Sep 17 00:00:00 2001 From: Steve Karg Date: Sun, 3 Nov 2024 10:28:42 -0600 Subject: [PATCH] Fixed MS/TP module flush stderr compile error from leftover. (#844) * Fixed MS/TP module flush stderr compile error from leftover. * Fixed MS/TP zero-config preferred-station setting to not filter getter. --- src/bacnet/datalink/dlmstp.c | 14 ++++++-------- src/bacnet/datalink/mstp.c | 1 - 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/bacnet/datalink/dlmstp.c b/src/bacnet/datalink/dlmstp.c index 5f28175a..c7815544 100644 --- a/src/bacnet/datalink/dlmstp.c +++ b/src/bacnet/datalink/dlmstp.c @@ -689,16 +689,14 @@ bool dlmstp_zero_config_enabled_set(bool flag) /** * @brief Get the MSTP port MAC address that this node prefers to use. - * @return ZeroConfigStation value + * @return ZeroConfigStation value, or an out-of-range value if invalid + * @note valid values are between Nmin_poll_station and Nmax_poll_station + * but other values such as 0 or 255 could mean 'unconfigured' */ uint8_t dlmstp_zero_config_preferred_station(void) { if (!MSTP_Port) { - return Nmin_poll_station; - } - if ((MSTP_Port->Zero_Config_Preferred_Station < Nmin_poll_station) || - (MSTP_Port->Zero_Config_Preferred_Station > Nmax_poll_station)) { - return Nmin_poll_station; + return 0; } return MSTP_Port->Zero_Config_Preferred_Station; @@ -708,14 +706,14 @@ uint8_t dlmstp_zero_config_preferred_station(void) * @brief Set the MSTP port MAC address that this node prefers to use. * @param station - Zero_Config_Preferred_Station value * @return true if the MSTP port Zero_Config_Preferred_Station was set + * @note valid values are between Nmin_poll_station and Nmax_poll_station + * but other values such as 0 or 255 could mean 'unconfigured' */ bool dlmstp_zero_config_preferred_station_set(uint8_t station) { if (!MSTP_Port) { return false; } - /* note: valid values are between Nmin_poll_station and Nmax_poll_station - but other values such as 0 or 255 could mean 'unconfigured' */ MSTP_Port->Zero_Config_Preferred_Station = station; return true; diff --git a/src/bacnet/datalink/mstp.c b/src/bacnet/datalink/mstp.c index ce4c4fcd..c680fef0 100644 --- a/src/bacnet/datalink/mstp.c +++ b/src/bacnet/datalink/mstp.c @@ -608,7 +608,6 @@ void MSTP_Receive_Frame_FSM(struct mstp_port_struct_t *mstp_port) if ((receive_state != MSTP_RECEIVE_STATE_IDLE) && (mstp_port->receive_state == MSTP_RECEIVE_STATE_IDLE)) { printf_receive_data("\n"); - fflush(stderr); } return; }