dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added AlignAfterOpenBracket: AlwaysBreak and BinPackArguments: true to clang-format. Updated test/bacnet c/h files with updated format.

Browse Source
This commit is contained in:
Steve Karg
2024-04-24 09:38:12 -05:00
parent 1aaebe9414
commit 70c54817fd
120 changed files with 2182 additions and 1894 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/bacnet/datalink/mstp/src/main.c
+69 -50
View File
@@ -429,8 +429,8 @@ static void testReceiveNodeFSM(void)
/* BadCRC in header check */
mstp_port.ReceivedInvalidFrame = false;
mstp_port.ReceivedValidFrame = false;
len = MSTP_Create_Frame(buffer, sizeof(buffer), FRAME_TYPE_TOKEN,
0x10, /* destination */
len = MSTP_Create_Frame(
buffer, sizeof(buffer), FRAME_TYPE_TOKEN, 0x10, /* destination */
my_mac, /* source */
NULL, /* data */
0); /* data size */
@@ -444,8 +444,9 @@ static void testReceiveNodeFSM(void)
MSTP_Receive_Frame_FSM(&mstp_port);
zassert_true(mstp_port.DataAvailable == false, NULL);
zassert_true(mstp_port.SilenceTimer(&mstp_port) == 0, NULL);
zassert_true(mstp_port.EventCount == EventCount, "i=%u %u!=%u len=%u",
i, mstp_port.EventCount, EventCount, len);
zassert_true(
mstp_port.EventCount == EventCount, "i=%u %u!=%u len=%u", i,
mstp_port.EventCount, EventCount, len);
}
zassert_true(mstp_port.ReceivedInvalidFrame == true, NULL);
zassert_true(mstp_port.ReceivedValidFrame == false, NULL);
@@ -453,8 +454,8 @@ static void testReceiveNodeFSM(void)
/* NoData for us */
mstp_port.ReceivedInvalidFrame = false;
mstp_port.ReceivedValidFrame = false;
len = MSTP_Create_Frame(buffer, sizeof(buffer), FRAME_TYPE_TOKEN,
my_mac, /* destination */
len = MSTP_Create_Frame(
buffer, sizeof(buffer), FRAME_TYPE_TOKEN, my_mac, /* destination */
my_mac, /* source */
NULL, /* data */
0); /* data size */
@@ -474,8 +475,8 @@ static void testReceiveNodeFSM(void)
/* FrameTooLong */
mstp_port.ReceivedInvalidFrame = false;
mstp_port.ReceivedValidFrame = false;
len = MSTP_Create_Frame(buffer, sizeof(buffer), FRAME_TYPE_TOKEN,
my_mac, /* destination */
len = MSTP_Create_Frame(
buffer, sizeof(buffer), FRAME_TYPE_TOKEN, my_mac, /* destination */
my_mac, /* source */
NULL, /* data */
0); /* data size */
@@ -498,8 +499,9 @@ static void testReceiveNodeFSM(void)
mstp_port.ReceivedInvalidFrame = false;
mstp_port.ReceivedValidFrame = false;
memset(data_proprietary, 0, sizeof(data_proprietary));
len = MSTP_Create_Frame(buffer, sizeof(buffer), FRAME_TYPE_PROPRIETARY_MIN,
my_mac, my_mac, data_proprietary, sizeof(data_proprietary));
len = MSTP_Create_Frame(
buffer, sizeof(buffer), FRAME_TYPE_PROPRIETARY_MIN, my_mac, my_mac,
data_proprietary, sizeof(data_proprietary));
zassert_true(len > 0, NULL);
Load_Input_Buffer(buffer, len);
RS485_Check_UART_Data(&mstp_port);
@@ -517,8 +519,8 @@ static void testReceiveNodeFSM(void)
mstp_port.ReceivedInvalidFrame = false;
mstp_port.ReceivedValidFrame = false;
memset(data, 0, sizeof(data));
len = MSTP_Create_Frame(buffer, sizeof(buffer),
FRAME_TYPE_BACNET_EXTENDED_DATA_EXPECTING_REPLY,
len = MSTP_Create_Frame(
buffer, sizeof(buffer), FRAME_TYPE_BACNET_EXTENDED_DATA_EXPECTING_REPLY,
my_mac, my_mac, data, Nmin_COBS_length_BACnet);
zassert_true(len > 0, NULL);
Load_Input_Buffer(buffer, len);
@@ -532,15 +534,17 @@ static void testReceiveNodeFSM(void)
zassert_true(mstp_port.ReceivedInvalidFrame == false, NULL);
zassert_true(mstp_port.ReceivedValidFrame == true, NULL);
zassert_true(mstp_port.receive_state == MSTP_RECEIVE_STATE_IDLE, NULL);
zassert_true(mstp_port.FrameType ==
FRAME_TYPE_BACNET_EXTENDED_DATA_EXPECTING_REPLY, NULL);
zassert_true(
mstp_port.FrameType == FRAME_TYPE_BACNET_EXTENDED_DATA_EXPECTING_REPLY,
NULL);
/* Extended-Data-Not-Expecting-Reply */
mstp_port.ReceivedInvalidFrame = false;
mstp_port.ReceivedValidFrame = false;
memset(data, 0, sizeof(data));
len = MSTP_Create_Frame(buffer, sizeof(buffer),
FRAME_TYPE_BACNET_EXTENDED_DATA_NOT_EXPECTING_REPLY,
my_mac, my_mac, data, Nmin_COBS_length_BACnet);
len = MSTP_Create_Frame(
buffer, sizeof(buffer),
FRAME_TYPE_BACNET_EXTENDED_DATA_NOT_EXPECTING_REPLY, my_mac, my_mac,
data, Nmin_COBS_length_BACnet);
zassert_true(len > 0, NULL);
Load_Input_Buffer(buffer, len);
RS485_Check_UART_Data(&mstp_port);
@@ -553,8 +557,10 @@ static void testReceiveNodeFSM(void)
zassert_true(mstp_port.ReceivedInvalidFrame == false, NULL);
zassert_true(mstp_port.ReceivedValidFrame == true, NULL);
zassert_true(mstp_port.receive_state == MSTP_RECEIVE_STATE_IDLE, NULL);
zassert_true(mstp_port.FrameType ==
FRAME_TYPE_BACNET_EXTENDED_DATA_NOT_EXPECTING_REPLY, NULL);
zassert_true(
mstp_port.FrameType ==
FRAME_TYPE_BACNET_EXTENDED_DATA_NOT_EXPECTING_REPLY,
NULL);
}
static void testMasterNodeFSM(void)
@@ -667,8 +673,8 @@ static void testZeroConfigNode_Init(struct mstp_port_struct_t *mstp_port)
zassert_true(mstp_port->Zero_Config_Max_Master == 0, NULL);
}
static void testZeroConfigNode_No_Events_Timeout(
struct mstp_port_struct_t *mstp_port)
static void
testZeroConfigNode_No_Events_Timeout(struct mstp_port_struct_t *mstp_port)
{
bool transition_now, non_zero;
unsigned slots, silence, i;
@@ -696,8 +702,8 @@ static void testZeroConfigNode_Test_Request_Unsupported(
mstp_port->This_Station == mstp_port->Zero_Config_Station, NULL);
}
static void testZeroConfigNode_Test_Request_Supported(
struct mstp_port_struct_t *mstp_port)
static void
testZeroConfigNode_Test_Request_Supported(struct mstp_port_struct_t *mstp_port)
{
bool transition_now, non_zero;
unsigned slots, silence, i;
@@ -716,8 +722,8 @@ static void testZeroConfigNode_Test_Request_Supported(
mstp_port->This_Station == mstp_port->Zero_Config_Station, NULL);
}
static void testZeroConfigNode_Test_IDLE_InvalidFrame(
struct mstp_port_struct_t *mstp_port)
static void
testZeroConfigNode_Test_IDLE_InvalidFrame(struct mstp_port_struct_t *mstp_port)
{
bool transition_now, non_zero;
unsigned slots, silence, i;
@@ -765,8 +771,8 @@ static void testZeroConfigNode_Test_IDLE_ValidFrameTimeout(
mstp_port->Zero_Config_State == MSTP_ZERO_CONFIG_STATE_IDLE, NULL);
}
static void testZeroConfigNode_Test_IDLE_ValidFrame(
struct mstp_port_struct_t *mstp_port)
static void
testZeroConfigNode_Test_IDLE_ValidFrame(struct mstp_port_struct_t *mstp_port)
{
bool transition_now, non_zero;
unsigned slots, silence, i;
@@ -783,8 +789,8 @@ static void testZeroConfigNode_Test_IDLE_ValidFrame(
zassert_true(mstp_port->ReceivedValidFrame == true, NULL);
}
static void testZeroConfigNode_Test_LURK_AddressInUse(
struct mstp_port_struct_t *mstp_port)
static void
testZeroConfigNode_Test_LURK_AddressInUse(struct mstp_port_struct_t *mstp_port)
{
bool transition_now, non_zero;
unsigned slots, silence, i;
@@ -804,7 +810,8 @@ static void testZeroConfigNode_Test_LURK_AddressInUse(
zassert_true(
mstp_port->Zero_Config_State == MSTP_ZERO_CONFIG_STATE_LURK, NULL);
zassert_true(mstp_port->ReceivedValidFrame == false, NULL);
zassert_true(mstp_port->Zero_Config_Station != src, "src=%u zc=%u", src,
zassert_true(
mstp_port->Zero_Config_Station != src, "src=%u zc=%u", src,
mstp_port->Zero_Config_Station);
}
}
@@ -832,8 +839,8 @@ static void testZeroConfigNode_Test_LURK_LearnMaxMaster(
}
}
static void testZeroConfigNode_Test_LURK_Claim(
struct mstp_port_struct_t *mstp_port)
static void
testZeroConfigNode_Test_LURK_Claim(struct mstp_port_struct_t *mstp_port)
{
bool transition_now, non_zero;
unsigned slots, silence, i;
@@ -858,8 +865,8 @@ static void testZeroConfigNode_Test_LURK_Claim(
zassert_true(
mstp_port->Zero_Config_State == MSTP_ZERO_CONFIG_STATE_CLAIM,
NULL);
} else if (mstp_port->Zero_Config_State ==
MSTP_ZERO_CONFIG_STATE_LURK) {
} else if (
mstp_port->Zero_Config_State == MSTP_ZERO_CONFIG_STATE_LURK) {
zassert_true(
mstp_port->Poll_Count == (count + 1), "count=%u", count);
zassert_true(
@@ -870,9 +877,11 @@ static void testZeroConfigNode_Test_LURK_Claim(
}
}
/* verify the Reply To Poll For Master was sent for confirmation */
zassert_equal(mstp_port->OutputBuffer[2], FRAME_TYPE_REPLY_TO_POLL_FOR_MASTER, NULL);
zassert_equal(
mstp_port->OutputBuffer[2], FRAME_TYPE_REPLY_TO_POLL_FOR_MASTER, NULL);
zassert_equal(mstp_port->OutputBuffer[3], mstp_port->SourceAddress, NULL);
zassert_equal(mstp_port->OutputBuffer[4], mstp_port->Zero_Config_Station, NULL);
zassert_equal(
mstp_port->OutputBuffer[4], mstp_port->Zero_Config_Station, NULL);
}
static void testZeroConfigNode_Test_LURK_ClaimTokenForUs(
@@ -890,11 +899,13 @@ static void testZeroConfigNode_Test_LURK_ClaimTokenForUs(
transition_now = MSTP_Master_Node_FSM(mstp_port);
zassert_false(transition_now, NULL);
zassert_true(mstp_port->ReceivedValidFrame == false, NULL);
zassert_equal(mstp_port->Zero_Config_State, MSTP_ZERO_CONFIG_STATE_CONFIRM, NULL);
zassert_equal(
mstp_port->Zero_Config_State, MSTP_ZERO_CONFIG_STATE_CONFIRM, NULL);
/* verify the Test Request Frame was sent for confirmation */
zassert_equal(mstp_port->OutputBuffer[2], FRAME_TYPE_TEST_REQUEST, NULL);
zassert_equal(mstp_port->OutputBuffer[3], mstp_port->SourceAddress, NULL);
zassert_equal(mstp_port->OutputBuffer[4], mstp_port->Zero_Config_Station, NULL);
zassert_equal(
mstp_port->OutputBuffer[4], mstp_port->Zero_Config_Station, NULL);
}
static void testZeroConfigNode_Test_LURK_ConfirmationSuccessful(
@@ -914,8 +925,10 @@ static void testZeroConfigNode_Test_LURK_ConfirmationSuccessful(
transition_now = MSTP_Master_Node_FSM(mstp_port);
zassert_true(transition_now, NULL);
zassert_true(mstp_port->ReceivedValidFrame == false, NULL);
zassert_equal(mstp_port->This_Station, mstp_port->Zero_Config_Station, NULL);
zassert_equal(mstp_port->Zero_Config_State, MSTP_ZERO_CONFIG_STATE_USE, NULL);
zassert_equal(
mstp_port->This_Station, mstp_port->Zero_Config_Station, NULL);
zassert_equal(
mstp_port->Zero_Config_State, MSTP_ZERO_CONFIG_STATE_USE, NULL);
}
static void testZeroConfigNode_Test_LURK_ConfirmationAddressInUse(
@@ -932,7 +945,7 @@ static void testZeroConfigNode_Test_LURK_ConfirmationAddressInUse(
mstp_port->FrameType = FRAME_TYPE_PROPRIETARY_MIN;
encode_unsigned16(&mstp_port->InputBuffer[0], BACNET_VENDOR_ID);
memcpy(&mstp_port->InputBuffer[2], mstp_port->UUID, MSTP_UUID_SIZE);
mstp_port->DataLength = MSTP_UUID_SIZE+2;
mstp_port->DataLength = MSTP_UUID_SIZE + 2;
mstp_port->ReceivedValidFrame = true;
test_station = mstp_port->Zero_Config_Station + 1;
@@ -940,7 +953,8 @@ static void testZeroConfigNode_Test_LURK_ConfirmationAddressInUse(
zassert_false(transition_now, NULL);
zassert_true(mstp_port->ReceivedValidFrame == false, NULL);
zassert_equal(test_station, mstp_port->Zero_Config_Station, NULL);
zassert_equal(mstp_port->Zero_Config_State, MSTP_ZERO_CONFIG_STATE_LURK, NULL);
zassert_equal(
mstp_port->Zero_Config_State, MSTP_ZERO_CONFIG_STATE_LURK, NULL);
}
static void testZeroConfigNode_Test_LURK_ConfirmationUnuccessful_UUID_Size(
@@ -956,12 +970,13 @@ static void testZeroConfigNode_Test_LURK_ConfirmationUnuccessful_UUID_Size(
mstp_port->FrameType = FRAME_TYPE_TEST_RESPONSE;
memcpy(mstp_port->InputBuffer, mstp_port->UUID, MSTP_UUID_SIZE);
/* set to an invalid size */
mstp_port->DataLength = MSTP_UUID_SIZE-1;
mstp_port->DataLength = MSTP_UUID_SIZE - 1;
mstp_port->ReceivedValidFrame = true;
transition_now = MSTP_Master_Node_FSM(mstp_port);
zassert_false(transition_now, NULL);
zassert_true(mstp_port->ReceivedValidFrame == false, NULL);
zassert_equal(mstp_port->Zero_Config_State, MSTP_ZERO_CONFIG_STATE_IDLE, NULL);
zassert_equal(
mstp_port->Zero_Config_State, MSTP_ZERO_CONFIG_STATE_IDLE, NULL);
}
static void testZeroConfigNode_Test_LURK_ConfirmationUnuccessful_UUID(
@@ -983,7 +998,8 @@ static void testZeroConfigNode_Test_LURK_ConfirmationUnuccessful_UUID(
transition_now = MSTP_Master_Node_FSM(mstp_port);
zassert_false(transition_now, NULL);
zassert_true(mstp_port->ReceivedValidFrame == false, NULL);
zassert_equal(mstp_port->Zero_Config_State, MSTP_ZERO_CONFIG_STATE_IDLE, NULL);
zassert_equal(
mstp_port->Zero_Config_State, MSTP_ZERO_CONFIG_STATE_IDLE, NULL);
}
static void testZeroConfigNode_Test_LURK_ClaimAddressInUse(
@@ -1001,7 +1017,8 @@ static void testZeroConfigNode_Test_LURK_ClaimAddressInUse(
transition_now = MSTP_Master_Node_FSM(mstp_port);
zassert_false(transition_now, NULL);
zassert_true(mstp_port->ReceivedValidFrame == false, NULL);
zassert_equal(mstp_port->Zero_Config_State, MSTP_ZERO_CONFIG_STATE_LURK, NULL);
zassert_equal(
mstp_port->Zero_Config_State, MSTP_ZERO_CONFIG_STATE_LURK, NULL);
zassert_equal(mstp_port->Zero_Config_Station, station + 1, NULL);
}
@@ -1016,7 +1033,8 @@ static void testZeroConfigNode_Test_LURK_ClaimInvalidFrame(
transition_now = MSTP_Master_Node_FSM(mstp_port);
zassert_false(transition_now, NULL);
zassert_true(mstp_port->ReceivedInvalidFrame == false, NULL);
zassert_equal(mstp_port->Zero_Config_State, MSTP_ZERO_CONFIG_STATE_CLAIM, NULL);
zassert_equal(
mstp_port->Zero_Config_State, MSTP_ZERO_CONFIG_STATE_CLAIM, NULL);
}
static void testZeroConfigNode_Test_LURK_ClaimLostToken(
@@ -1030,10 +1048,10 @@ static void testZeroConfigNode_Test_LURK_ClaimLostToken(
SilenceTime = mstp_port->Zero_Config_Silence + 1;
transition_now = MSTP_Master_Node_FSM(mstp_port);
zassert_false(transition_now, NULL);
zassert_equal(mstp_port->Zero_Config_State, MSTP_ZERO_CONFIG_STATE_IDLE, NULL);
zassert_equal(
mstp_port->Zero_Config_State, MSTP_ZERO_CONFIG_STATE_IDLE, NULL);
}
static void testZeroConfigNodeFSM(void)
{
struct mstp_port_struct_t MSTP_Port = { 0 }; /* port data */
@@ -1107,7 +1125,8 @@ static void testZeroConfigNodeFSM(void)
void test_main(void)
{
ztest_test_suite(crc_tests, ztest_unit_test(testReceiveNodeFSM),
ztest_test_suite(
crc_tests, ztest_unit_test(testReceiveNodeFSM),
ztest_unit_test(testMasterNodeFSM), ztest_unit_test(testSlaveNodeFSM),
ztest_unit_test(testZeroConfigNodeFSM));