Merge branch 'develop'

MaJerle · Jan 31, 2021 · 936f905 · 936f905
2 parents 643de04 + c05c14c
commit 936f905
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 20 deletions.
diff --git a/dev/VisualStudio/lwprintf_opts.h b/dev/VisualStudio/lwprintf_opts.h
@@ -29,7 +29,7 @@
  * This file is part of Lightweight stdio manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.0.1
+ * Version:         v1.0.2
  */
 #ifndef LWPRINTF_HDR_OPTS_H
 #define LWPRINTF_HDR_OPTS_H

diff --git a/docs/conf.py b/docs/conf.py
@@ -27,7 +27,7 @@
 author = 'Tilen MAJERLE'
 
 # The full version, including alpha/beta/rc tags
-version = 'v1.0.1'
+version = 'v1.0.2'
 
 # Try to get branch at which this is running
 # and try to determine which version to display in sphinx

diff --git a/examples/stm32/lwprintf_stm32l432kc_nucleo/Core/Inc/lwprintf_opts.h b/examples/stm32/lwprintf_stm32l432kc_nucleo/Core/Inc/lwprintf_opts.h
@@ -29,7 +29,7 @@
  * This file is part of LwPRINTF - Lightweight stdio manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.0.1
+ * Version:         v1.0.2
  */
 #ifndef LWPRINTF_HDR_OPTS_H
 #define LWPRINTF_HDR_OPTS_H

diff --git a/lwprintf/src/include/lwprintf/lwprintf.h b/lwprintf/src/include/lwprintf/lwprintf.h
@@ -29,7 +29,7 @@
  * This file is part of LwPRINTF - Lightweight stdio manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.0.1
+ * Version:         v1.0.2
  */
 #ifndef LWPRINTF_HDR_H
 #define LWPRINTF_HDR_H

diff --git a/lwprintf/src/include/lwprintf/lwprintf_opt.h b/lwprintf/src/include/lwprintf/lwprintf_opt.h
@@ -29,7 +29,7 @@
  * This file is part of LwPRINTF - Lightweight stdio manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.0.1
+ * Version:         v1.0.2
  */
 #ifndef LWPRINTF_HDR_OPT_H
 #define LWPRINTF_HDR_OPT_H

diff --git a/lwprintf/src/include/lwprintf/lwprintf_opts_template.h b/lwprintf/src/include/lwprintf/lwprintf_opts_template.h
@@ -29,7 +29,7 @@
  * This file is part of LwPRINTF - Lightweight stdio manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.0.1
+ * Version:         v1.0.2
  */
 #ifndef LWPRINTF_HDR_OPTS_H
 #define LWPRINTF_HDR_OPTS_H

diff --git a/lwprintf/src/include/system/lwprintf_sys.h b/lwprintf/src/include/system/lwprintf_sys.h
@@ -29,7 +29,7 @@
  * This file is part of LwPRINTF - Lightweight stdio manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.0.1
+ * Version:         v1.0.2
  */
 #ifndef LWPRINTF_HDR_SYS_H
 #define LWPRINTF_HDR_SYS_H

diff --git a/lwprintf/src/lwprintf/lwprintf.c b/lwprintf/src/lwprintf/lwprintf.c
@@ -29,7 +29,7 @@
  * This file is part of LwPRINTF - Lightweight stdio manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.0.1
+ * Version:         v1.0.2
  */
 #include <limits.h>
 #include <float.h>
@@ -591,10 +591,11 @@ prv_calculate_dbl_num_data(lwprintf_int_t* p, float_num_t* n, double num, uint8_
                 adder = 1;
             }
         }
-    } else {
+    } else
+#endif /* LWPRINTF_CFG_SUPPORT_TYPE_ENGINEERING */
+    {
         n->digits_cnt_decimal_part_useful = p->m.precision;
     }
-#endif /* LWPRINTF_CFG_SUPPORT_TYPE_ENGINEERING */
 }
 
 /**
@@ -871,21 +872,18 @@ prv_format(lwprintf_int_t* p, va_list arg) {
             break;
         }
 
-        /* Parse format */
-        /* %[flags][width][.precision][length]type */
-        /* Go to https://docs.majerle.eu for more info about supported features */
-        memset(&p->m, 0x00, sizeof(p->m));      /* Reset structure */
-
         /* Detect beginning */
         if (*fmt != '%') {
             p->out_fn(p, *fmt);                 /* Output character */
             ++fmt;
             continue;
         }
         ++fmt;
+        memset(&p->m, 0x00, sizeof(p->m));      /* Reset structure */
 
-        /* Check [parameter] */
-        /* Not used */
+        /* Parse format */
+        /* %[flags][width][.precision][length]type */
+        /* Go to https://docs.majerle.eu for more info about supported features */
 
         /* Check [flags] */
         /* It can have multiple flags in any order */

diff --git a/lwprintf/src/system/lwprintf_sys_cmsis_os.c b/lwprintf/src/system/lwprintf_sys_cmsis_os.c
@@ -29,7 +29,7 @@
  * This file is part of LwPRINTF - Lightweight stdio manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.0.1
+ * Version:         v1.0.2
  */
 #include "system/lwprintf_sys.h"
 

diff --git a/lwprintf/src/system/lwprintf_sys_template.c b/lwprintf/src/system/lwprintf_sys_template.c
@@ -29,7 +29,7 @@
  * This file is part of LwPRINTF - Lightweight stdio manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.0.1
+ * Version:         v1.0.2
  */
 #include "system/lwprintf_sys.h"
 

diff --git a/lwprintf/src/system/lwprintf_sys_win32.c b/lwprintf/src/system/lwprintf_sys_win32.c
@@ -29,7 +29,7 @@
  * This file is part of LwPRINTF - Lightweight stdio manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.0.1
+ * Version:         v1.0.2
  */
 #include "system/lwprintf_sys.h"