updated examples

camilo · camilo · commit c8800f851d02 · 2024-11-18T08:48:56.000-05:00
diff --git a/check/qlibs_cpp_test.cpp b/check/qlibs_cpp_test.cpp
@@ -4,6 +4,7 @@
 #include <include/mat.hpp>
 
 using namespace std;
+using namespace qlibs;
 
 void test_fis( void );
 void test_fis2( void );
diff --git a/doc/qbitfield.dox b/doc/qbitfield.dox
@@ -46,6 +46,8 @@
 *  #include <iostream>
 *  #include <qlibs.h>
 *
+*  using namespace qlibs;
+*
 *  int main( int argc, char *argv[] )
 *  {
 *      bitfield vPort; // create the bitfield instance
diff --git a/doc/qfis.dox b/doc/qfis.dox
@@ -348,6 +348,8 @@
 *  #include "tipper_fis.h"
 *  #include <qlibs.h>
 *
+*  using namespace qlibs;
+*
 *  // I/O Names
 *  enum : fis::tag { service, food};
 *  enum : fis::tag { tip};
diff --git a/doc/qltisys.dox b/doc/qltisys.dox
@@ -45,6 +45,8 @@
 *  #include <thread>
 *  #include <qlibs.h>
 *
+*  using namespace qlibs;
+*
 *  void xTaskSystemSimulate( void )
 *  {
 *      const real_t dt = 0.05f; // Time step
@@ -74,6 +76,8 @@
 *  #include <thread>
 *  #include <qlibs.h>
 *
+*  using namespace qlibs;
+*
 *  void xTaskSystemSimulate( void )
 *  {
 *      const real_t dt = 0.05f; // Time step
@@ -125,6 +129,8 @@
 *  #include <thread>
 *  #include <qlibs.h>
 *
+*  using namespace qlibs;
+*
 *  void xTaskSystemSimulate( void )
 *  {
 *      real_t num[] = { 0.1f 0.2f, 0.3f };
@@ -151,6 +157,8 @@
 *  #include <thread>
 *  #include <qlibs.h>
 *
+*  using namespace qlibs;
+*
 *  void xTaskSystemSimulate( void )
 *  {
 *      discreteTF<3,3> dtf= {
diff --git a/doc/qpid.dox b/doc/qpid.dox
@@ -130,6 +130,8 @@
 *  #include "bsp.h"
 *  #include <qlibs.h>
 *
+*  using namespace qlibs;
+*
 *  const TickType_t dt = 50; //50mS time-step
 *  void xTaskPIDspeedControl( void *arg );
 *  real_t SetPoint = 300.0f; // desired motor speed 300rpm
@@ -215,6 +217,8 @@
 *  #include "bsp.h"
 *  #include <qlibs.h>
 *
+*  using namespace qlibs;
+*
 *  #define REF_MODEL_ORDER   ( 1 )
 *
 *  const TickType_t dt = 50; //50mS time-step
@@ -328,6 +332,7 @@
 *  #include "bsp.h"
 *  #include <qlibs.h>
 *
+*  using namespace qlibs;
 *
 *  const TickType_t dt = 50; //50mS time-step
 *  void xTaskPIDspeedControl( void *arg );
diff --git a/doc/qrms.dox b/doc/qrms.dox
@@ -25,7 +25,8 @@
 *  #include "hal_timer.h"
 *  #include <qlibs.h>
 *
-*  
+*  using namespace qlibs;
+*
 *  static rms rms_instance;
 *  static volatile real_t rms_value = 0.0f;
 *  static real_t window[ 8 ] = { 0.0f };
@@ -57,7 +58,7 @@
 *
 *  #ifndef RMS_COMPUTE_H
 *  #define RMS_COMPUTE_H
-*  
+*
 *  #ifdef __cplusplus
 *  extern "C" {
 *  #endif
diff --git a/doc/qssmoother.dox b/doc/qssmoother.dox
@@ -399,6 +399,8 @@
 *  #include "AppSignalProcessing.h"
 *  #include <qlibs.h>
 *
+*  using namespace qlibs;
+*
 *  constexpr size_t SMOOTHER_WINDOW_SIZE = 10;
 *  constexpr uint32_t SMOOTHER_SAMPLE_TIME = 100;
 *  constexpr real_t GAUSS_SIGMA = 0.5f;
diff --git a/examples/continuous_system/continuous_system.ino b/examples/continuous_system/continuous_system.ino
@@ -1,5 +1,7 @@
 #include <qlibs.h>
 
+using namespace qlibs;
+
 continuousTF<3> ctf= {
     { 0.0f, 2.0f, 3.0f, 6.0f },
     { 1.0f, 6.0f, 11.0f, 16.0f },
diff --git a/examples/discrete_system/discrete_system.ino b/examples/discrete_system/discrete_system.ino
@@ -1,5 +1,7 @@
 #include <qlibs.h>
 
+using namespace qlibs;
+
 discreteTF<3,3> dtf= {
     { 0.1f, 0.2f, 0.3f },
     { 1.0f, -0.85f, 0.02f },
diff --git a/examples/gaussian_smoother/gaussian_smoother.ino b/examples/gaussian_smoother/gaussian_smoother.ino
@@ -1,5 +1,7 @@
 #include <qlibs.h>
 
+using namespace qlibs;
+
 smootherGMWF filter;
 constexpr real_t SMOOTHER_SAMPLE_TIME = 20; /*mS*/
 int inputPin = A0;   // select the input pin for the potentiometer that will drive the system
diff --git a/examples/mamdani_tipper/mamdani_tipper.ino b/examples/mamdani_tipper/mamdani_tipper.ino
@@ -1,5 +1,7 @@
 #include <qlibs.h>
 
+using namespace qlibs;
+
 enum : fis::tag { service, food};
 enum : fis::tag { tip};
 // I/O Membership functions tags
diff --git a/examples/simple_pid_controller/simple_pid_controller.ino b/examples/simple_pid_controller/simple_pid_controller.ino
@@ -1,5 +1,7 @@
 #include <qlibs.h>
 
+using namespace qlibs;
+
 continuousTF<1> processTransferFunction= {
     { 0.0f, 1.5f, },
     { 2.0f, 1.0f, },
diff --git a/library.json b/library.json
@@ -16,7 +16,7 @@
       "maintainer": true
     }
   ],
-  "version": "1.3.1",
+  "version": "1.3.2",
   "license": "MIT",
   "frameworks": "arduino",
   "platforms": "*"
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=qlibs
-version=1.3.1
+version=1.3.2
 license=MIT
 author=J. Camilo Gomez C. <kmilo17pet@gmail.com>
 maintainer=J. Camilo Gomez C. <kmilo17pet@gmail.com>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required( VERSION 3.2 )
 project( qlibs-cpp
-         VERSION 1.3.1
+         VERSION 1.3.2
          DESCRIPTION "A collection of useful C++ libraries for embedded systems"
          LANGUAGES CXX )
 
diff --git a/src/ffmath.cpp b/src/ffmath.cpp
@@ -1303,7 +1303,7 @@ static float poly_laguerre_recursion( size_t n,
 {
     const float l0 = 1.0F;
     float y;
-
+    /*cstat -MISRAC++2008-0-1-2_b*/
     if ( 0U == n ) {
         y = l0;
     }
@@ -1328,7 +1328,7 @@ static float poly_laguerre_recursion( size_t n,
             y = ln;
         }
     }
-
+    /*cstat +MISRAC++2008-0-1-2_b*/
     return y;
 }
 /*============================================================================*/
@@ -1366,7 +1366,9 @@ static float poly_laguerre_hyperg( size_t n,
 {
     const float b = alpha + 1.0F;
     const float mx = -x;
+    /*cstat -MISRAC++2008-0-1-2_b*/
     const float tc_sgn = ( x < 0.0F ) ? 1.0F : ( ( 1 == ( n % 2 ) ) ? -1.0F : 1.0F );
+    /*cstat +MISRAC++2008-0-1-2_b*/
     const float ax = absolute( x );
     float tc = 1.0F;
 
@@ -2017,7 +2019,7 @@ static float expint_Ei_asymp( float x )
 static float expint_E1( float x )
 {
     float y;
-
+    /*cstat -MISRAC++2008-0-1-2_b*/
     if ( x < 0.0F ) {
         y = -expint_Ei( -x );
     }
@@ -2030,7 +2032,7 @@ static float expint_E1( float x )
     else {
         y = expint_E1_asymp( x );
     }
-
+    /*cstat +MISRAC++2008-0-1-2_b*/
     return y;
 }
 /*============================================================================*/
diff --git a/src/fp16.cpp b/src/fp16.cpp
@@ -306,7 +306,9 @@ fp16Raw_t fp16::sqrt( fp16Raw_t x ) noexcept
                     x <<= 16;
                     retValue <<= 16;
                 }
+                /*cstat -ATH-shift-bounds -MISRAC++2008-5-8-1 -CERT-INT34-C_b*/
                 bit = 1U << 14U;
+                /*cstat +ATH-shift-bounds +MISRAC++2008-5-8-1 +CERT-INT34-C_b*/
             }
         }
     }
diff --git a/src/qlibs.h b/src/qlibs.h
@@ -41,8 +41,8 @@ This file is part of the QuarkTS++ OS distribution.
 #ifndef QLIBS_CPP_H
 #define QLIBS_CPP_H
 
-    #define QLIBS_CPP_VERSION         "1.3.1"
-    #define QLIBS_CPP_VERNUM          ( 131 )
+    #define QLIBS_CPP_VERSION         "1.3.2"
+    #define QLIBS_CPP_VERNUM          ( 132 )
     #define QLIBS_CPP_CAPTION         "qLibs++" QLIBS_CPP_VERSION
 
     #include <include/qlibs_types.hpp>
@@ -60,6 +60,30 @@ This file is part of the QuarkTS++ OS distribution.
     #include <include/interp1.hpp>
     #include <include/algorithm.hpp>
 
-    using namespace qlibs;
+    namespace qlibs {
+        namespace build {
+            constexpr const uint32_t number = 2351;
+            constexpr const char* date = __DATE__;
+            constexpr const char* time = __TIME__;
+            constexpr const char* std = "c++11";
+        }
+        namespace version {
+            constexpr const char* str = QLIBS_CPP_VERSION;
+            constexpr const uint8_t number = QLIBS_CPP_VERNUM;
+            constexpr const uint8_t mayor = 1U;
+            constexpr const uint8_t minor = 3U;
+            constexpr const uint8_t rev = 2U;
+        }
+        namespace product {
+            constexpr const char* author = "J. Camilo Gomez C.";
+            constexpr const char* copyright = "Copyright (C) 2012 J. Camilo Gomez C. All Rights Reserved.";
+            constexpr const char* name = "qLibs++";
+            constexpr const char* category = "Library";
+            constexpr const char* caption = QLIBS_CPP_CAPTION;
+            constexpr const char* compliance = "MISRAC++2008,SEI-CERT";
+            constexpr const char* license = "MIT";
+            constexpr const char* source_model = "Open Source";
+        }
+    };
 
 #endif /*QOS_CPP_H*/

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@`
`46`	`46`	`* #include <iostream>`
`47`	`47`	`* #include <qlibs.h>`
`48`	`48`	`*`
	`49`	`+* using namespace qlibs;`
	`50`	`+*`
`49`	`51`	`* int main( int argc, char *argv[] )`
`50`	`52`	`* {`
`51`	`53`	`* bitfield vPort; // create the bitfield instance`
Original file line number	Diff line number	Diff line change
`@@ -348,6 +348,8 @@`
`348`	`348`	`* #include "tipper_fis.h"`
`349`	`349`	`* #include <qlibs.h>`
`350`	`350`	`*`
	`351`	`+* using namespace qlibs;`
	`352`	`+*`
`351`	`353`	`* // I/O Names`
`352`	`354`	`* enum : fis::tag { service, food};`
`353`	`355`	`* enum : fis::tag { tip};`
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,8 @@`
`130`	`130`	`* #include "bsp.h"`
`131`	`131`	`* #include <qlibs.h>`
`132`	`132`	`*`
	`133`	`+* using namespace qlibs;`
	`134`	`+*`
`133`	`135`	`* const TickType_t dt = 50; //50mS time-step`
`134`	`136`	`* void xTaskPIDspeedControl( void *arg );`
`135`	`137`	`* real_t SetPoint = 300.0f; // desired motor speed 300rpm`
`@@ -215,6 +217,8 @@`
`215`	`217`	`* #include "bsp.h"`
`216`	`218`	`* #include <qlibs.h>`
`217`	`219`	`*`
	`220`	`+* using namespace qlibs;`
	`221`	`+*`
`218`	`222`	`* #define REF_MODEL_ORDER ( 1 )`
`219`	`223`	`*`
`220`	`224`	`* const TickType_t dt = 50; //50mS time-step`
`@@ -328,6 +332,7 @@`
`328`	`332`	`* #include "bsp.h"`
`329`	`333`	`* #include <qlibs.h>`
`330`	`334`	`*`
	`335`	`+* using namespace qlibs;`
`331`	`336`	`*`
`332`	`337`	`* const TickType_t dt = 50; //50mS time-step`
`333`	`338`	`* void xTaskPIDspeedControl( void *arg );`
Original file line number	Diff line number	Diff line change
`@@ -399,6 +399,8 @@`
`399`	`399`	`* #include "AppSignalProcessing.h"`
`400`	`400`	`* #include <qlibs.h>`
`401`	`401`	`*`
	`402`	`+* using namespace qlibs;`
	`403`	`+*`
`402`	`404`	`* constexpr size_t SMOOTHER_WINDOW_SIZE = 10;`
`403`	`405`	`* constexpr uint32_t SMOOTHER_SAMPLE_TIME = 100;`
`404`	`406`	`* constexpr real_t GAUSS_SIGMA = 0.5f;`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`"maintainer": true`
`17`	`17`	`}`
`18`	`18`	`],`
`19`		`- "version": "1.3.1",`
	`19`	`+ "version": "1.3.2",`
`20`	`20`	`"license": "MIT",`
`21`	`21`	`"frameworks": "arduino",`
`22`	`22`	`"platforms": "*"`
Original file line number	Diff line number	Diff line change
`@@ -1303,7 +1303,7 @@ static float poly_laguerre_recursion( size_t n,`
`1303`	`1303`	`{`
`1304`	`1304`	`const float l0 = 1.0F;`
`1305`	`1305`	`float y;`
`1306`		`-`
	`1306`	`+ /cstat -MISRAC++2008-0-1-2_b/`
`1307`	`1307`	`if ( 0U == n ) {`
`1308`	`1308`	`y = l0;`
`1309`	`1309`	`}`
`@@ -1328,7 +1328,7 @@ static float poly_laguerre_recursion( size_t n,`
`1328`	`1328`	`y = ln;`
`1329`	`1329`	`}`
`1330`	`1330`	`}`
`1331`		`-`
	`1331`	`+ /cstat +MISRAC++2008-0-1-2_b/`
`1332`	`1332`	`return y;`
`1333`	`1333`	`}`
`1334`	`1334`	`/============================================================================/`
`@@ -1366,7 +1366,9 @@ static float poly_laguerre_hyperg( size_t n,`
`1366`	`1366`	`{`
`1367`	`1367`	`const float b = alpha + 1.0F;`
`1368`	`1368`	`const float mx = -x;`
	`1369`	`+ /cstat -MISRAC++2008-0-1-2_b/`
`1369`	`1370`	`const float tc_sgn = ( x < 0.0F ) ? 1.0F : ( ( 1 == ( n % 2 ) ) ? -1.0F : 1.0F );`
	`1371`	`+ /cstat +MISRAC++2008-0-1-2_b/`
`1370`	`1372`	`const float ax = absolute( x );`
`1371`	`1373`	`float tc = 1.0F;`
`1372`	`1374`
`@@ -2017,7 +2019,7 @@ static float expint_Ei_asymp( float x )`
`2017`	`2019`	`static float expint_E1( float x )`
`2018`	`2020`	`{`
`2019`	`2021`	`float y;`
`2020`		`-`
	`2022`	`+ /cstat -MISRAC++2008-0-1-2_b/`
`2021`	`2023`	`if ( x < 0.0F ) {`
`2022`	`2024`	`y = -expint_Ei( -x );`
`2023`	`2025`	`}`
`@@ -2030,7 +2032,7 @@ static float expint_E1( float x )`
`2030`	`2032`	`else {`
`2031`	`2033`	`y = expint_E1_asymp( x );`
`2032`	`2034`	`}`
`2033`		`-`
	`2035`	`+ /cstat +MISRAC++2008-0-1-2_b/`
`2034`	`2036`	`return y;`
`2035`	`2037`	`}`
`2036`	`2038`	`/============================================================================/`
Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,9 @@ fp16Raw_t fp16::sqrt( fp16Raw_t x ) noexcept`
`306`	`306`	`x <<= 16;`
`307`	`307`	`retValue <<= 16;`
`308`	`308`	`}`
	`309`	`+ /cstat -ATH-shift-bounds -MISRAC++2008-5-8-1 -CERT-INT34-C_b/`
`309`	`310`	`bit = 1U << 14U;`
	`311`	`+ /cstat +ATH-shift-bounds +MISRAC++2008-5-8-1 +CERT-INT34-C_b/`
`310`	`312`	`}`
`311`	`313`	`}`
`312`	`314`	`}`