Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dmt
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
TASTE
dmt
Commits
f755974c
Commit
f755974c
authored
Jun 19, 2018
by
Thanassis Tsiodras
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/crazyflie'
parents
39d011ab
7fee05cb
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
40 additions
and
7 deletions
+40
-7
dmt/B_mappers/asynchronousTool.py
dmt/B_mappers/asynchronousTool.py
+7
-1
dmt/B_mappers/c_B_mapper.py
dmt/B_mappers/c_B_mapper.py
+8
-0
dmt/B_mappers/synchronousTool.py
dmt/B_mappers/synchronousTool.py
+10
-0
dmt/asn2aadlPlus.py
dmt/asn2aadlPlus.py
+1
-0
dmt/commonPy/__init__.py
dmt/commonPy/__init__.py
+1
-1
dmt/msgPrinter.py
dmt/msgPrinter.py
+6
-2
dmt/msgPrinterASN1.py
dmt/msgPrinterASN1.py
+6
-2
setup.py
setup.py
+1
-1
No files found.
dmt/B_mappers/asynchronousTool.py
View file @
f755974c
...
...
@@ -100,11 +100,17 @@ class ASynchronousToolGlueGenerator:
ID
=
re
.
sub
(
r'[^A-Za-z0-9_]'
,
'_'
,
ID
).
upper
()
self
.
C_HeaderFile
.
write
(
"#ifndef __%s_H__
\n
"
%
ID
)
self
.
C_HeaderFile
.
write
(
"#define __%s_H__
\n\n
"
%
ID
)
self
.
C_HeaderFile
.
write
(
"#ifdef __unix__
\n
"
)
self
.
C_HeaderFile
.
write
(
"#include <stdlib.h> /* for size_t */
\n
"
)
self
.
C_HeaderFile
.
write
(
"#else
\n
"
)
self
.
C_HeaderFile
.
write
(
"typedef unsigned size_t;
\n
"
)
self
.
C_HeaderFile
.
write
(
"#endif
\n\n
"
)
self
.
C_HeaderFile
.
write
(
"
\n
"
)
self
.
C_SourceFile
.
write
(
"#ifdef __unix__
\n
"
)
self
.
C_SourceFile
.
write
(
"#include <stdio.h>
\n
"
)
self
.
C_SourceFile
.
write
(
"#include <assert.h>
\n
"
)
self
.
C_SourceFile
.
write
(
"#endif
\n\n
"
)
self
.
C_SourceFile
.
write
(
"#include <string.h>
\n\n
"
)
self
.
C_SourceFile
.
write
(
"#include <assert.h>
\n\n
"
)
self
.
C_SourceFile
.
write
(
"#include
\"
%s
\"\n\n
"
%
outputCheaderFilename
)
self
.
HeadersOnStartup
(
asnFile
,
outputDir
,
maybeFVname
)
...
...
dmt/B_mappers/c_B_mapper.py
View file @
f755974c
...
...
@@ -306,8 +306,10 @@ class C_GlueGenerator(ASynchronousToolGlueGenerator):
self
.
C_SourceFile
.
write
(
" if (ossEncode(g_world, OSS_%s_PDU, &var_%s, &strm) != 0) {
\n
"
%
(
self
.
CleanNameAsToolWants
(
nodeTypename
),
self
.
CleanNameAsToolWants
(
nodeTypename
)))
self
.
C_SourceFile
.
write
(
"#ifdef __unix__
\n
"
)
self
.
C_SourceFile
.
write
(
'
\t
fprintf(stderr, "Could not encode %s (at %%s, %%d), errorMessage was %%s
\\
n", __FILE__, __LINE__, ossGetErrMsg(g_world));
\n
'
%
nodeTypename
)
self
.
C_SourceFile
.
write
(
"#endif
\n
"
)
self
.
C_SourceFile
.
write
(
" return -1;
\n
"
)
self
.
C_SourceFile
.
write
(
" } else {
\n
"
)
self
.
C_SourceFile
.
write
(
" assert(strm.length <= iMaxBufferSize);
\n
"
)
...
...
@@ -321,8 +323,10 @@ class C_GlueGenerator(ASynchronousToolGlueGenerator):
self
.
C_SourceFile
.
write
(
" if (asn1Scc%s_%sEncode(pSrc, &strm, &errorCode, TRUE) == FALSE) {
\n
"
%
(
self
.
CleanNameAsToolWants
(
nodeTypename
),
(
"ACN_"
if
encoding
.
lower
()
==
"acn"
else
""
)))
self
.
C_SourceFile
.
write
(
"#ifdef __unix__
\n
"
)
self
.
C_SourceFile
.
write
(
'
\t
fprintf(stderr, "Could not encode %s (at %%s, %%d), errorCode was %%d
\\
n", __FILE__, __LINE__, errorCode);
\n
'
%
nodeTypename
)
self
.
C_SourceFile
.
write
(
"#endif
\n
"
)
self
.
C_SourceFile
.
write
(
" return -1;
\n
"
)
self
.
C_SourceFile
.
write
(
" } else {
\n
"
)
self
.
C_SourceFile
.
write
(
" return BitStream_GetLength(&strm);
\n
"
)
...
...
@@ -399,8 +403,10 @@ class C_GlueGenerator(ASynchronousToolGlueGenerator):
self
.
CleanNameAsToolWants
(
nodeTypename
))
self
.
C_SourceFile
.
write
(
" return 0;
\n
"
)
self
.
C_SourceFile
.
write
(
" } else {
\n
"
)
self
.
C_SourceFile
.
write
(
"#ifdef __unix__
\n
"
)
self
.
C_SourceFile
.
write
(
'
\t
fprintf(stderr, "Could not decode %s (at %%s, %%d), error message was %%s
\\
n", __FILE__, __LINE__, ossGetErrMsg(g_world));
\n
'
%
nodeTypename
)
self
.
C_SourceFile
.
write
(
"#endif
\n
"
)
self
.
C_SourceFile
.
write
(
" return -1;
\n
"
)
self
.
C_SourceFile
.
write
(
" }
\n
"
)
self
.
C_SourceFile
.
write
(
"}
\n
"
)
...
...
@@ -408,8 +414,10 @@ class C_GlueGenerator(ASynchronousToolGlueGenerator):
elif
encoding
.
lower
()
in
[
"uper"
,
"acn"
]:
self
.
C_SourceFile
.
write
(
" return 0;
\n
"
)
self
.
C_SourceFile
.
write
(
" } else {
\n
"
)
self
.
C_SourceFile
.
write
(
"#ifdef __unix__
\n
"
)
self
.
C_SourceFile
.
write
(
'
\t
fprintf(stderr, "Could not decode %s (at %%s, %%d), error code was %%d
\\
n", __FILE__, __LINE__, errorCode);
\n
'
%
nodeTypename
)
self
.
C_SourceFile
.
write
(
"#endif
\n
"
)
self
.
C_SourceFile
.
write
(
" return -1;
\n
"
)
self
.
C_SourceFile
.
write
(
" }
\n
"
)
self
.
C_SourceFile
.
write
(
"}
\n
"
)
...
...
dmt/B_mappers/synchronousTool.py
View file @
f755974c
...
...
@@ -172,9 +172,11 @@ class SynchronousToolGlueGeneratorGeneric(Generic[TSource, TDestin]):
self
.
C_HeaderFile
.
write
(
"#include <stdlib.h> /* for size_t */
\n
"
)
self
.
C_HeaderFile
.
write
(
"
\n
"
)
self
.
C_SourceFile
.
write
(
"#ifdef __unix__
\n
"
)
self
.
C_SourceFile
.
write
(
"#include <stdio.h>
\n
"
)
self
.
C_SourceFile
.
write
(
"#include <string.h>
\n\n
"
)
self
.
C_SourceFile
.
write
(
"#include <assert.h>
\n\n
"
)
self
.
C_SourceFile
.
write
(
"#endif
\n
"
)
self
.
C_SourceFile
.
write
(
"#include
\"
%s
\"\n
"
%
outputCheaderFilename
)
...
...
@@ -294,8 +296,10 @@ class SynchronousToolGlueGeneratorGeneric(Generic[TSource, TDestin]):
self
.
C_SourceFile
.
write
(
" if (ossEncode(g_world, OSS_%s_PDU, &var_%s, &strm) != 0) {
\n
"
%
(
self
.
CleanNameAsToolWants
(
nodeTypename
),
self
.
CleanNameAsToolWants
(
nodeTypename
)))
self
.
C_SourceFile
.
write
(
"#ifdef __unix__
\n
"
)
self
.
C_SourceFile
.
write
(
' fprintf(stderr, "Could not encode %s (at %%s, %%d), errorMessage was %%s
\\
n", __FILE__, __LINE__, ossGetErrMsg(g_world));
\n
'
%
nodeTypename
)
self
.
C_SourceFile
.
write
(
"#endif
\n
"
)
self
.
C_SourceFile
.
write
(
" return -1;
\n
"
)
self
.
C_SourceFile
.
write
(
" } else {
\n
"
)
self
.
C_SourceFile
.
write
(
" assert(strm.length <= iMaxBufferSize);
\n
"
)
...
...
@@ -310,8 +314,10 @@ class SynchronousToolGlueGeneratorGeneric(Generic[TSource, TDestin]):
(
self
.
CleanNameAsToolWants
(
nodeTypename
),
"ACN_"
if
encoding
.
lower
()
==
"acn"
else
""
,
self
.
CleanNameAsToolWants
(
nodeTypename
)))
self
.
C_SourceFile
.
write
(
"#ifdef __unix__
\n
"
)
self
.
C_SourceFile
.
write
(
' fprintf(stderr, "Could not encode %s (at %%s, %%d), errorCode was %%d
\\
n", __FILE__, __LINE__, errorCode);
\n
'
%
nodeTypename
)
self
.
C_SourceFile
.
write
(
"#endif
\n
"
)
self
.
C_SourceFile
.
write
(
" return -1;
\n
"
)
self
.
C_SourceFile
.
write
(
" } else {
\n
"
)
self
.
C_SourceFile
.
write
(
" return BitStream_GetLength(&strm);
\n
"
)
...
...
@@ -438,16 +444,20 @@ class SynchronousToolGlueGeneratorGeneric(Generic[TSource, TDestin]):
self
.
C_SourceFile
.
write
(
" ossFreeBuf(g_world, pVar_%s);
\n
"
%
self
.
CleanNameAsToolWants
(
nodeTypename
))
self
.
C_SourceFile
.
write
(
" return 0;
\n
"
)
self
.
C_SourceFile
.
write
(
" } else {
\n
"
)
self
.
C_SourceFile
.
write
(
"#ifdef __unix__
\n
"
)
self
.
C_SourceFile
.
write
(
' fprintf(stderr, "Could not decode %s (at %%s, %%d), error message was %%s
\\
n", __FILE__, __LINE__, ossGetErrMsg(g_world));
\n
'
%
nodeTypename
)
self
.
C_SourceFile
.
write
(
"#endif
\n
"
)
self
.
C_SourceFile
.
write
(
" return -1;
\n
"
)
self
.
C_SourceFile
.
write
(
" }
\n
"
)
self
.
C_SourceFile
.
write
(
"}
\n\n
"
)
elif
encoding
.
lower
()
in
[
"uper"
,
"acn"
]:
self
.
C_SourceFile
.
write
(
" return 0;
\n
"
)
self
.
C_SourceFile
.
write
(
" } else {
\n
"
)
self
.
C_SourceFile
.
write
(
"#ifdef __unix__
\n
"
)
self
.
C_SourceFile
.
write
(
' fprintf(stderr, "Could not decode %s (at %%s, %%d), error code was %%d
\\
n", __FILE__, __LINE__, errorCode);
\n
'
%
nodeTypename
)
self
.
C_SourceFile
.
write
(
"#endif
\n
"
)
self
.
C_SourceFile
.
write
(
" return -1;
\n
"
)
self
.
C_SourceFile
.
write
(
" }
\n
"
)
self
.
C_SourceFile
.
write
(
"}
\n\n
"
)
...
...
dmt/asn2aadlPlus.py
View file @
f755974c
...
...
@@ -157,6 +157,7 @@ def calculateForNativeAndASN1SCC(absASN1SCCpath, autosrc, names, inputFiles):
os
.
chdir
(
autosrc
)
path_to_compiler
=
spawn
.
find_executable
(
cc
.
decode
(
'utf-8'
))
if
path_to_compiler
is
None
:
os
.
chdir
(
pwd
)
continue
for
cfile
in
os
.
listdir
(
"."
):
if
cfile
.
endswith
(
".c"
):
...
...
dmt/commonPy/__init__.py
View file @
f755974c
...
...
@@ -19,7 +19,7 @@ import pkg_resources # pragma: no cover
try
:
__version__
=
pkg_resources
.
require
(
"dmt"
)[
0
].
version
# pragma: no cover
except
:
__version__
=
"2.1.
2
"
__version__
=
"2.1.
3
"
def
print_version
()
->
None
:
...
...
dmt/msgPrinter.py
View file @
f755974c
...
...
@@ -207,7 +207,9 @@ def main():
C_HeaderFile
.
write
(
'#endif
\n\n
'
)
C_SourceFile
=
open
(
configMT
.
outputDir
+
os
.
sep
+
"PrintTypes.c"
,
"w"
)
C_SourceFile
.
write
(
'#include <stdio.h>
\n\n
'
)
C_SourceFile
.
write
(
'#ifdef __unix__
\n
'
)
C_SourceFile
.
write
(
'#include <stdio.h>
\n
'
)
C_SourceFile
.
write
(
'#endif
\n
'
)
C_SourceFile
.
write
(
'#include "PrintTypes.h"
\n\n
'
)
C_SourceFile
.
write
(
'#ifdef __linux__
\n
'
)
C_SourceFile
.
write
(
'#include <pthread.h>
\n\n
'
)
...
...
@@ -243,6 +245,7 @@ def main():
C_SourceFile
.
write
(
'#ifdef __linux__
\n
'
)
C_SourceFile
.
write
(
' pthread_mutex_lock(&g_printing_mutex);
\n
'
)
C_SourceFile
.
write
(
'#endif
\n
'
)
C_SourceFile
.
write
(
'#ifdef __unix__
\n
'
)
lines
=
[
" "
+
x
for
x
in
printer
.
Map
(
'(*pData)'
,
...
...
@@ -251,7 +254,8 @@ def main():
leafTypeDict
,
asnParser
.
g_names
)]
C_SourceFile
.
write
(
"
\n
"
.
join
(
lines
))
C_SourceFile
.
write
(
'
\n
#ifdef __linux__
\n
'
)
C_SourceFile
.
write
(
'
\n
#endif
\n
'
)
C_SourceFile
.
write
(
'#ifdef __linux__
\n
'
)
C_SourceFile
.
write
(
' pthread_mutex_unlock(&g_printing_mutex);
\n
'
)
C_SourceFile
.
write
(
'#endif
\n
'
)
C_SourceFile
.
write
(
'}
\n\n
'
)
...
...
dmt/msgPrinterASN1.py
View file @
f755974c
...
...
@@ -226,7 +226,9 @@ def main():
C_HeaderFile
.
write
(
'#endif
\n\n
'
)
C_SourceFile
=
open
(
configMT
.
outputDir
+
os
.
sep
+
"PrintTypesAsASN1.c"
,
"w"
)
C_SourceFile
.
write
(
'#include <stdio.h>
\n\n
'
)
C_SourceFile
.
write
(
'#ifdef __unix__
\n
'
)
C_SourceFile
.
write
(
'#include <stdio.h>
\n
'
)
C_SourceFile
.
write
(
'#endif
\n\n
'
)
C_SourceFile
.
write
(
'#include "PrintTypesAsASN1.h"
\n\n
'
)
C_SourceFile
.
write
(
'#ifdef __linux__
\n
'
)
C_SourceFile
.
write
(
'#include <pthread.h>
\n\n
'
)
...
...
@@ -262,12 +264,14 @@ def main():
C_SourceFile
.
write
(
'#ifdef __linux__
\n
'
)
C_SourceFile
.
write
(
' pthread_mutex_lock(&g_printing_mutex);
\n
'
)
C_SourceFile
.
write
(
'#endif
\n
'
)
C_SourceFile
.
write
(
'#ifdef __unix__
\n
'
)
C_SourceFile
.
write
(
' //printf("%%s %s ::= ", paramName);
\n
'
%
nodeTypename
)
C_SourceFile
.
write
(
' printf("%s ", paramName);
\n
'
)
# C_SourceFile.write('\n'.join(printer.Map('(*pData)', '', node, leafTypeDict, asnParser.g_names)))
lines
=
[
" "
+
x
for
x
in
printer
.
Map
(
'(*pData)'
,
''
,
node
,
leafTypeDict
,
asnParser
.
g_names
)]
C_SourceFile
.
write
(
"
\n
"
.
join
(
lines
))
C_SourceFile
.
write
(
'
\n
#ifdef __linux__
\n
'
)
C_SourceFile
.
write
(
'
\n
#endif
\n
'
)
C_SourceFile
.
write
(
'#ifdef __linux__
\n
'
)
C_SourceFile
.
write
(
' pthread_mutex_unlock(&g_printing_mutex);
\n
'
)
C_SourceFile
.
write
(
'#endif
\n
'
)
C_SourceFile
.
write
(
'}
\n\n
'
)
...
...
setup.py
View file @
f755974c
...
...
@@ -11,7 +11,7 @@ from setuptools import setup, find_packages
setup
(
name
=
'dmt'
,
version
=
"2.1.1
6
"
,
version
=
"2.1.1
7
"
,
packages
=
find_packages
(),
author
=
'Thanassis Tsiodras'
,
author_email
=
'Thanassis.Tsiodras@esa.int'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment