Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Sebastián Collado Montañez
/
proyecto-micro
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
c270c965
authored
Dec 18, 2017
by
Sebastián Collado Montañez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
limpieza codigo
parent
61bc4be9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
7 deletions
public/assets/main.js
webserver.js
public/assets/main.js
View file @
c270c965
//Variables
//Variables
var
socket
=
io
();
//socket.io
-client and connect
var
socket
=
io
();
//socket.io
var
timeCloseOpen
=
10000
;
var
timeCloseOpen
=
10000
;
var
estado
=
0
;
var
estado
=
0
;
...
...
webserver.js
View file @
c270c965
...
@@ -43,10 +43,8 @@ trigger.digitalWrite(0);
...
@@ -43,10 +43,8 @@ trigger.digitalWrite(0);
startTick
=
tick
;
startTick
=
tick
;
}
else
{
}
else
{
endTick
=
tick
;
endTick
=
tick
;
diff
=
(
endTick
>>
0
)
-
(
startTick
>>
0
);
// Unsigned 32 bit arithmetic
diff
=
(
endTick
>>
0
)
-
(
startTick
>>
0
);
//console.log(diff / 2 / MICROSECDONDS_PER_CM);
console
.
log
(
diff
/
2
/
MICROSECDONDS_PER_CM
);
if
((
diff
/
2
/
MICROSECDONDS_PER_CM
)
<
10.0
){
if
((
diff
/
2
/
MICROSECDONDS_PER_CM
)
<
10.0
){
obstaculo
=
true
;
obstaculo
=
true
;
}
else
{
}
else
{
...
@@ -129,7 +127,7 @@ server.listen('8080');
...
@@ -129,7 +127,7 @@ server.listen('8080');
var
estadoPuerta
=
0
;
//cerrada
var
estadoPuerta
=
0
;
//cerrada
io
.
sockets
.
on
(
'connection'
,
function
(
socket
)
{
//
WebSocket Connection
io
.
sockets
.
on
(
'connection'
,
function
(
socket
)
{
//
Conexion WebSocket
console
.
log
(
"Cliente conectado"
);
console
.
log
(
"Cliente conectado"
);
...
@@ -137,7 +135,7 @@ io.sockets.on('connection', function (socket) { // WebSocket Connection
...
@@ -137,7 +135,7 @@ io.sockets.on('connection', function (socket) { // WebSocket Connection
socket
.
emit
(
"inicializacion"
,
Number
(
estadoPuerta
));
socket
.
emit
(
"inicializacion"
,
Number
(
estadoPuerta
));
//Escucha la orden del cliente
//Escucha la orden del cliente
socket
.
on
(
'emisionOrden'
,
function
(
data
)
{
//get light switch status from client
socket
.
on
(
'emisionOrden'
,
function
(
data
)
{
var
ordenRecibida
=
data
;
var
ordenRecibida
=
data
;
...
...
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