Skip to content

Commit 81f2a05

Browse files
committed
Merge branch 'release-1.0.0'
2 parents 7221d02 + 80add5c commit 81f2a05

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+1239
-3175
lines changed

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Simple Device Model
2+
3+
Simple Device Model (SDM) is an open source instrument control and data acquisition framework for Windows and Linux. It provides interactive GUI tools for operating devices and visualizing the received data. It is also fully scriptable with [Lua](https://www.lua.org).
4+
5+
A device is represented by SDM as a set of control channels and data sources, hence the “model”. SDM interacts with devices by writing and reading registers and memory blocks in the device’s virtual address space, and by reading data streams from the device. The actual code that communicates with hardware is encapsulated within a plugin. SDM framework is [well documented](https://github.com/SimpleDeviceModel/sdm/raw/develop/doc/manual.pdf) and includes an SDK which contains headers and libraries to develop plugins in C and C++ as well as a few example plugins.
6+
7+
SDM is most useful for prototyping, allowing the developer to quickly create virtual control panels and dashboards. Scriptability makes it also well suited for test and measurement automation.
8+
9+
[Project Website](https://simpledevicemodel.github.io)

doc/changelog.txt

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
========================
2+
SDM 1.0.0
3+
------------------------
4+
Released on 2021-11-23
5+
========================
6+
7+
General:
8+
9+
* first open source release
10+
* proprietary plugins moved to a separate repository
11+
* bundled Lua interpreter updated to 5.4.3
12+
* some directories were moved
13+
* default install path changed
14+
15+
Scripting engine:
16+
17+
* new luaipsockets methods, sendall() and recvall()
18+
* SDM will no longer search for Lua modules in systemwide directories when using bundled interpreter
19+
* a few bugs fixed in the uart module (setting DTR/RTS, blocking read under Windows)
20+
* luafilesystem removed from the default install
21+
22+
sdmconsole:
23+
24+
* on Linux, use a standard Qt file dialog (instead of a native one)
25+
* removed the option to create dockable windows as undocked by default
26+
* plotter widget should now remember scene-dependent settings
27+
28+
SDK:
29+
30+
* uartdemo, a new example plugin for Arduino Uno
31+
132
========================
233
SDM 0.9.5
334
------------------------

doc/licenses/license-ru.txt

Lines changed: 0 additions & 52 deletions
This file was deleted.

doc/licenses/license.txt

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
SIMPLE DEVICE MODEL FRAMEWORK LICENSE
1+
SIMPLE DEVICE MODEL FRAMEWORK LICENSE NOTICE
22

3-
Copyright (c) 2015-2021 by Microproject LLC
3+
Copyright © 2015-2021 by Microproject LLC
44

55
SDM framework is free software: you can redistribute it and/or modify
66
it under the terms of the GNU Lesser General Public License as published by
@@ -15,32 +15,44 @@ GNU Lesser General Public License for more details.
1515
You should have received a copy of the GNU Lesser General Public License
1616
along with SDM framework. If not, see <https://www.gnu.org/licenses/>.
1717

18-
SDM framework can be shipped with additional plugins which are not covered
19-
by this license.
18+
19+
2020

2121
SIMPLE DEVICE MODEL SDK LICENSE
2222

23-
In addition to the above, SDK for SDM plugin development is also licensed
24-
under the terms of the MIT license (see sdk-license.txt).
23+
SDM plugin development SDK includes the following components:
2524

26-
THIRD PARTY SOFTWARE COMPONENTS
25+
* SDM API headers,
26+
* libraries for plugin development,
27+
* example plugins.
2728

28-
SDM framework includes the following third party software components. License
29-
conditions for third-party software are provided in the documentation.
29+
Copyright © 2015-2021 by Microproject LLC
3030

31-
* Lua: Copyright © 1994–2020 Lua.org, PUC-Rio.
32-
* LuaFileSystem: Copyright © 2003-2020 Kepler Project.
33-
* The Qt Toolkit: Copyright © 2015 The Qt Company Ltd.
31+
Permission is hereby granted, free of charge, to any person obtaining
32+
a copy of this software and associated documentation files (the "Software"),
33+
to deal in the Software without restriction, including without limitation
34+
the rights to use, copy, modify, merge, publish, distribute, sublicense,
35+
and/or sell copies of the Software, and to permit persons to whom
36+
the Software is furnished to do so, subject to the following conditions:
3437

35-
TRADEMARK NOTICES
38+
The above copyright notice and this permission notice shall be included
39+
in all copies or substantial portions of the Software.
3640

37-
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
41+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
42+
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
43+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
44+
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
45+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
46+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
47+
IN THE SOFTWARE.
3848

39-
Microsoft, Windows, Visual Studio and Visual C++ are either registered trademarks or
40-
trademarks of Microsoft Corporation in the United States and/or other countries.
4149

42-
Qt is a registered trademark of The Qt Company Ltd. and/or its subsidiaries.
4350

44-
Ubuntu is a registered trademark of Canonical Ltd.
4551

46-
All other trademarks are property of their respective owners.
52+
THIRD PARTY SOFTWARE COMPONENTS
53+
54+
SDM framework includes the following third party software components. License
55+
conditions for third-party software are provided in the documentation.
56+
57+
* Lua: Copyright © 1994–2020 Lua.org, PUC-Rio.
58+
* The Qt Toolkit: Copyright © 2015 The Qt Company Ltd.

doc/licenses/luafilesystem/license.txt

Lines changed: 0 additions & 7 deletions
This file was deleted.

doc/licenses/sdk-license.txt

Lines changed: 0 additions & 30 deletions
This file was deleted.

doc/manual.pdf

-245 Bytes
Binary file not shown.

src/3rdparty/luafilesystem/CMakeLists.txt

Lines changed: 0 additions & 34 deletions
This file was deleted.

src/3rdparty/luafilesystem/luafilesystem-1_8_0/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/3rdparty/luafilesystem/luafilesystem-1_8_0/.travis.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)