v1.5 release.

sigfox-tech-radio · Mar 22, 2024 · 265950e · 265950e
1 parent 20889c2
commit 265950e
Show file tree

Hide file tree

Showing 8 changed files with 122 additions and 87 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.5](https://github.com/sigfox-tech-radio/sigfox-ep-addon-rfp/releases/tag/v1.5) - 22 Mar 2024
+
+### Changed
+
+* Fix interame issue `tests_mode_c`
+* Rename `RCx` compilation flags into `RCx_ZONE` for **Microchip MCUs compatibility**.
+
+### Fixed
+
+* Add PUBLIC_KEY_CAPABLE flag on test mode K enum
+
 ## [v1.4](https://github.com/sigfox-tech-radio/sigfox-ep-addon-rfp/releases/tag/v1.4) - 09 Nov 2023
 
 ### Removed

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.15)
 project(sigfox_ep_addon_rfp)
 
-#Check if Project configure by himself or by a parent project (like sfx_lib_core_protocol)
+#Check if Project configure by himself or by a parent project (like sigfox-ep-lib)
 if ( ${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR} )
     if (NOT DEFINED  SIGFOX_EP_LIB_DIR)
-        message(FATAL_ERROR "${PROJECT_NAME} cannot be configured without -DSIGFOX_EP_LIB_DIR=<sfx_lib_core_protocol directory>")
+        message(FATAL_ERROR "${PROJECT_NAME} cannot be configured without -DSIGFOX_EP_LIB_DIR=<sigfox-ep-lib directory>")
     endif()
     set(ADDON_RFP OFF)
     add_subdirectory(${SIGFOX_EP_LIB_DIR} "${CMAKE_CURRENT_BINARY_DIR}/${SIGFOX_EP_LIB_DIR}") 
@@ -35,7 +35,8 @@ set(ADDON_RFP_HEADERS
 
 set(ADDON_RFP_PUBLIC_HEADERS
     inc/sigfox_ep_addon_rfp_api.h
-    inc/sigfox_ep_addon_rfp_version.h    
+    inc/sigfox_ep_addon_rfp_version.h
+    inc/test_modes_rfp/sigfox_rfp_test_mode_types.h
 )
 
 #When sigfox_ep_flag.h is don't used
@@ -44,7 +45,7 @@ else()
     if(${CERTIFICATION} STREQUAL "OFF")
         message(FATAL_ERROR "CERTIFICATION Flag must be activated for this addon")
     endif()
-    if((${RC3C} STREQUAL OFF) AND (${RC5} STREQUAL OFF))
+    if((${RC3C_ZONE} STREQUAL OFF) AND (${RC5_ZONE} STREQUAL OFF))
         list(REMOVE_ITEM ADDON_RFP_SOURCES "src/test_modes_rfp/sigfox_rfp_test_mode_g.c")
     endif()
     if((${PUBLIC_KEY_CAPABLE} STREQUAL OFF) )

diff --git a/README.md b/README.md
@@ -8,9 +8,10 @@ The table below shows the versions compatibility between this addon and the Sigf
 
 | **EP_ADDON_RFP** | **EP_LIB** |
 |:---:|:---:|
-| [v1.4](https://github.com/sigfox-tech-radio/sigfox-ep-addon-rfp/releases/tag/v1.4) | >= [v3.2](https://github.com/sigfox-tech-radio/sigfox-ep-lib/releases/tag/v3.2) |
-| [v1.3](https://github.com/sigfox-tech-radio/sigfox-ep-addon-rfp/releases/tag/v1.3) | >= [v3.2](https://github.com/sigfox-tech-radio/sigfox-ep-lib/releases/tag/v3.2) |
-| [v1.2](https://github.com/sigfox-tech-radio/sigfox-ep-addon-rfp/releases/tag/v1.2) | >= [v3.2](https://github.com/sigfox-tech-radio/sigfox-ep-lib/releases/tag/v3.2) |
+| [v1.5](https://github.com/sigfox-tech-radio/sigfox-ep-addon-rfp/releases/tag/v1.5) | >= [v3.5](https://github.com/sigfox-tech-radio/sigfox-ep-lib/releases/tag/v3.5) |
+| [v1.4](https://github.com/sigfox-tech-radio/sigfox-ep-addon-rfp/releases/tag/v1.4) | [v3.2](https://github.com/sigfox-tech-radio/sigfox-ep-lib/releases/tag/v3.2) to [v3.4](https://github.com/sigfox-tech-radio/sigfox-ep-lib/releases/tag/v3.4) |
+| [v1.3](https://github.com/sigfox-tech-radio/sigfox-ep-addon-rfp/releases/tag/v1.3) | [v3.2](https://github.com/sigfox-tech-radio/sigfox-ep-lib/releases/tag/v3.2) to [v3.4](https://github.com/sigfox-tech-radio/sigfox-ep-lib/releases/tag/v3.4) |
+| [v1.2](https://github.com/sigfox-tech-radio/sigfox-ep-addon-rfp/releases/tag/v1.2) | [v3.2](https://github.com/sigfox-tech-radio/sigfox-ep-lib/releases/tag/v3.2) to [v3.4](https://github.com/sigfox-tech-radio/sigfox-ep-lib/releases/tag/v3.4) | |
 | [v1.1](https://github.com/sigfox-tech-radio/sigfox-ep-addon-rfp/releases/tag/v1.1) | [v3.1](https://github.com/sigfox-tech-radio/sigfox-ep-lib/releases/tag/v3.1) |
 | [v1.0](https://github.com/sigfox-tech-radio/sigfox-ep-addon-rfp/releases/tag/v1.0) | [v3.0](https://github.com/sigfox-tech-radio/sigfox-ep-lib/releases/tag/v3.0) |
 
@@ -106,14 +107,14 @@ make precompil_sigfox_ep_addon_rfp
 ```bash
 cmake -DSIGFOX_EP_LIB_DIR=<sigfox-ep-lib path> \
       -DUSE_SIGFOX_EP_FLAGS_H=OFF \
-      -DRC1=ON \
-      -DRC2=ON \
-      -DRC3C=ON \
-      -DRC3D=ON \
-      -DRC4=ON \
-      -DRC5=ON \
-      -DRC6=ON \
-      -DRC7=ON \
+      -DRC1_ZONE=ON \
+      -DRC2_ZONE=ON \
+      -DRC3C_ZONE=ON \
+      -DRC3D_ZONE=ON \
+      -DRC4_ZONE=ON \
+      -DRC5_ZONE=ON \
+      -DRC6_ZONE=ON \
+      -DRC7_ZONE=ON \
       -DAPPLICATION_MESSAGES=ON \
       -DCONTROL_KEEP_ALIVE_MESSAGE=ON \
       -DBIDIRECTIONAL=ON \
@@ -169,14 +170,14 @@ make sigfox_ep_addon_rfp
 ```bash
 cmake -DSIGFOX_EP_LIB_DIR=<sigfox-ep-lib path> \
       -DUSE_SIGFOX_EP_FLAGS_H=OFF \
-      -DRC1=ON \
-      -DRC2=ON \
-      -DRC3C=ON \
-      -DRC3D=ON \
-      -DRC4=ON \
-      -DRC5=ON \
-      -DRC6=ON \
-      -DRC7=ON \
+      -DRC1_ZONE=ON \
+      -DRC2_ZONE=ON \
+      -DRC3C_ZONE=ON \
+      -DRC3D_ZONE=ON \
+      -DRC4_ZONE=ON \
+      -DRC5_ZONE=ON \
+      -DRC6_ZONE=ON \
+      -DRC7_ZONE=ON \
       -DAPPLICATION_MESSAGES=ON \
       -DCONTROL_KEEP_ALIVE_MESSAGE=ON \
       -DBIDIRECTIONAL=ON \

diff --git a/inc/sigfox_ep_addon_rfp_api.h b/inc/sigfox_ep_addon_rfp_api.h
@@ -96,19 +96,21 @@ typedef struct {
 typedef enum
 {
     SIGFOX_EP_ADDON_RFP_API_TEST_MODE_C = 0,    /*!< Only BPSK with Synchro Bit + Synchro frame + PN sequence : no hopping centered on the TX_frequency */
-    SIGFOX_EP_ADDON_RFP_API_TEST_MODE_J = 1,    /*!< with full protocol with AES key defined at SIGFOX_API_open call: send all SIGFOX protocol frames available with hopping     */
+    SIGFOX_EP_ADDON_RFP_API_TEST_MODE_J = 1,    /*!< with full protocol with AES key: send all SIGFOX protocol frames available with hopping */
 #if defined BIDIRECTIONAL
-    SIGFOX_EP_ADDON_RFP_API_TEST_MODE_F = 2,    /*!< with full protocol with AES key defined at SIGFOX_API_open call: send SIGFOX protocol frames w/ initiate_downlink_flag     = SFX_TRUE */
-    SIGFOX_EP_ADDON_RFP_API_TEST_MODE_D = 3,    /*!< with known pattern with SB + SF + Pattern on RX_Frequency defined at SIGFOX_API_open function : od internaly compare re    ceived frame <=> known pattern and call sfx_test_report() */
-    SIGFOX_EP_ADDON_RFP_API_TEST_MODE_E = 4,    /*!< Do uplink +  downlink frame with AES key defined at SIGFOX_API_open call but specific shorter timings */
+    SIGFOX_EP_ADDON_RFP_API_TEST_MODE_F = 2,    /*!< with full protocol with AES key: send SIGFOX protocol frames with bidirectional flag set */
+    SIGFOX_EP_ADDON_RFP_API_TEST_MODE_D = 3,    /*!< with known pattern with SB + SF + Pattern on RX_Frequency */
+    SIGFOX_EP_ADDON_RFP_API_TEST_MODE_E = 4,    /*!< Do uplink +  downlink frame with AES key but specific shorter timings */
 #endif
     SIGFOX_EP_ADDON_RFP_API_TEST_MODE_A = 5,    /*!< Do 9 uplink frames to measure frequency synthesis step */
     SIGFOX_EP_ADDON_RFP_API_TEST_MODE_B = 6,    /*!< Call all Sigfox frames of all types and size on all the Sigfox Band  */
-#if (defined RC3C) || (defined RC5)
+#ifdef SPECTRUM_ACCESS_LBT
     SIGFOX_EP_ADDON_RFP_API_TEST_MODE_G = 11,  /*!< Call twice the Sigfox frames (payload 1 bit only) */
 #endif
+#ifdef PUBLIC_KEY_CAPABLE
     SIGFOX_EP_ADDON_RFP_API_TEST_MODE_K = 12,  /*!< Execute the public key test - all the frames of the protocol needs to be sent */
-    SIGFOX_EP_ADDON_RFP_API_TEST_MODE_L = 13,  /*!< Execute the nvm test */
+#endif
+    SIGFOX_EP_ADDON_RFP_API_TEST_MODE_L = 13,  /*!< Execute the NVM test */
 }SIGFOX_EP_ADDON_RFP_API_test_mode_reference_t;
 
 
@@ -136,7 +138,7 @@ typedef struct {
 typedef struct {
     struct {
         sfx_u8 error : 1;
-    }status;
+    } status;
     sfx_u8 progress : 7;
 } SIGFOX_EP_ADDON_RFP_API_progress_status_t;
 
@@ -185,7 +187,7 @@ SIGFOX_EP_ADDON_RFP_API_status_t SIGFOX_EP_ADDON_RFP_API_test_mode(SIGFOX_EP_ADD
  * \brief Get the current message status.
  * \param[in]   none
  * \param[out]  none
- * \retval      Curren progress status.
+ * \retval      Current progress status.
  *******************************************************************/
 SIGFOX_EP_ADDON_RFP_API_progress_status_t SIGFOX_EP_ADDON_RFP_API_get_test_mode_progress_status(void);
 

diff --git a/inc/sigfox_ep_addon_rfp_version.h b/inc/sigfox_ep_addon_rfp_version.h
@@ -42,6 +42,6 @@
 
 /*** Main version ***/
 
-#define SIGFOX_EP_ADDON_RFP_VERSION				"1.4"
+#define SIGFOX_EP_ADDON_RFP_VERSION				"1.5"
 
 #endif /* __SIGFOX_EP_ADDON_RFP_VERSION_H__ */
diff --git a/inc/test_modes_rfp/sigfox_rfp_test_mode_types.h b/inc/test_modes_rfp/sigfox_rfp_test_mode_types.h
@@ -71,7 +71,7 @@ extern const SIGFOX_RFP_test_mode_fn_t SIGFOX_RFP_TEST_MODE_E_fn;
 extern const SIGFOX_RFP_test_mode_fn_t SIGFOX_RFP_TEST_MODE_F_fn;
 extern const SIGFOX_RFP_test_mode_fn_t SIGFOX_RFP_TEST_MODE_D_fn;
 #endif
-#if (defined RC3C) || (defined RC5)
+#ifdef SPECTRUM_ACCESS_LBT
 extern const SIGFOX_RFP_test_mode_fn_t SIGFOX_RFP_TEST_MODE_G_fn;
 #endif
 extern const SIGFOX_RFP_test_mode_fn_t SIGFOX_RFP_TEST_MODE_J_fn;

diff --git a/src/sigfox_ep_addon_rfp_api.c b/src/sigfox_ep_addon_rfp_api.c
@@ -316,7 +316,7 @@ SIGFOX_EP_ADDON_RFP_API_status_t SIGFOX_EP_ADDON_RFP_API_test_mode(SIGFOX_EP_ADD
             sigfox_ep_addon_rfp_api_ctx.test_mode_fn = &SIGFOX_RFP_TEST_MODE_F_fn;
             break;
 #endif
-#if (defined RC3C) || (defined RC5)
+#ifdef SPECTRUM_ACCESS_LBT
         case SIGFOX_EP_ADDON_RFP_API_TEST_MODE_G:
             sigfox_ep_addon_rfp_api_ctx.test_mode_fn = &SIGFOX_RFP_TEST_MODE_G_fn;
             break;
@@ -426,7 +426,7 @@ SIGFOX_EP_ADDON_RFP_API_status_t SIGFOX_EP_ADDON_RFP_API_get_version(sfx_u8 **ve
 #endif
 #ifdef PARAMETERS_CHECK
     if ((version == SFX_NULL) || (version_size_char == SFX_NULL)) {
-        EXIT_ERROR(SIGFOX_EP_API_ERROR_NULL_PARAMETER);
+        EXIT_ERROR(SIGFOX_EP_ADDON_RFP_API_ERROR_NULL_PARAMETER);
     }
 #endif
     // Check library is opened.

diff --git a/src/test_modes_rfp/sigfox_rfp_test_mode_c.c b/src/test_modes_rfp/sigfox_rfp_test_mode_c.c
@@ -59,7 +59,11 @@
 #include "sigfox_ep_api_test.h"
 #ifdef CERTIFICATION
 
+#ifdef SINGLE_FRAME
+#define LOOP 1
+#else
 #define LOOP 3
+#endif
 #define WINDOW_TIME_MS 1000
 
 
@@ -145,9 +149,9 @@ static SIGFOX_EP_ADDON_RFP_API_status_t _send_application_message(void) {
 #ifdef ERROR_CODES
     SIGFOX_EP_ADDON_RFP_API_status_t status = SIGFOX_EP_ADDON_RFP_API_SUCCESS;
     SIGFOX_EP_API_status_t sigfox_ep_api_status = SIGFOX_EP_API_SUCCESS;
-    MCU_API_status_t mcu_api_status = MCU_API_SUCCESS;
+//    MCU_API_status_t mcu_api_status = MCU_API_SUCCESS;
 #endif
-    MCU_API_timer_t timer;
+//    MCU_API_timer_t timer;
     SIGFOX_EP_API_TEST_parameters_t test_param = {0};
 #ifdef APPLICATION_MESSAGES
     SIGFOX_EP_API_application_message_t application_message = {0};
@@ -221,24 +225,15 @@ static SIGFOX_EP_ADDON_RFP_API_status_t _send_application_message(void) {
 #ifdef ASYNCHRONOUS
     application_message.uplink_cplt_cb = SFX_NULL;
     application_message.message_cplt_cb = &_SIGFOX_EP_API_message_cplt_cb;
-    timer.cplt_cb = &_MCU_API_timer_cplt_cb;
 #endif
-    //Configure timer structure
-    timer.duration_ms = WINDOW_TIME_MS;
-    timer.instance = MCU_API_TIMER_INSTANCE_ADDON_RFP;
-    timer.reason =  MCU_API_TIMER_REASON_ADDON_RFP;
-    //Start timer and send Application message
 #ifdef ERROR_CODES
-    mcu_api_status = MCU_API_timer_start(&timer);
-    MCU_API_check_status(SIGFOX_EP_ADDON_RFP_API_ERROR_MCU_API);
 #ifdef APPLICATION_MESSAGES
     sigfox_ep_api_status = SIGFOX_EP_API_TEST_send_application_message(&application_message, &test_param);
 #else
     sigfox_ep_api_status = SIGFOX_EP_API_TEST_send_control_message(&application_message, &test_param);
 #endif
     SIGFOX_EP_API_check_status(SIGFOX_EP_ADDON_RFP_API_ERROR_EP_API);
 #else
-    MCU_API_timer_start(&timer);
 #ifdef APPLICATION_MESSAGES
     SIGFOX_EP_API_TEST_send_application_message(&application_message, &test_param);
 #else
@@ -247,14 +242,6 @@ static SIGFOX_EP_ADDON_RFP_API_status_t _send_application_message(void) {
 #endif
 #ifndef ASYNCHRONOUS
     _SIGFOX_EP_API_message_cplt_cb();
-#ifdef ERROR_CODES
-    mcu_api_status = MCU_API_timer_wait_cplt(MCU_API_TIMER_INSTANCE_ADDON_RFP);
-    MCU_API_check_status(SIGFOX_EP_ADDON_RFP_API_ERROR_MCU_API);
-#else
-    MCU_API_timer_wait_cplt(MCU_API_TIMER_INSTANCE_ADDON_RFP);
-#endif
-    _MCU_API_timer_cplt_cb();
-
 #endif
 #ifdef ERROR_CODES
 errors:
@@ -321,6 +308,7 @@ static SIGFOX_EP_ADDON_RFP_API_status_t SIGFOX_RFP_TEST_MODE_C_process_fn(void)
     MCU_API_status_t mcu_api_status = MCU_API_SUCCESS;
 #endif
     SIGFOX_EP_API_message_status_t message_status;
+    MCU_API_timer_t timer;
 #ifdef ASYNCHRONOUS
     sfx_u16 tmp;
 #endif
@@ -335,67 +323,99 @@ static SIGFOX_EP_ADDON_RFP_API_status_t SIGFOX_RFP_TEST_MODE_C_process_fn(void)
     }
 #ifdef ASYNCHRONOUS
      else {
-         if ((sigfox_rfp_test_mode_c_ctx.flags.ep_api_message_cplt == 1) &&
-                 (sigfox_rfp_test_mode_c_ctx.flags.mcu_api_timer_cplt == 1)) {
-             sigfox_rfp_test_mode_c_ctx.flags.ep_api_message_cplt = 0;
+        if ((sigfox_rfp_test_mode_c_ctx.flags.ep_api_message_cplt == 1)) {
+            sigfox_rfp_test_mode_c_ctx.flags.ep_api_message_cplt = 0;
+            message_status = SIGFOX_EP_API_get_message_status();
+            if (message_status.field.execution_error == 1 || message_status.field.network_error == 1) {
+                goto errors;
+            }
+            sigfox_rfp_test_mode_c_ctx.loop_iter++;
+            tmp = 100 * (sigfox_rfp_test_mode_c_ctx.loop_iter);
+            tmp /= LOOP;
+            sigfox_rfp_test_mode_c_ctx.progress_status.progress = (sfx_u8)tmp;
+            if (sigfox_rfp_test_mode_c_ctx.loop_iter < LOOP) {
+                timer.cplt_cb = &_MCU_API_timer_cplt_cb;
+                //Configure timer structure
+                timer.duration_ms = WINDOW_TIME_MS;
+                timer.instance = MCU_API_TIMER_INSTANCE_ADDON_RFP;
+                timer.reason =  MCU_API_TIMER_REASON_ADDON_RFP;
+                //Start timer and send Application message
+#ifdef ERROR_CODES
+                mcu_api_status = MCU_API_timer_start(&timer);
+			    MCU_API_check_status(SIGFOX_EP_ADDON_RFP_API_ERROR_MCU_API);
+#else
+			    MCU_API_timer_start(&timer);
+#endif
+            } else {
+                if (sigfox_rfp_test_mode_c_ctx.test_mode.cplt_cb != SFX_NULL) {
+                    sigfox_rfp_test_mode_c_ctx.progress_status.progress = 100;
+                    sigfox_rfp_test_mode_c_ctx.test_mode.cplt_cb();
+                }
+            }
+    	 }
+		 if (sigfox_rfp_test_mode_c_ctx.flags.mcu_api_timer_cplt == 1) {
              sigfox_rfp_test_mode_c_ctx.flags.mcu_api_timer_cplt = 0;
-             message_status = SIGFOX_EP_API_get_message_status();
-             if (message_status.field.execution_error == 1 || message_status.field.network_error == 1) {
-                 goto errors;
-             }
 #ifdef ERROR_CODES
              mcu_api_status = MCU_API_timer_stop(MCU_API_TIMER_INSTANCE_ADDON_RFP);
              MCU_API_check_status(SIGFOX_EP_ADDON_RFP_API_ERROR_MCU_API);
 #else
              MCU_API_timer_stop(MCU_API_TIMER_INSTANCE_ADDON_RFP);
 #endif
-             sigfox_rfp_test_mode_c_ctx.loop_iter++;
-             tmp = 100 * (sigfox_rfp_test_mode_c_ctx.loop_iter);
-             tmp /= LOOP;
-             sigfox_rfp_test_mode_c_ctx.progress_status.progress = (sfx_u8)tmp;
-             if (sigfox_rfp_test_mode_c_ctx.loop_iter < LOOP) {
+
 #ifdef ERROR_CODES
-                 status = _send_application_message();
-                 if (status != SIGFOX_EP_ADDON_RFP_API_SUCCESS) {
-                     MCU_API_timer_stop(MCU_API_TIMER_INSTANCE_ADDON_RFP);
-                     goto errors;
-                 }
+             status = _send_application_message();
+             if (status != SIGFOX_EP_ADDON_RFP_API_SUCCESS) {
+                 goto errors;
+             }
 #else
-                 _send_application_message();
+             _send_application_message();
 #endif
-             } else {
-                 if (sigfox_rfp_test_mode_c_ctx.test_mode.cplt_cb != SFX_NULL) {
-                     sigfox_rfp_test_mode_c_ctx.progress_status.progress = 100;
-                     sigfox_rfp_test_mode_c_ctx.test_mode.cplt_cb();
-                 }
-             }
+
          }
      }
 #else
     while(sigfox_rfp_test_mode_c_ctx.loop_iter < LOOP) {
-        if ((sigfox_rfp_test_mode_c_ctx.flags.ep_api_message_cplt == 1) &&
-                (sigfox_rfp_test_mode_c_ctx.flags.mcu_api_timer_cplt == 1)) {
+        if ((sigfox_rfp_test_mode_c_ctx.flags.ep_api_message_cplt == 1)) {
             sigfox_rfp_test_mode_c_ctx.flags.ep_api_message_cplt = 0;
-            sigfox_rfp_test_mode_c_ctx.flags.mcu_api_timer_cplt = 0;
             message_status = SIGFOX_EP_API_get_message_status();
             if (message_status.field.execution_error == 1 || message_status.field.network_error == 1) {
                 goto errors;
             }
+            sigfox_rfp_test_mode_c_ctx.loop_iter++;
+            if (sigfox_rfp_test_mode_c_ctx.loop_iter < LOOP) {
+                //Configure timer structure
+                timer.duration_ms = WINDOW_TIME_MS;
+                timer.instance = MCU_API_TIMER_INSTANCE_ADDON_RFP;
+                timer.reason =  MCU_API_TIMER_REASON_ADDON_RFP;
+                //Start timer and send Application message
+#ifdef ERROR_CODES
+                mcu_api_status = MCU_API_timer_start(&timer);
+                MCU_API_check_status(SIGFOX_EP_ADDON_RFP_API_ERROR_MCU_API);
+                mcu_api_status = MCU_API_timer_wait_cplt(MCU_API_TIMER_INSTANCE_ADDON_RFP);
+                MCU_API_check_status(SIGFOX_EP_ADDON_RFP_API_ERROR_MCU_API);
+#else
+                MCU_API_timer_start(&timer);
+                MCU_API_timer_wait_cplt(MCU_API_TIMER_INSTANCE_ADDON_RFP);
+
+#endif
+                _MCU_API_timer_cplt_cb();
+            }
+        }
+        if (sigfox_rfp_test_mode_c_ctx.flags.mcu_api_timer_cplt == 1) {
+            sigfox_rfp_test_mode_c_ctx.flags.mcu_api_timer_cplt = 0;
 #ifdef ERROR_CODES
             mcu_api_status = MCU_API_timer_stop(MCU_API_TIMER_INSTANCE_ADDON_RFP);
             MCU_API_check_status(SIGFOX_EP_ADDON_RFP_API_ERROR_MCU_API);
 #else
             MCU_API_timer_stop(MCU_API_TIMER_INSTANCE_ADDON_RFP);
 #endif
-            sigfox_rfp_test_mode_c_ctx.loop_iter++;
-            if (sigfox_rfp_test_mode_c_ctx.loop_iter < LOOP) {
+
 #ifdef ERROR_CODES
-                status = _send_application_message();
-                CHECK_STATUS(SIGFOX_EP_ADDON_RFP_API_SUCCESS);
+            status = _send_application_message();
+            CHECK_STATUS(SIGFOX_EP_ADDON_RFP_API_SUCCESS);
 #else
-                _send_application_message();
+            _send_application_message();
 #endif
-            }
         }
     }
     sigfox_rfp_test_mode_c_ctx.progress_status.progress = 100;