merge update from develop

CMakeLists.txt

@@ -55,18 +55,11 @@ if(ENABLE_UNIT_TESTING)
 # Run generate_lib_iec60730
 include(generate_lib_iec60730)
 
-<<<<<<< HEAD
-generate_lib_iec60730(gecko_sdk)
-=======
 generate_lib_iec60730(${SDK_CMAKE_RELATIVE_DIR})
 get_target_property(MAIN_CFLAGS_LIB_IEC60730 slc_lib_iec60730 COMPILE_OPTIONS)
 string(REPLACE "$<$<COMPILE_LANGUAGE:C>:SHELL:-imacros sl_gcc_preinclude.h>;" "" MAIN_CFLAGS_LIB_IEC60730 "${MAIN_CFLAGS_LIB_IEC60730}")
 string(REPLACE "$<$<COMPILE_LANGUAGE:CXX>:SHELL:-imacros sl_gcc_preinclude.h>;" "" MAIN_CFLAGS_LIB_IEC60730 "${MAIN_CFLAGS_LIB_IEC60730}")
 string(REPLACE "$<$<COMPILE_LANGUAGE:ASM>:SHELL:-imacros sl_gcc_preinclude.h>;" "" MAIN_CFLAGS_LIB_IEC60730 "${MAIN_CFLAGS_LIB_IEC60730}")
 target_compile_options(unity PUBLIC
                       ${MAIN_CFLAGS_LIB_IEC60730})
->>>>>>> bc931c0277996d2249b12498620c427bb84a0dae
-
-endif()
-
-
+endif()

cmake/generate_iostream_usart.cmake

@@ -0,0 +1,18 @@
+function(generate_iostream_usart relative_dir)
+
+    set(FULL_DIR ${CMAKE_SOURCE_DIR}/${relative_dir})
+
+    execute_process(COMMAND make prepare
+    WORKING_DIRECTORY ${FULL_DIR})
+
+    execute_process(COMMAND slc generate -p
+        ${FULL_DIR}  -np -d ${FULL_DIR}/src -cpsdk -name=iostream_usart -o cmake --with ${BOARD_NAME}
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+
+    if (EXISTS ${FULL_DIR}/CMakeLists.txt)
+        message("-- Path have CMake File: ${FULL_DIR}/CMakeLists.txt")
+        add_subdirectory(${FULL_DIR})
+    else()
+        message("-- Path don't have CMake File: ${FULL_DIR}")
+    endif()
+endfunction(generate_iostream_usart)

docs/html/EFR32_ICE60730_Libraries/globals.html

@@ -379,7 +379,6 @@ <h3><a id="index_i"></a>- i -</h3><ul>
 <li>iec60730_WatchdogValid
 : <a class="el" href="group__IEC60730__WDOG__Test.html#ggaece8bdb434f4c8bafba3590467815044a7f643e2fc022bee4149c82ec9c42f3ef">sl_iec60730_watchdog.h</a>
 </li>
-<<<<<<< HEAD:docs/html/EFR32_ICE60730_Libraries/globals.html
 <li>SL_IEC60730_IMC_CRC_BUFFER_SAMPLE_TEST
 : <a class="el" href="group__IEC60730__INVARIABLE__MEMORY__Test.html#ga558de50fe1c89a1afb8292d2ee4346da">sl_iec60730.h</a>
 </li>
@@ -391,19 +390,6 @@ <h3><a id="index_i"></a>- i -</h3><ul>
 </li>
 <li>SL_IEC60730_IMC_DATA_READ_BYTE_REVERSED
 : <a class="el" href="group__IEC60730__INVARIABLE__MEMORY__Test.html#gga06fc87d81c62e9abb8790b6e5713c55ba641228c714e8ef6fb667f3ee76761f22">sl_iec60730.h</a>
-=======
-<li>IMC_CRCBUFFER_SAMPLETEST
-: <a class="el" href="group__IEC60730__INVARIABLE__MEMORY__Test.html#ga558de50fe1c89a1afb8292d2ee4346da">iec60730.h</a>
-</li>
-<li>IMC_DATA_READ
-: <a class="el" href="group__IEC60730__INVARIABLE__MEMORY__Test.html#gga06fc87d81c62e9abb8790b6e5713c55ba81e9d30c093158a799c13cf1d42df28a">iec60730.h</a>
-</li>
-<li>IMC_DATA_READ_BIT_REVERSED
-: <a class="el" href="group__IEC60730__INVARIABLE__MEMORY__Test.html#gga06fc87d81c62e9abb8790b6e5713c55ba14b98b0e584e8059ab9e3990ffe8e149">iec60730.h</a>
-</li>
-<li>IMC_DATA_READ_BYTE_REVERSED
-: <a class="el" href="group__IEC60730__INVARIABLE__MEMORY__Test.html#gga06fc87d81c62e9abb8790b6e5713c55ba641228c714e8ef6fb667f3ee76761f22">iec60730.h</a>
->>>>>>> develop:Doc/html/EFR32_ICE60730_Libraries/globals.html
 </li>
 <li>INV_CLASSB_PVAR
 : <a class="el" href="group__IEC60730__POST.html#ga5e516d9dd091357c8ecb7ba3c10c7f9b">sl_iec60730.h</a>

docs/html/EFR32_ICE60730_Libraries/globals_defs.html

@@ -175,13 +175,8 @@ <h3><a id="index_i"></a>- i -</h3><ul>
 <li>IEC60730_VMC_COMPLETE
 : <a class="el" href="group__IEC60730__PROGRAMME__COUNTER.html#gac9c345ed684a034b5a5cb53efa21cc63">sl_iec60730.h</a>
 </li>
-<<<<<<< HEAD:docs/html/EFR32_ICE60730_Libraries/globals_defs.html
 <li>SL_IEC60730_IMC_CRC_BUFFER_SAMPLE_TEST
 : <a class="el" href="group__IEC60730__INVARIABLE__MEMORY__Test.html#ga558de50fe1c89a1afb8292d2ee4346da">sl_iec60730.h</a>
-=======
-<li>IMC_CRCBUFFER_SAMPLETEST
-: <a class="el" href="group__IEC60730__INVARIABLE__MEMORY__Test.html#ga558de50fe1c89a1afb8292d2ee4346da">iec60730.h</a>
->>>>>>> develop:Doc/html/EFR32_ICE60730_Libraries/globals_defs.html
 </li>
 <li>INV_CLASSB_PVAR
 : <a class="el" href="group__IEC60730__POST.html#ga5e516d9dd091357c8ecb7ba3c10c7f9b">sl_iec60730.h</a>

docs/html/EFR32_ICE60730_Libraries/globals_eval.html

@@ -169,7 +169,6 @@ <h3><a id="index_i"></a>- i -</h3><ul>
 <li>iec60730_WatchdogValid
 : <a class="el" href="group__IEC60730__WDOG__Test.html#ggaece8bdb434f4c8bafba3590467815044a7f643e2fc022bee4149c82ec9c42f3ef">sl_iec60730_watchdog.h</a>
 </li>
-<<<<<<< HEAD:docs/html/EFR32_ICE60730_Libraries/globals_eval.html
 <li>SL_IEC60730_IMC_DATA_READ
 : <a class="el" href="group__IEC60730__INVARIABLE__MEMORY__Test.html#gga06fc87d81c62e9abb8790b6e5713c55ba81e9d30c093158a799c13cf1d42df28a">sl_iec60730.h</a>
 </li>
@@ -178,16 +177,6 @@ <h3><a id="index_i"></a>- i -</h3><ul>
 </li>
 <li>SL_IEC60730_IMC_DATA_READ_BYTE_REVERSED
 : <a class="el" href="group__IEC60730__INVARIABLE__MEMORY__Test.html#gga06fc87d81c62e9abb8790b6e5713c55ba641228c714e8ef6fb667f3ee76761f22">sl_iec60730.h</a>
-=======
-<li>IMC_DATA_READ
-: <a class="el" href="group__IEC60730__INVARIABLE__MEMORY__Test.html#gga06fc87d81c62e9abb8790b6e5713c55ba81e9d30c093158a799c13cf1d42df28a">iec60730.h</a>
-</li>
-<li>IMC_DATA_READ_BIT_REVERSED
-: <a class="el" href="group__IEC60730__INVARIABLE__MEMORY__Test.html#gga06fc87d81c62e9abb8790b6e5713c55ba14b98b0e584e8059ab9e3990ffe8e149">iec60730.h</a>
-</li>
-<li>IMC_DATA_READ_BYTE_REVERSED
-: <a class="el" href="group__IEC60730__INVARIABLE__MEMORY__Test.html#gga06fc87d81c62e9abb8790b6e5713c55ba641228c714e8ef6fb667f3ee76761f22">iec60730.h</a>
->>>>>>> develop:Doc/html/EFR32_ICE60730_Libraries/globals_eval.html
 </li>
 </ul>
 </div><!-- contents -->

gecko_sdk/lib_iec60730.slcp

@@ -1,9 +1,9 @@
 project_name: lib_iec60730
 package: iec60730
 quality: test
-label: Souce code lib IEC60730 for unit test
+label: Source code lib IEC60730 for unit test
 description: >
-  Souce code lib IEC60730 for unit test.
+  Source code lib IEC60730 for unit test.
 category: Example|iec60730
 
 sdk: {id: gecko_sdk, version: 4.4.2}
@@ -29,29 +29,21 @@ component:
     from: iec60730
 configuration:
   - name: SL_BOARD_ENABLE_VCOM
-<<<<<<< HEAD
-    value: 1
-=======
     value: 0
->>>>>>> bc931c0277996d2249b12498620c427bb84a0dae
   - name: SL_IOSTREAM_USART_VCOM_CONVERT_BY_DEFAULT_LF_TO_CRLF
     value: 1
   - name: SL_IOSTREAM_USART_VCOM_RX_BUFFER_SIZE
     value: 80
   - name: SL_DEVICE_INIT_HFRCO_BAND
     value: cmuHFRCOFreq_19M0Hz
     condition:
-<<<<<<< HEAD
-     - device_series_1
-=======
       - device_series_1
   - name: SL_IEC60730_IRQ_STATUS_ENABLE
     value: 1
   - name: SL_IEC60730_WDOG1_ENABLE
     value: 1
   - name: SL_IEC60730_CRC_DEBUG_ENABLE
     value: 0
->>>>>>> bc931c0277996d2249b12498620c427bb84a0dae
 toolchain_settings:
   - option: linkerfile
     value: autogen/linkerfile_iec60730.ld
@@ -64,4 +56,4 @@ toolchain_settings:
   - option: iar_linker_option
     value: "--keep __checksum --place_holder __checksum,2,.checksum,64"
     condition:
-      - toolchain_iar
+      - toolchain_iar

test/test_script/iec60730_get_report_unit_test.py

@@ -66,7 +66,7 @@ def get_report_unit_test(result,file_test_case,log_report):
   list_test_case = get_test_case(file_test_case,logger,unity_begin_row,unity_end_row)
 
   if len(list_test_case) != len(result):
-    raise ValueError("The list of test cases " + str(len(list_test_case)) + " in the file" 
+    raise ValueError("The list of test cases " + str(len(list_test_case)) + " in the file"
                     + file_test + " is not equal " + str(len(result)) + " test cases"
                     " results received from device")
 
@@ -84,4 +84,3 @@ def get_report_unit_test(result,file_test_case,log_report):
     logger.info("FAIL")
   else:
     logger.info("PASS")
-