Skip to content

Spin, Reactor y FSM #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DavidMol wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Spin, Reactor y FSM #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions Ejercicios Spin/Ej4.pml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/* Ejercicio 4*/

byte button=0;

/*estado 0 es luz off y estado 1 es luz on*/
byte state;

active proctype light(){
state=0;
do
:: (state==0) -> atomic{
if
:: (button) -> state=1; printf("enciende"); button=0;
fi
}
:: (state==1) -> atomic{
if
:: (button) -> state=0; printf("apaga"); button=0;
fi
}
od
}

active proctype entorno(){
do
::true -> button=1
::true -> skip
od;
}

ltl spec1{
[]( ((state==0)&&button) -> <> (state==1))
}

ltl spec2{
[]( ((state==1)&&button) -> <> (state==0))
}
52 changes: 52 additions & 0 deletions Ejercicios Spin/Ej5.pml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/* Ejercicio 5*/

byte timer=0;
byte button=0;
byte presencia=0;

/*estado 0 es luz off y estado 1 es luz on*/
byte state;

active proctype light(){
state=0;
do
:: (state==0) -> atomic{
if
:: button -> state=1; printf("enciende"); button=0;
:: presencia -> state=1; printf("enciende"); presencia=0;
fi
}
:: (state==1) -> atomic{
if
:: button&&!timer -> state=0; printf("apaga"); button=0;
:: timer&&!button -> state=0; printf("apaga"); timer=0;
:: timer&&button -> state=0; printf("apaga"); button=0; timer=0;
fi
}
od
}

active proctype entorno(){
do
::true -> button=1
::true -> presencia=1
::true -> timer=1;
::true -> skip
od
}

ltl spec1{
[]( presencia -> <>(state==1))
}

ltl spec2{
[]( (state==1&&button) -> <>(state==0))
}

ltl spec3{
[]( (state==1&&timer) -> <>(state==0))
}

ltl spec4{
[]( ((state==0)&&button) -> <>(state==1))
}
72 changes: 72 additions & 0 deletions Ejercicios Spin/Ej6_A.pml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
/* Ejercicio 6*/

byte timer=0;
byte button=0;
byte presencia=0;
byte alarma_EN=0;

/*estado 0 es luz off, estado 1 es luz on y estado 2 es alarma on*/
byte state;

active proctype light(){
state=0;
do
:: (state==0) -> atomic{
if
:: button -> state=1; printf("enciende"); button=0;
:: presencia&&(!alarma_EN) -> state=1; printf("enciende"); presencia=0;
:: presencia&&alarma_EN -> state=2; printf("enciende"); printf("alarma"); presencia=0;
fi
}
:: (state==1) -> atomic{
if
:: button&&!timer -> state=0; printf("apaga"); button=0;
:: timer&&!button -> state=0; printf("apaga"); timer=0;
:: timer&&button -> state=0; printf("apaga"); button=0; timer=0;
:: (presencia&&alarma_EN&&!button&&!timer) -> state=2; printf("enciende"); printf("alarma"); presencia=0;
:: (presencia&&!alarma_EN&&!button&&!timer) -> state=1; printf("enciende"); presencia=0;
fi
}
:: (state==2) -> atomic{
if
:: !alarma_EN -> state=0; printf("fin alarma");
fi
}

od
}

active proctype entorno(){
do
::true -> timer=1;
::true -> button=1
::true -> presencia=1
::true -> alarma_EN=1
::true -> alarma_EN=0
::true -> skip
od
}

ltl spec1{
[]( ((state==1)&&(button)) -> <>(state==0))
}

ltl spec2{
[]( (state==1&&button) -> <>(state==0))
}

ltl spec3{
[]( (state==1&&timer) -> <>(state==0))
}

ltl spec4{
[]( ((state==1)&&(presencia&&alarma_EN&&!button&&!timer))) -> <>(state==2))
}

ltl spec5{
[]( ((state==1)&&(presencia&&!alarma_EN&&!button&&!timer)) -> <>(state==1))
}

ltl spec6{
[]( ((state==2)&&!alarma_EN) -> <>(state==0))
}
62 changes: 62 additions & 0 deletions Ejercicios Spin/Ej6_B.pml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/* Ejercicio 6*/

byte timer=0;
byte button=0;
byte presencia=0;
byte alarma_EN=0;

/*estado 0 es luz off, estado 1 es luz on y estado 2 es luz on y alarma on*/
byte state;

active proctype light(){
state=0;
do
:: (state==0) -> atomic{
if
:: button -> state=1; printf("enciende"); button=0;
:: presencia&&(!alarma_EN) -> state=1; printf("enciende"); presencia=0;
:: presencia&&alarma_EN -> state=2; printf("enciende"); printf("alarma"); presencia=0;
fi
}
:: (state==1) -> atomic{
if
:: (button||timer) && (!presencia) -> state=0; printf("apaga"); button=0;
:: (presencia&&alarma_EN) -> state=2; printf("enciende"); printf("alarma"); presencia=0;
:: (presencia&&(!alarma_EN)) -> state=1; printf("enciende"); presencia=0;
fi
}
:: (state==2) -> atomic{
if
:: !alarma_EN -> state=0; printf("fin alarma");
fi
}

od
}

