Skip to content

Commit

Permalink
Merge branch 'release/3.0.0' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
MaJerle committed Jul 5, 2020
2 parents c81dc2f + 3037109 commit b45015f
Show file tree
Hide file tree
Showing 30 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion dev/VisualStudio/lwow_opts.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of OneWire library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#ifndef LWOW_HDR_OPTS_H
#define LWOW_HDR_OPTS_H
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
author = 'Tilen MAJERLE'

# The full version, including alpha/beta/rc tags
version = '2.0.0'
version = '3.0.0'

# Try to get branch at which this is running
# and try to determine which version to display in sphinx
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#ifndef LWOW_HDR_OPTS_H
#define LWOW_HDR_OPTS_H
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#ifndef LWOW_HDR_OPTS_H
#define LWOW_HDR_OPTS_H
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#ifndef __MAIN_H
#define __MAIN_H
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#include "main.h"
#include "cmsis_os.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#ifndef LWOW_HDR_OPTS_H
#define LWOW_HDR_OPTS_H
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#ifndef __MAIN_H
#define __MAIN_H
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#include "main.h"
#include "cmsis_os.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#ifndef LWOW_HDR_OPTS_H
#define LWOW_HDR_OPTS_H
Expand Down
2 changes: 1 addition & 1 deletion examples/stm32/ow_ds18b20_stm32l496g_discovery/inc/main.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#ifndef __MAIN_H
#define __MAIN_H
Expand Down
2 changes: 1 addition & 1 deletion examples/stm32/ow_ds18b20_stm32l496g_discovery/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#include "main.h"
#include "lwow/lwow.h"
Expand Down
2 changes: 1 addition & 1 deletion lwow/src/devices/lwow_device_ds18x20.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW - Lightweight onewire library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#include "lwow/lwow.h"
#include "lwow/devices/lwow_device_ds18x20.h"
Expand Down
2 changes: 1 addition & 1 deletion lwow/src/include/lwow/devices/lwow_device_ds18x20.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW - Lightweight onewire library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#ifndef LWOW_HDR_DEVICE_DS18x20_H
#define LWOW_HDR_DEVICE_DS18x20_H
Expand Down
2 changes: 1 addition & 1 deletion lwow/src/include/lwow/lwow.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW - Lightweight onewire library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#ifndef LWOW_HDR_H
#define LWOW_HDR_H
Expand Down
2 changes: 1 addition & 1 deletion lwow/src/include/lwow/lwow_opt.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW - Lightweight onewire library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#ifndef LWOW_HDR_OPT_H
#define LWOW_HDR_OPT_H
Expand Down
2 changes: 1 addition & 1 deletion lwow/src/include/lwow/lwow_opts_template.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW - Lightweight onewire library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#ifndef LWOW_HDR_OPTS_H
#define LWOW_HDR_OPTS_H
Expand Down
2 changes: 1 addition & 1 deletion lwow/src/lwow/lwow.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW - Lightweight onewire library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#include <string.h>
#include "lwow/lwow.h"
Expand Down
2 changes: 1 addition & 1 deletion lwow/src/system/lwow_ll_stm32.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW - Lightweight onewire library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/

/*
Expand Down
2 changes: 1 addition & 1 deletion lwow/src/system/lwow_ll_stm32_hal.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW - Lightweight onewire library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/

/*
Expand Down
2 changes: 1 addition & 1 deletion lwow/src/system/lwow_ll_stm32f429zi_nucleo.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW - Lightweight onewire library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/

/*
Expand Down
2 changes: 1 addition & 1 deletion lwow/src/system/lwow_ll_stm32l0xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW - Lightweight onewire library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/

/*
Expand Down
2 changes: 1 addition & 1 deletion lwow/src/system/lwow_ll_stm32l496g_discovery.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW - Lightweight onewire library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/

/*
Expand Down
2 changes: 1 addition & 1 deletion lwow/src/system/lwow_ll_template.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW - Lightweight onewire library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#include "system/lwow_ll.h"

Expand Down
2 changes: 1 addition & 1 deletion lwow/src/system/lwow_ll_win32.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW - Lightweight onewire library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#include <stdio.h>
#include "lwow/lwow.h"
Expand Down
2 changes: 1 addition & 1 deletion lwow/src/system/lwow_sys_cmsis_os.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW - Lightweight onewire library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#include "lwow/lwow.h"

Expand Down
2 changes: 1 addition & 1 deletion lwow/src/system/lwow_sys_template.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW - Lightweight onewire library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#include "lwow/lwow.h"

Expand Down
2 changes: 1 addition & 1 deletion lwow/src/system/lwow_sys_win32.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW - Lightweight onewire library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/
#include "lwow/lwow.h"
#include "windows.h"
Expand Down
2 changes: 1 addition & 1 deletion lwow/src/system/ow_ll_stm32.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW - Lightweight onewire library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/

/*
Expand Down
2 changes: 1 addition & 1 deletion lwow/src/system/ow_ll_stm32_hal.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwOW - Lightweight onewire library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v2.0.0
* Version: v3.0.0
*/

/*
Expand Down

0 comments on commit b45015f

Please sign in to comment.