Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
dmt
Commits
34f98001
Commit
34f98001
authored
Nov 02, 2019
by
Maxime Perrotin
Browse files
Generate more python3-friendly code
parent
0eb073ad
Changes
2
Hide whitespace changes
Inline
Side-by-side
dmt/B_mappers/pyside_B_mapper.py
View file @
34f98001
...
...
@@ -156,7 +156,12 @@ def OnStartup(
import sys
import ctypes
import Queue
try:
# Python2
import Queue
except ImportError:
# Python3
import queue as Queue
import datamodel
import DV
import Stubs
...
...
@@ -415,7 +420,7 @@ def encode_uPER(asnVal):
if log:
log.error('uPER encoding failed')
else:
print
'[ERROR] uPER encoding failed'
print
(
'[ERROR] uPER encoding failed'
)
return
return buffer.GetPyString()
...
...
@@ -468,7 +473,7 @@ def expect(Q, VNvalue, ignoreOther=False, timeout=None):
"Expected {interfaceName} (%s), but received other
\
(%s)" % (str(tmId), str(msgId)))
else:
print
'Received other (%s), but still waiting for {interfaceName}'
\
print
(
'Received other (%s), but still waiting for {interfaceName}'
)
\
% str(msgId)
Q.task_done()
'''
.
format
(
asn1Type
=
CleanASNType
,
interfaceName
=
CleanSP
.
replace
(
'_'
,
'-'
)))
...
...
@@ -506,7 +511,7 @@ def sendTC(tc):
if log:
log.error('UPER Encoding or UDP Sending failed')
else:
print
'[ERROR] UPER Encoding or UDP Sending failed'
print
(
'[ERROR] UPER Encoding or UDP Sending failed'
)
elif shared_lib:
# TC is sent in native format
...
...
dmt/B_mappers/python_B_mapper.py
View file @
34f98001
...
...
@@ -153,7 +153,7 @@ def OnStartup(modelingLanguage: str,
g_bodyPython
.
append
(
' return'
)
g_bodyPython
.
append
(
' self._msgQueue = OpenMsgQueueForReading(str(os.geteuid()) + "_'
+
maybeFVname
+
'_PI_Python_queue")'
)
g_bodyPython
.
append
(
' if (self._msgQueue != -1): break'
)
g_bodyPython
.
append
(
' print
"Communication channel over %%d_%s_PI_Python_queue not established yet...
\\
n" %% os.geteuid()'
%
maybeFVname
)
g_bodyPython
.
append
(
' print
(
"Communication channel over %%d_%s_PI_Python_queue not established yet...
\\
n" %% os.geteuid()
)
'
%
maybeFVname
)
g_bodyPython
.
append
(
' time.sleep(1)'
)
g_bodyPython
.
append
(
' bufferSize = GetMsgQueueBufferSize(self._msgQueue)'
)
g_bodyPython
.
append
(
' self._pMem = ctypes.create_string_buffer(bufferSize).raw'
)
...
...
@@ -174,16 +174,16 @@ def OnStartup(modelingLanguage: str,
if
modelingLanguage
.
lower
()
==
"gui_pi"
:
g_SourceFile
.
write
(
'T_'
+
cleanFVname
+
'_PI_list ii_'
+
CleanSP
+
' = i_'
+
CleanSP
+
';
\n
'
)
g_TMprocessors
.
append
(
' if self.messageReceivedType == i_'
+
CleanSP
+
':'
)
g_TMprocessors
.
append
(
' print
"
\\
n"+chr(27)+"[32m" + "Received Telemetry: '
+
CleanSP
+
'" + chr(27) + "[0m
\\
n"'
)
g_TMprocessors
.
append
(
' print
(
"
\\
n"+chr(27)+"[32m" + "Received Telemetry: '
+
CleanSP
+
'" + chr(27) + "[0m
\\
n"
)
'
)
g_TMprocessors
.
append
(
' backup = self._pMem'
)
for
param
in
subProgram
.
_params
:
CleanParam
=
CleanName
(
param
.
_id
)
g_TMprocessors
.
append
(
" # Read the data for param %s"
%
param
.
_id
)
g_TMprocessors
.
append
(
" var_%s = %s_asn.%s()"
%
(
CleanParam
,
g_asn_name
,
CleanName
(
param
.
_signal
.
_asnNodename
)))
g_TMprocessors
.
append
(
" var_%s.SetData(self._pMem)"
%
CleanParam
)
g_TMprocessors
.
append
(
' print
"Parameter %s:"'
%
CleanParam
)
g_TMprocessors
.
append
(
' print
(
"Parameter %s:"
)
'
%
CleanParam
)
g_TMprocessors
.
append
(
' var_%s.PrintAll()'
%
CleanParam
)
g_TMprocessors
.
append
(
' print'
)
g_TMprocessors
.
append
(
' print
()
'
)
g_TMprocessors
.
append
(
" # self._pMem = DV.MovePtrBySizeOf_%s(self._pMem)"
%
CleanName
(
param
.
_signal
.
_asnNodename
))
g_TMprocessors
.
append
(
" # Revert the pointer to start of the data"
)
g_TMprocessors
.
append
(
' self._pMem = backup'
)
...
...
@@ -202,7 +202,7 @@ def OnStartup(modelingLanguage: str,
decl
+=
"):"
g_bodyPython
.
append
(
decl
)
g_bodyPython
.
append
(
" if -1 == SendTC_%s(%s):"
%
(
CleanSP
,
","
.
join
([
x
+
"._ptr"
for
x
in
parms
])))
g_bodyPython
.
append
(
" print
'Failed to send TC: %s...
\\
n'"
%
CleanSP
)
g_bodyPython
.
append
(
" print
(
'Failed to send TC: %s...
\\
n'
)
"
%
CleanSP
)
g_bodyPython
.
append
(
" raise IOError(
\"
%s
\"
)"
%
CleanSP
)
g_SourceFile
.
write
(
'typedef struct {
\n
'
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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