Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
anselm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
vaclab
anselm
Commits
ebbd4306
Commit
ebbd4306
authored
6 years ago
by
wactbprot
Browse files
Options
Downloads
Patches
Plain Diff
ind complete
parent
1f6c9e53
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
srv.py
+63
-5
63 additions, 5 deletions
srv.py
with
63 additions
and
5 deletions
srv.py
+
63
−
5
View file @
ebbd4306
...
...
@@ -16,6 +16,8 @@ def home():
"
/dut_max
"
,
"
/target_pressures
"
,
"
/offset_sequences
"
"
/offset
"
,
"
/ind
"
]
})
@app.route
(
'
/cal_ids
'
)
...
...
@@ -160,7 +162,7 @@ def offset_sequences():
@app.route
(
'
/offset
'
,
methods
=
[
'
POST
'
])
def
offset
():
res
=
{
"
ok
"
:
True
}
s
.
log
.
info
(
"
request to offset
"
)
s
.
log
.
info
(
"
request to
endpoint /
offset
"
)
req
=
request
.
get_json
()
s
.
log
.
debug
(
"
receive request with body {}
"
.
format
(
req
))
...
...
@@ -190,8 +192,9 @@ def offset():
# append the offset task
offset_task
=
s
.
dget
(
"
offset_task
"
,
line
)
if
offset_task
and
'
TaskName
'
in
task
:
offset_task_name
=
offset_task
.
get
(
'
TaskName
'
)
offset_sequence
.
append
(
offset_task
)
seq_array
.
append
(
"
{}-{}
"
.
format
(
offset_task
.
get
(
'
TaskN
ame
'
)
,
line
))
seq_array
.
append
(
"
{}-{}
"
.
format
(
offset_task
_n
ame
,
line
))
else
:
offset_sequence
=
[]
...
...
@@ -213,10 +216,65 @@ def offset():
s
.
log
.
error
(
msg
)
res
=
{
'
error
'
:
msg
}
#start_new_thread( work_seqence, (sequence, line,))
#res = wait_sequences_complete(seq_array)
return
jsonify
(
res
)
@app.route
(
'
/ind
'
,
methods
=
[
'
POST
'
])
def
ind
():
res
=
{
"
ok
"
:
True
}
s
.
log
.
info
(
"
request to endpoint /ind
"
)
req
=
request
.
get_json
()
s
.
log
.
debug
(
"
receive request with body {}
"
.
format
(
req
))
if
'
Target_pressure_value
'
in
req
and
'
Target_pressure_unit
'
in
req
:
seq_array
=
[]
target_value
=
float
(
req
.
get
(
'
Target_pressure_value
'
))
target_unit
=
req
.
get
(
'
Target_pressure_unit
'
)
if
target_unit
==
s
.
unit
:
fs_val_keys
=
s
.
r
.
keys
(
'
fullscale_value@*
'
)
for
key
in
fs_val_keys
:
_
,
line
=
key
.
split
(
s
.
keysep
)
fullscale_value
=
s
.
fget
(
'
fullscale_value
'
,
line
)
s
.
log
.
debug
(
"
fullscale value for line {} is {}. Target value is: {}.
"
.
format
(
line
,
fullscale_value
,
target_value
))
if
target_value
<
fullscale_value
:
auto_init_tasks
=
s
.
dget
(
'
auto_init_tasks
'
,
line
)
s
.
log
.
debug
(
"
found {} auto init tasks
"
.
format
(
len
(
auto_init_tasks
)))
ind_sequence
=
[]
for
task
in
auto_init_tasks
:
if
'
From
'
in
task
and
'
To
'
in
task
and
target_value
>=
task
.
get
(
'
From
'
)
and
target_value
<
task
.
get
(
'
To
'
):
s
.
log
.
debug
(
"
append for execution task: {}
"
.
format
(
task
))
ind_sequence
.
append
(
task
)
seq_array
.
append
(
"
{}-{}
"
.
format
(
task
.
get
(
'
TaskName
'
),
line
))
# append the ind task
ind_task
=
s
.
dget
(
"
ind_task
"
,
line
)
if
ind_task
and
'
TaskName
'
in
task
:
ind_task_name
=
ind_task
.
get
(
'
TaskName
'
)
ind_sequence
.
append
(
ind_task
)
seq_array
.
append
(
"
{}-{}
"
.
format
(
ind_task_name
,
line
))
else
:
ind_sequence
=
[]
if
len
(
ind_sequence
)
>
0
:
start_new_thread
(
work_seqence
,
(
ind_sequence
,
line
,))
else
:
s
.
log
.
info
(
"
No task match for line {}
"
.
format
(
line
))
if
len
(
seq_array
)
>
0
:
res
=
wait_sequences_complete
(
seq_array
)
else
:
s
.
log
.
info
(
"
nothing started
"
)
else
:
msg
=
"
wrong target unit
"
s
.
log
.
error
(
msg
)
res
=
{
'
error
'
:
msg
}
else
:
msg
=
"
missing request data (Target_pressure_value or Target_pressure_unit)
"
s
.
log
.
error
(
msg
)
res
=
{
'
error
'
:
msg
}
return
jsonify
(
res
)
def
wait_sequences_complete
(
seq_array
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment