Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
M
Mock Turtle
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
Mock Turtle
Commits
e370e002
Commit
e370e002
authored
Nov 28, 2014
by
Federico Vaga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wrtd: fix sw trigger
Signed-off-by:
Federico Vaga
<
federico.vaga@gmail.com
>
parent
f9ac9df8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
1 deletion
+27
-1
libwrtd.h
applications/wrtd/lib/libwrtd.h
+4
-0
wrtd-in-config.c
applications/wrtd/tools/wrtd-in-config.c
+23
-1
No files found.
applications/wrtd/lib/libwrtd.h
View file @
e370e002
...
@@ -190,5 +190,9 @@ extern int wrtd_out_reset_counters(struct wrtd_node *dev, unsigned int output);
...
@@ -190,5 +190,9 @@ extern int wrtd_out_reset_counters(struct wrtd_node *dev, unsigned int output);
extern
int
wrtd_out_check_triggered
(
struct
wrtd_node
*
dev
,
unsigned
int
output
);
extern
int
wrtd_out_check_triggered
(
struct
wrtd_node
*
dev
,
unsigned
int
output
);
//int wrtd_out_wait_trigger(struct wrtd_node*, int output_mask, struct wrtd_trig_id *id);
//int wrtd_out_wait_trigger(struct wrtd_node*, int output_mask, struct wrtd_trig_id *id);
/**
* @file libwrtd-internal.c
*/
extern
struct
wr_timestamp
picos_to_ts
(
uint64_t
p
);
#endif
#endif
applications/wrtd/tools/wrtd-in-config.c
View file @
e370e002
...
@@ -238,7 +238,29 @@ static int wrtd_cmd_reset(struct wrtd_node *wrtd, int input,
...
@@ -238,7 +238,29 @@ static int wrtd_cmd_reset(struct wrtd_node *wrtd, int input,
static
int
wrtd_cmd_sw_trigger
(
struct
wrtd_node
*
wrtd
,
int
input
,
static
int
wrtd_cmd_sw_trigger
(
struct
wrtd_node
*
wrtd
,
int
input
,
int
argc
,
char
*
argv
[])
int
argc
,
char
*
argv
[])
{
{
return
wrtd_in_trigger_software
(
wrtd
,
input
);
struct
wrtd_trigger_entry
ent
;
uint64_t
ts
;
int
ret
;
if
(
argc
!=
1
||
argv
[
0
]
==
NULL
)
{
fprintf
(
stderr
,
"Missing deadtime value
\n
"
);
return
-
1
;
}
ret
=
parse_trigger_id
(
argv
[
0
],
&
ent
.
id
);
if
(
ret
<
0
)
return
-
1
;
if
(
argv
[
1
]
!=
NULL
)
{
parse_delay
(
argv
[
1
],
&
ts
);
ent
.
ts
=
picos_to_ts
(
ts
);
}
else
{
ent
.
ts
.
seconds
=
0
;
ent
.
ts
.
ticks
=
100000000000ULL
/
8000ULL
;
/* 100ms */
ent
.
ts
.
bins
=
0
;
}
return
wrtd_in_trigger_software
(
wrtd
,
&
ent
);
}
}
int
main
(
int
argc
,
char
*
argv
[])
int
main
(
int
argc
,
char
*
argv
[])
...
...
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