Skip to content

Commit 50cfab4

Browse files
committed
Merge branch 'develop' of https://github.com/SimpleDeviceModel/sdm into develop
2 parents 006f954 + d1fd2e2 commit 50cfab4

File tree

5 files changed

+15
-6
lines changed

5 files changed

+15
-6
lines changed

doc/changelog.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
========================
2+
SDM 1.0.3
3+
------------------------
4+
Released on 2022-02-02
5+
========================
6+
7+
* bundled Lua interpreter updated to 5.4.4
8+
* pluginprovider: SDMAbstractQueuedSource class redesigned
9+
110
========================
211
SDM 1.0.2
312
------------------------

doc/manual.pdf

118 KB
Binary file not shown.

src/cmake/Version.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.3.0)
44

55
set(PRODUCT_VERSION_MAJOR 1)
66
set(PRODUCT_VERSION_MINOR 0)
7-
set(PRODUCT_VERSION_PATCH 2)
7+
set(PRODUCT_VERSION_PATCH 3)
88

99
try_compile(CPU_DETECTED "${CMAKE_CURRENT_BINARY_DIR}/try_compile/DetectCPU" "${CMAKE_CURRENT_LIST_DIR}/DetectCPU.c" COPY_FILE "${CMAKE_CURRENT_BINARY_DIR}/try_compile/DetectCPU.bin")
1010

src/doc/manual/version.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% This file is automatically generated by the build system.
22
% Do not edit it manually.
33

4-
\newcommand{\productversion}{1.0.2}
4+
\newcommand{\productversion}{1.0.3}

src/sdk/examples/uartdemo/uartdemo.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ class UartSource : public SDMAbstractQueuedSource {
9494
virtual int close() override;
9595

9696
protected:
97-
virtual void addDataToQueue(std::size_t samples,bool nonBlocking);
98-
virtual std::size_t getSamplesFromQueue(int stream,std::size_t pos,sdm_sample_t *data,std::size_t n,bool &eop);
99-
virtual void next();
100-
virtual void clear();
97+
virtual void addDataToQueue(std::size_t samples,bool nonBlocking) override;
98+
virtual std::size_t getSamplesFromQueue(int stream,std::size_t pos,sdm_sample_t *data,std::size_t n,bool &eop) override;
99+
virtual void next() override;
100+
virtual void clear() override;
101101
};
102102

103103
#endif

0 commit comments

Comments
 (0)