Fix beam flag parsing using bitwise AND instead of OR

Co-authored-by: silabs-JulienT <[email protected]>

Author: Copilot

applications/zpc/components/zwave_api/src/zwapi_protocol_rx_dispatch.c

@@ -425,8 +425,8 @@ void zwave_api_protocol_rx_dispatch(uint8_t *pData, uint16_t len)
         txStatusReport.last_route_repeaters[3] = *p++;
 
         // Byte 16, beam and last route speed
-        txStatusReport.beam_1000ms      = (*p) | (1 << 6);
-        txStatusReport.beam_250ms       = (*p) | (1 << 5);
+        txStatusReport.beam_1000ms      = (*p) & (1 << 6);
+        txStatusReport.beam_250ms       = (*p) & (1 << 5);
         txStatusReport.last_route_speed = (*p++) & 0x7;
 
         txStatusReport.routing_attempts      = *p++;

applications/zpc/components/zwave_api/test/zwapi_protocol_rx_dispatch_test.c

@@ -522,3 +522,63 @@ void test_zwapi_protocol_rx_dispatch_protocol_cc_encryption_request()
   TEST_ASSERT_EQUAL(1,
                     zwapi_protocol_cc_encryption_request_test_function_call_count);
 }
+
+void test_zwapi_protocol_rx_dispatch_beam_flags_both_false()
+{
+  // Test with beam flags both false (bit 5 and 6 clear: 0x00)
+  zwave_api_get_callbacks_IgnoreAndReturn(&test_zwapi_callbacks);
+  zwapi_send_data_callback = &zwapi_send_data_test_callback;
+  uint8_t frame[] = {0x1D, 0x00, 0x13, 0x00, 0x00, 0x12, 0x23, 0x05, 0xCF, 0x7D,
+                     0x7F, 0x6F, 0x7F, 0x01, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00,
+                     0x00, 0x01, 0x00, 0x00};  // Byte 20 = 0x00 (no beam flags set)
+  zwave_api_protocol_rx_dispatch(frame, sizeof(frame));
+
+  TEST_ASSERT_EQUAL(1, zwapi_send_data_test_callback_call_count);
+  TEST_ASSERT_EQUAL(false, received_tx_report.beam_1000ms);
+  TEST_ASSERT_EQUAL(false, received_tx_report.beam_250ms);
+}
+
+void test_zwapi_protocol_rx_dispatch_beam_flags_250ms_only()
+{
+  // Test with only beam_250ms flag set (bit 5 set: 0x20)
+  zwave_api_get_callbacks_IgnoreAndReturn(&test_zwapi_callbacks);
+  zwapi_send_data_callback = &zwapi_send_data_test_callback;
+  uint8_t frame[] = {0x1D, 0x00, 0x13, 0x00, 0x00, 0x12, 0x23, 0x05, 0xCF, 0x7D,
+                     0x7F, 0x6F, 0x7F, 0x01, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00,
+                     0x20, 0x01, 0x00, 0x00};  // Byte 20 = 0x20 (bit 5 set)
+  zwave_api_protocol_rx_dispatch(frame, sizeof(frame));
+
+  TEST_ASSERT_EQUAL(1, zwapi_send_data_test_callback_call_count);
+  TEST_ASSERT_EQUAL(false, received_tx_report.beam_1000ms);
+  TEST_ASSERT_EQUAL(true, received_tx_report.beam_250ms);
+}
+
+void test_zwapi_protocol_rx_dispatch_beam_flags_1000ms_only()
+{
+  // Test with only beam_1000ms flag set (bit 6 set: 0x40)
+  zwave_api_get_callbacks_IgnoreAndReturn(&test_zwapi_callbacks);
+  zwapi_send_data_callback = &zwapi_send_data_test_callback;
+  uint8_t frame[] = {0x1D, 0x00, 0x13, 0x00, 0x00, 0x12, 0x23, 0x05, 0xCF, 0x7D,
+                     0x7F, 0x6F, 0x7F, 0x01, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00,
+                     0x40, 0x01, 0x00, 0x00};  // Byte 20 = 0x40 (bit 6 set)
+  zwave_api_protocol_rx_dispatch(frame, sizeof(frame));
+
+  TEST_ASSERT_EQUAL(1, zwapi_send_data_test_callback_call_count);
+  TEST_ASSERT_EQUAL(true, received_tx_report.beam_1000ms);
+  TEST_ASSERT_EQUAL(false, received_tx_report.beam_250ms);
+}
+
+void test_zwapi_protocol_rx_dispatch_beam_flags_both_true()
+{
+  // Test with both beam flags set (bits 5 and 6 set: 0x60)
+  zwave_api_get_callbacks_IgnoreAndReturn(&test_zwapi_callbacks);
+  zwapi_send_data_callback = &zwapi_send_data_test_callback;
+  uint8_t frame[] = {0x1D, 0x00, 0x13, 0x00, 0x00, 0x12, 0x23, 0x05, 0xCF, 0x7D,
+                     0x7F, 0x6F, 0x7F, 0x01, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00,
+                     0x60, 0x01, 0x00, 0x00};  // Byte 20 = 0x60 (bits 5 and 6 set)
+  zwave_api_protocol_rx_dispatch(frame, sizeof(frame));
+
+  TEST_ASSERT_EQUAL(1, zwapi_send_data_test_callback_call_count);
+  TEST_ASSERT_EQUAL(true, received_tx_report.beam_1000ms);
+  TEST_ASSERT_EQUAL(true, received_tx_report.beam_250ms);
+}