Skip to content

Commit 299bdf3

Browse files
catharanthuscatharanthus
committed
Merge branch 'develop'
2 parents f7441da + 37b327b commit 299bdf3

File tree

219 files changed

+643
-375
lines changed

Some content is hidden

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

219 files changed

+643
-375
lines changed

‎doc/changelog.txt‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
========================
2+
SDM 1.0.5
3+
------------------------
4+
Released on 2022-06-26
5+
========================
6+
7+
sdmconsole changes:
8+
9+
* user settings directory name changed (Microproject -> Simple Device Model)
10+
* data from register map memories can now be exported/imported in hexadecimal format in addition to CSV
11+
* always use full 32-bit width to display hexadecimal values in the register map
12+
* default tab stop width changed from 8 to 4
13+
14+
Scripting API changes:
15+
16+
* don't create multiple instances of the same plugin
17+
* sdm.info() now generates an error when a non-existent field is requested
18+
* a new method, sdm.findobject(), to find an SDM object by name (and, optionally, type)
19+
120
========================
221
SDM 1.0.4
322
------------------------

‎doc/contributors.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Microproject, LLC http://micro-project.ru
2+
Alex I. Kuznetsov https://github.com/catharanthus

‎doc/licenses/license.txt‎

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

3-
Copyright © 2015-2021 by Microproject LLC
3+
Copyright © 2015-2022 Simple Device Model contributors
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
@@ -26,7 +26,7 @@ SDM plugin development SDK includes the following components:
2626
* libraries for plugin development,
2727
* example plugins.
2828

29-
Copyright © 2015-2021 by Microproject LLC
29+
Copyright © 2015-2022 Simple Device Model contributors
3030

3131
Permission is hereby granted, free of charge, to any person obtaining
3232
a copy of this software and associated documentation files (the "Software"),

‎doc/manual.pdf‎

-58 Bytes
Binary file not shown.

‎src/cmake/GlobalBuildConfig.cmake‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,13 @@ if(GCC_CMDLINE_SYNTAX)
107107
set(CMAKE_C_VISIBILITY_PRESET hidden)
108108
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
109109
endif()
110+
111+
# Enable timed mutex workaround for libstdc++
112+
113+
if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
114+
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9.0)
115+
message("Activating timed mutex workaround for older libstdc++")
116+
include_directories(${CMAKE_CURRENT_LIST_DIR}/workarounds)
117+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include timed_mutex_workaround.h")
118+
endif()
119+
endif()

‎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 4)
7+
set(PRODUCT_VERSION_PATCH 5)
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/cmake/dlldeptool/dlldeptool.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015-2021 by Microproject LLC
2+
* Copyright (c) 2015-2022 Simple Device Model contributors
33
*
44
* This file is part of the Simple Device Model (SDM) framework.
55
*

‎src/cmake/dlldeptool/main.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015-2021 by Microproject LLC
2+
* Copyright (c) 2015-2022 Simple Device Model contributors
33
*
44
* This file is part of the Simple Device Model (SDM) framework.
55
*
@@ -222,7 +222,7 @@ void displayusage(const std::string &strProgramName) {
222222

223223
int main(int argc,char *argv[]) {
224224
utf8cout()<<"DllDepTool: collects DLLs required for the software to run"<<endl;
225-
utf8cout()<<"Copyright (c) 2015 by Microproject LLC"<<endl;
225+
utf8cout()<<"Copyright (c) 2015 Simple Device Model contributors"<<endl;
226226
utf8cout()<<"Note: please make sure that you are legally allowed to redistribute the DLLs!"<<endl<<endl;
227227

228228
auto args=cmdArgs(argc,argv);

‎src/cmake/dlldeptool/peimports.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015-2021 by Microproject LLC
2+
* Copyright (c) 2015-2022 Simple Device Model contributors
33
*
44
* This file is part of the Simple Device Model (SDM) framework.
55
*

‎src/cmake/dlldeptool/peimports.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015-2021 by Microproject LLC
2+
* Copyright (c) 2015-2022 Simple Device Model contributors
33
*
44
* This file is part of the Simple Device Model (SDM) framework.
55
*

0 commit comments

Comments
 (0)