Merge branch 'release/2.0.0' into develop

MaJerle · Dec 7, 2019 · 0833c0d · 0833c0d
2 parents 2ff6bc1 + cfe31d0
commit 0833c0d
Show file tree

Hide file tree

Showing 22 changed files with 22 additions and 22 deletions.
diff --git a/dev/VisualStudio/ow_config.h b/dev/VisualStudio/ow_config.h
@@ -29,7 +29,7 @@
  * This file is part of OneWire library.
  *
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
- * Version:         v1.2.0
+ * Version:         v2.0.0
  */
 #ifndef OW_HDR_CONFIG_H
 #define OW_HDR_CONFIG_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
-release = '1.2.0'
+release = '2.0.0'
 
 # -- General configuration ---------------------------------------------------
 

diff --git a/examples/stm32/ow_ds18b20_rtos_stm32f429zi_nucleo/inc/main.h b/examples/stm32/ow_ds18b20_rtos_stm32f429zi_nucleo/inc/main.h
@@ -27,7 +27,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
- * Version:         v1.2.0
+ * Version:         v2.0.0
  */
 #ifndef __MAIN_H
 #define __MAIN_H

diff --git a/examples/stm32/ow_ds18b20_rtos_stm32f429zi_nucleo/inc/ow_config.h b/examples/stm32/ow_ds18b20_rtos_stm32f429zi_nucleo/inc/ow_config.h
@@ -29,7 +29,7 @@
  * This file is part of OneWire-UART.
  *
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
- * Version:         v1.2.0
+ * Version:         v2.0.0
  */
 #ifndef OW_HDR_CONFIG_H
 #define OW_HDR_CONFIG_H

diff --git a/examples/stm32/ow_ds18b20_rtos_stm32f429zi_nucleo/src/main.c b/examples/stm32/ow_ds18b20_rtos_stm32f429zi_nucleo/src/main.c
@@ -27,7 +27,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
- * Version:         v1.2.0
+ * Version:         v2.0.0
  */
 #include "main.h"
 #include "cmsis_os.h"

diff --git a/examples/stm32/ow_ds18b20_rtos_stm32l496g_discovery/inc/main.h b/examples/stm32/ow_ds18b20_rtos_stm32l496g_discovery/inc/main.h
@@ -27,7 +27,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
- * Version:         v1.2.0
+ * Version:         v2.0.0
  */
 #ifndef __MAIN_H
 #define __MAIN_H

diff --git a/examples/stm32/ow_ds18b20_rtos_stm32l496g_discovery/inc/ow_config.h b/examples/stm32/ow_ds18b20_rtos_stm32l496g_discovery/inc/ow_config.h
@@ -29,7 +29,7 @@
  * This file is part of OneWire-UART.
  *
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
- * Version:         v1.2.0
+ * Version:         v2.0.0
  */
 #ifndef OW_HDR_CONFIG_H
 #define OW_HDR_CONFIG_H

diff --git a/examples/stm32/ow_ds18b20_rtos_stm32l496g_discovery/src/main.c b/examples/stm32/ow_ds18b20_rtos_stm32l496g_discovery/src/main.c
@@ -27,7 +27,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
- * Version:         v1.2.0
+ * Version:         v2.0.0
  */
 #include "main.h"
 #include "cmsis_os.h"

diff --git a/onewire_uart/src/devices/ow_device_ds18x20.c b/onewire_uart/src/devices/ow_device_ds18x20.c
@@ -29,7 +29,7 @@
  * This file is part of OneWire-UART library.
  *
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
- * Version:         v1.2.0
+ * Version:         v2.0.0
  */
 #include "ow/ow.h"
 #include "ow/devices/ow_device_ds18x20.h"

diff --git a/onewire_uart/src/include/ow/devices/ow_device_ds18x20.h b/onewire_uart/src/include/ow/devices/ow_device_ds18x20.h
@@ -29,7 +29,7 @@
  * This file is part of OneWire-UART library.
  *
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
- * Version:         v1.2.0
+ * Version:         v2.0.0
  */
 #ifndef OW_HDR_DEVICE_DS18x20_H
 #define OW_HDR_DEVICE_DS18x20_H

diff --git a/onewire_uart/src/include/ow/ow.h b/onewire_uart/src/include/ow/ow.h
@@ -29,7 +29,7 @@
  * This file is part of OneWire-UART library.
  *
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
- * Version:         v1.2.0
+ * Version:         v2.0.0
  */
 #ifndef OW_HDR_H
 #define OW_HDR_H

diff --git a/onewire_uart/src/include/ow/ow_config_default.h b/onewire_uart/src/include/ow/ow_config_default.h
@@ -29,7 +29,7 @@
  * This file is part of OneWire-UART library.
  *
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
- * Version:         v1.2.0
+ * Version:         v2.0.0
  */
 #ifndef OW_HDR_CONFIG_DEFAULT_H
 #define OW_HDR_CONFIG_DEFAULT_H

diff --git a/onewire_uart/src/include/ow/ow_config_template.h b/onewire_uart/src/include/ow/ow_config_template.h
@@ -29,7 +29,7 @@
  * This file is part of OneWire-UART library.
  *
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
- * Version:         v1.2.0
+ * Version:         v2.0.0
  */
 #ifndef OW_HDR_CONFIG_H
 #define OW_HDR_CONFIG_H

diff --git a/onewire_uart/src/ow/ow.c b/onewire_uart/src/ow/ow.c
@@ -29,7 +29,7 @@
  * This file is part of OneWire-UART library.
  *
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
- * Version:         v1.2.0
+ * Version:         v2.0.0
  */
 #include "ow/ow.h"
 #include <string.h>

diff --git a/onewire_uart/src/system/ow_ll_stm32.c b/onewire_uart/src/system/ow_ll_stm32.c
@@ -29,7 +29,7 @@
  * This file is part of OneWire-UART library.
  *
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
- * Version:         v1.2.0
+ * Version:         v2.0.0
  */
 
 /*

diff --git a/onewire_uart/src/system/ow_ll_stm32f429zi_nucleo.c b/onewire_uart/src/system/ow_ll_stm32f429zi_nucleo.c
@@ -29,7 +29,7 @@
  * This file is part of OneWire-UART library.
  *
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
- * Version:         v1.2.0
+ * Version:         v2.0.0
  */
 
 /*

diff --git a/onewire_uart/src/system/ow_ll_stm32l496g_discovery.c b/onewire_uart/src/system/ow_ll_stm32l496g_discovery.c
@@ -29,7 +29,7 @@
  * This file is part of OneWire-UART library.
  *
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
- * Version:         v1.2.0
+ * Version:         v2.0.0
  */
 
 /*

diff --git a/onewire_uart/src/system/ow_ll_template.c b/onewire_uart/src/system/ow_ll_template.c
@@ -29,7 +29,7 @@
  * This file is part of OneWire-UART library.
  *
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
- * Version:         v1.2.0
+ * Version:         v2.0.0
  */
 #include "system/ow_ll.h"
 

diff --git a/onewire_uart/src/system/ow_ll_win32.c b/onewire_uart/src/system/ow_ll_win32.c
@@ -29,7 +29,7 @@
  * This file is part of OneWire-UART library.
  *
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
- * Version:         v1.2.0
+ * Version:         v2.0.0
  */
 #include "ow/ow.h"
 #include "windows.h"

diff --git a/onewire_uart/src/system/ow_sys_cmsis_os.c b/onewire_uart/src/system/ow_sys_cmsis_os.c
@@ -29,7 +29,7 @@
  * This file is part of OneWire-UART library.
  *
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
- * Version:         v1.2.0
+ * Version:         v2.0.0
  */
 #include "ow/ow.h"
 

diff --git a/onewire_uart/src/system/ow_sys_template.c b/onewire_uart/src/system/ow_sys_template.c
@@ -29,7 +29,7 @@
  * This file is part of OneWire-UART library.
  *
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
- * Version:         v1.2.0
+ * Version:         v2.0.0
  */
 #include "system/ow_sys.h"
 

diff --git a/onewire_uart/src/system/ow_sys_win32.c b/onewire_uart/src/system/ow_sys_win32.c
@@ -29,7 +29,7 @@
  * This file is part of OneWire-UART library.
  *
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
- * Version:         v1.2.0
+ * Version:         v2.0.0
  */
 #include "ow/ow.h"
 #include "windows.h"