Skip to content

Commit

Permalink
Merge branch 'release-1.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
catharanthus committed Feb 2, 2022
2 parents b34f486 + 439fc2a commit cc3d491
Show file tree
Hide file tree
Showing 96 changed files with 1,109 additions and 705 deletions.
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@

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).

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.
A device is represented in 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.

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.

[Project Website](https://simpledevicemodel.github.io)
[**Project Website**](https://simpledevicemodel.github.io)

![Screenshot](https://simpledevicemodel.github.io/assets/mainwindow.png)

9 changes: 9 additions & 0 deletions doc/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
========================
SDM 1.0.3
------------------------
Released on 2022-02-02
========================

* bundled Lua interpreter updated to 5.4.4
* pluginprovider: SDMAbstractQueuedSource class redesigned

========================
SDM 1.0.2
------------------------
Expand Down
Binary file modified doc/manual.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion src/3rdparty/lua/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ endif()
# LIBRARY
###########################

set(LUA_SRC_PATH "lua-5.4.3/src")
set(LUA_SRC_PATH "lua-5.4.4/src")

set(LUA_SRC_LIST "${LUA_SRC_PATH}/lapi.c" "${LUA_SRC_PATH}/lauxlib.c" "${LUA_SRC_PATH}/lbaselib.c" "${LUA_SRC_PATH}/lcode.c" "${LUA_SRC_PATH}/lcorolib.c" "${LUA_SRC_PATH}/lctype.c" "${LUA_SRC_PATH}/ldblib.c" "${LUA_SRC_PATH}/ldebug.c" "${LUA_SRC_PATH}/ldo.c" "${LUA_SRC_PATH}/ldump.c" "${LUA_SRC_PATH}/lfunc.c" "${LUA_SRC_PATH}/lgc.c" "${LUA_SRC_PATH}/linit.c" "${LUA_SRC_PATH}/liolib.c" "${LUA_SRC_PATH}/llex.c" "${LUA_SRC_PATH}/lmathlib.c" "${LUA_SRC_PATH}/lmem.c" "${LUA_SRC_PATH}/loadlib.c" "${LUA_SRC_PATH}/lobject.c" "${LUA_SRC_PATH}/lopcodes.c" "${LUA_SRC_PATH}/loslib.c" "${LUA_SRC_PATH}/lparser.c" "${LUA_SRC_PATH}/lstate.c" "${LUA_SRC_PATH}/lstring.c" "${LUA_SRC_PATH}/lstrlib.c" "${LUA_SRC_PATH}/ltable.c" "${LUA_SRC_PATH}/ltablib.c" "${LUA_SRC_PATH}/ltm.c" "${LUA_SRC_PATH}/lundump.c" "${LUA_SRC_PATH}/lutf8lib.c" "${LUA_SRC_PATH}/lvm.c" "${LUA_SRC_PATH}/lzio.c")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ TO_MAN= lua.1 luac.1

# Lua version and release.
V= 5.4
R= $V.3
R= $V.4

# Targets start here.
all: $(PLAT)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

This is Lua 5.4.3, released on 15 Mar 2021.
This is Lua 5.4.4, released on 13 Jan 2022.

For installation instructions, license details, and
further information about Lua, see doc/readme.html.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ <H1>

<P>
<SMALL>
Copyright &copy; 2020&ndash;2021 Lua.org, PUC-Rio.
Copyright &copy; 2020&ndash;2022 Lua.org, PUC-Rio.
Freely available under the terms of the
<A HREF="http://www.lua.org/license.html">Lua license</A>.
</SMALL>
Expand Down Expand Up @@ -664,10 +664,10 @@ <H3><A NAME="constants">constants</A></H3>

<P CLASS="footer">
Last update:
Wed Mar 3 13:04:44 UTC 2021
Thu Jan 13 11:32:22 UTC 2022
</P>
<!--
Last change: revised for Lua 5.4.3
Last change: revised for Lua 5.4.4
-->

</BODY>
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit cc3d491

Please sign in to comment.