diff options
author | Joe Zhao <ztuowen@gmail.com> | 2014-06-11 10:25:52 +0800 |
---|---|---|
committer | Joe Zhao <ztuowen@gmail.com> | 2014-06-11 10:25:52 +0800 |
commit | f2a38737d96fd024fd71b0959c067cbf98ff8742 (patch) | |
tree | 5153c922afa97bbbb3bc963189eca35661db6582 | |
parent | 9adcb32af31d22a046881f5d690d068e232be773 (diff) | |
download | local-f2a38737d96fd024fd71b0959c067cbf98ff8742.tar.gz local-f2a38737d96fd024fd71b0959c067cbf98ff8742.tar.bz2 local-f2a38737d96fd024fd71b0959c067cbf98ff8742.zip |
-rw-r--r-- | cmdiface.erl | 4 | ||||
-rw-r--r-- | rsbusserv.erl | 4 | ||||
-rwxr-xr-x | start.es | 7 | ||||
-rw-r--r-- | startscript.erl | 2 |
4 files changed, 12 insertions, 5 deletions
diff --git a/cmdiface.erl b/cmdiface.erl index b44e0f4..8249a99 100644 --- a/cmdiface.erl +++ b/cmdiface.erl @@ -23,7 +23,7 @@ reg_feedbackOps(Addr,Name,T,MsgReq,MsgRes,To) -> end, Pid = spawn(?MODULE,res_manip,[Init,Exit,To,[0,Addr,MsgReq]]), Call = - fun () -> + fun (_PPid) -> Pid ! rsbusserv:rsbusreq(Addr,MsgRes) end, eventserv:reg_future(Call,T). @@ -38,4 +38,4 @@ res_manip(Init,Exit,To,Pre) -> {stat,Type,Msg} -> To ! {self(),comm,Pre++[Type]++Msg}; {error,_Reason} -> ok end, - Exit().
\ No newline at end of file + Exit(). diff --git a/rsbusserv.erl b/rsbusserv.erl index 2753bb0..25ad994 100644 --- a/rsbusserv.erl +++ b/rsbusserv.erl @@ -19,7 +19,7 @@ -define(DEVICE,"/dev/ttyACM0"). -define(SPEED,9600). --define(TIMEOUT,10). % Timeout in milisec -> Also affect slaves' timeslice +-define(TIMEOUT,50). % Timeout in milisec -> Also affect slaves' timeslice -define(REQTIMEOUT,1000). -define(STARTBIT,[16#5B,16#AD]). @@ -119,4 +119,4 @@ rsbusreq(Addr,Msg) -> end. start() -> - spawn(?MODULE,rsbusmon,[]).
\ No newline at end of file + spawn(?MODULE,rsbusmon,[]). diff --git a/start.es b/start.es new file mode 100755 index 0000000..1fa9302 --- /dev/null +++ b/start.es @@ -0,0 +1,7 @@ +#!/usr/bin/env escript + +trap() -> trap(). + +main(_) -> + startscript:start(), + trap(). diff --git a/startscript.erl b/startscript.erl index 2ac9ef7..8d6251e 100644 --- a/startscript.erl +++ b/startscript.erl @@ -66,7 +66,7 @@ runrange(St,Ed,Fun) -> runrange(St+1,Ed,Fun). start() -> - tcpserv:start(5575), + tcpserv:start(5576), rsbusserv:start(), eventserv:start(), devicemon:start(), |