diff --git a/doc/codingGuidelines/conventions/statements.rst b/doc/codingGuidelines/conventions/statements.rst index 5d9a36b1b5b..6ebe4d66b36 100644 --- a/doc/codingGuidelines/conventions/statements.rst +++ b/doc/codingGuidelines/conventions/statements.rst @@ -184,7 +184,7 @@ memory got corrupted (out of bounds access through operator[]). Comment the usag justification. It might be acceptable during development to use asserts. In this case use ``estd_expect`` instead. -``estd_expect`` behaves the same as ``estd_assert``, but it must be replaced before SOP with +``estd_expect`` behaves the same as ``estd_assert``, but it must be replaced before production with proper error handling. The usage of ``estd_expect`` is detected by our code analyzers and presented in the module overview from Cijack. diff --git a/doc/learning/setup/setup_s32k148_win_nxpide.rst b/doc/learning/setup/setup_s32k148_win_nxpide.rst index 06e503475df..0258ecedf0d 100644 --- a/doc/learning/setup/setup_s32k148_win_nxpide.rst +++ b/doc/learning/setup/setup_s32k148_win_nxpide.rst @@ -22,7 +22,7 @@ To download and install this you will first need to register for a free account Note that free activation codes for software you download will be sent to the email account you register with. Once registered, you can `download S32 Design Studio for ARM from here `_. -Download and run the installer S32DS_ARM_Win32_v :prop:`tool:s32ds_arm_version` .exe (this assumes you administrator rights on your PC). +Download and run the installer S32DS_ARM_Win32_v :prop:`tool:s32ds_arm_version` .exe (this assumes you have administrator rights on your PC). Enter the activation code received by email when prompted and chose **Activate Online**. During the installation it will also prompt you to allow drivers from **PEMicro** to be installed - accept this. diff --git a/libs/bsw/estd/include/estd/assert.h b/libs/bsw/estd/include/estd/assert.h index 724d305194d..a21fff500f6 100644 --- a/libs/bsw/estd/include/estd/assert.h +++ b/libs/bsw/estd/include/estd/assert.h @@ -59,7 +59,6 @@ // estd_expect behaves the same as estd_assert, but it shall not be used in // production code, only for temporary asserts during development. -// estd_export must be replaced before SOP with proper error handling. // The usage of estd_expect can be detected by static code analyzers. #if defined(ESTD_EXPECT_ERROR) #define estd_expect(E__) static_assert(false, "Replace estd_expect with proper error handling")