active proctype entorno(){
do
::true -> timer=1;
::true -> button=1
::true -> presencia=1
::true -> alarma_EN=1
::true -> alarma_EN=0
::true -> skip
od
}

ltl spec1{
[]( ((state==1)&&(button||timer)&&(!presencia)) -> <>(state==0))
}

ltl spec2{
[]( ((state==1)&&(presencia&&alarma_EN))) -> <>(state==2))
}

/*ltl spec3{
[]( ((state==1)&&(presencia&&(!alarma_EN))) -> <>(state==1))
}*/

ltl spec4{
[]( ((state==2)&&(!alarma_EN)) -> <>(state==0))
}
102 changes: 102 additions & 0 deletions Ejercicios Spin/Ej7.pml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
/* Ejercicio 7*/

byte timer=0;
byte button=0;
byte presencia=0;
byte alarma_EN=0;

int code_1=0;
int code_2=0;
int code_3=0;

int pass_1=5;
int pass_2=3;
int pass_3=8;

int count=0;

/*estado 0 es luz off, estado 1 es luz on, estado 2 es alarma on y estado 3 es introduccion de codigo*/
byte state;

active proctype light(){
state=0;
do
:: (state==0) -> atomic{
if
:: button -> state=1; printf("enciende"); button=0;
:: presencia&&(!alarma_EN) -> state=1; printf("enciende"); presencia=0;
:: presencia&&alarma_EN -> state=2; printf("enciende"); printf("alarma"); presencia=0; count=0; code_1=0; code_2=0; code_3=0;
fi
}
:: (state==1) -> atomic{
if
:: button&&!timer -> state=0; printf("apaga"); button=0;
:: timer&&!button -> state=0; printf("apaga"); timer=0;
:: timer&&button -> state=0; printf("apaga"); button=0; timer=0;
:: (presencia&&alarma_EN&&!button&&!timer) -> state=2; printf("enciende"); printf("alarma"); presencia=0; count=0; code_1=0; code_2=0; code_3=0;
:: (presencia&&!alarma_EN&&!button&&!timer) -> state=1; printf("enciende"); presencia=0;
fi
}
:: (state==2) -> atomic{
if
:: !alarma_EN -> state=0; printf("fin alarma");
:: button&&count==0 -> state=3; printf("introducir digito 1"); code_1++;
:: button&&count==1 -> state=3; printf("introducir digito 2"); code_2++;
:: button&&count==2 -> state=3; printf("introducir digito 3"); code_3++;
fi
}
:: (state==3) -> atomic{
if
:: button&&count==0 -> state=3; printf("pulsado"); button=0; code_1++;
:: button&&count==1 -> state=3; printf("pulsado"); button=0; code_2++;
:: button&&count==2 -> state=3; printf("pulsado"); button=0; code_3++;
:: timer&&count<3 -> state=2; printf("digito introducido"); count++;
:: timer&&count>=3&&code_1==pass_1&&code_2==pass_2&&code_3==pass_3 -> state=0; printf("fin alarma"); count=0; code_1=0; code_2=0; code_3=0;
:: timer&&count>=3&&(code_1!=pass_1||code_2!=pass_2||code_3!=pass_3) -> state=2; printf("codigo incorrecto"); count=0; code_1=0; code_2=0; code_3=0;
fi
}
od
}

active proctype entorno(){
do
::true -> timer=1
::true -> button=1
::true -> presencia=1
::true -> alarma_EN=1
::true -> alarma_EN=0
::true -> skip
od
}

ltl spec1{
[]( ((state==1)&&(button)) -> <>(state==0))
}

ltl spec2{
[]( (state==1&&button) -> <>(state==0))
}

ltl spec3{
[]( (state==1&&timer) -> <>(state==0))
}

ltl spec4{
[]( ((state==1)&&(presencia&&alarma_EN&&!button&&!timer)) -> <>(state==2))
}

ltl spec5{
[]( ((state==1)&&(presencia&&!alarma_EN&&!button&&!timer)) -> <>(state==1))
}

ltl spec6{
[]( ((state==2)&&!alarma_EN) -> <>(state==0))
}

ltl spec7{
[]( ((state==3)&&count>=3&&code_1==pass_1&&code_2==pass_2&&code_3==pass_3) -> <>(state==2))
}

ltl spec8{
[]( ((state==3)&&count>=3&&(code_1!=pass_1||code_2!=pass_2||code_3!=pass_3)) -> <>(state==3))
}
14 changes: 4 additions & 10 deletions fsm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
CC=gcc
CFLAGS=-g -Wall -ansi -O -I. -DNDEBUG
LDFLAGS=-L.
LDLIBS=-lwiringPi
CFLAGS=-g -Wall -O -I. -DNDEBUG

all: libwiringPi.a main interruptor
all: main

main: main.o fsm.o
interruptor: interruptor.o fsm.o
main: main.o reactor.o codigo_alarma.o principal.o timeval_helper.o fsm.o

clean:
$(RM) *.o *~ main interruptor libwiringPi.a

libwiringPi.a: wiringPi.o
ar rcs $@ $^
$(RM) *.o *~ main

Loading