Programmeringsgruppe 1
/
Alarmsystem20_02_2018
klokka 15:07
Fork of AlarmsystemDel1 by
Diff: main.cpp
- Revision:
- 2:cef96d07d3cd
- Parent:
- 1:6917ec4f5e6d
- Child:
- 3:26a7b2c4bed1
diff -r 6917ec4f5e6d -r cef96d07d3cd main.cpp --- a/main.cpp Thu Jan 25 19:32:00 2018 +0000 +++ b/main.cpp Tue Jan 30 08:24:55 2018 +0000 @@ -27,10 +27,10 @@ volatile int Bryter = Servicebryter; void Alarmf(void); //Funksjon for og pluss sammen bussen til alarmene volatile int Door1_1 = 0, Door1_2 = 0, Door2_1 = 0, Door2_2 = 0, Door3_1 = 0, Door3_2 = 0, Door4_1 = 0, Door4_2 = 0; -volatile float Sone1 = Sone1 * 3.3; -volatile float Sone2 = Sone2 * 3.3; -volatile float Sone3 = Sone3 * 3.3; -volatile float Sone4 = Sone4 * 3.3; +volatile float Sone1 = _Sone1 * 3.3; +volatile float Sone2 = _Sone2 * 3.3; +volatile float Sone3 = _Sone3 * 3.3; +volatile float Sone4 = _Sone4 * 3.3; volatile int ArrSone[4] = {Sone1, Sone2, Sone3, Sone4}; volatile int DoorOne[4] = { Door1_1, Door2_1, Door3_1, Door4_1 }; volatile int DoorTwo[4] = { Door1_2, Door2_2, Door3_2, Door4_2 };