Sietse Jonker
|
55f94387cc
|
Merge branch 'Website_websocket' into 'main'
Website websocket to main
See merge request propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59!3
|
2024-03-06 20:36:11 +01:00 |
|
Sietse Jonker
|
24164841a9
|
Merge branch 'main' into 'Website_websocket'
# Conflicts:
# arduino/node-code/node-code-final/node-code-final.ino
# web/classes.js
# web/index.html
# web/main.js
# web/styles.css
|
2024-03-06 20:35:56 +01:00 |
|
Sietse Jonker
|
c14c18deb0
|
Remove commented out code and update graph in main.js
|
2024-03-06 17:38:09 +01:00 |
|
sam
|
f4840775ed
|
Added uml
|
2024-03-06 16:05:31 +01:00 |
|
Sietse Jonker
|
63be84e287
|
Update graph colors and scale for temperature, eCO2, and TVOC
|
2024-03-06 15:59:54 +01:00 |
|
Sietse Jonker
|
199283d3e0
|
Add live graph plots for humidity, eCO2, and TVOC
|
2024-03-06 15:51:01 +01:00 |
|
sam
|
27742cfa89
|
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59
|
2024-03-06 15:46:42 +01:00 |
|
sam
|
5a8e13c0d6
|
Added class
|
2024-03-06 15:46:39 +01:00 |
|
sam
|
284071b4ee
|
Class creation
|
2024-03-06 15:46:32 +01:00 |
|
Sietse Jonker
|
8ed556d856
|
Refactor liveGraph class and updateNodeData function
|
2024-03-06 15:38:46 +01:00 |
|
Sietse Jonker
|
951fc64e6d
|
adds graph class
|
2024-03-06 15:03:47 +01:00 |
|
Sietse Jonker
|
65783ac3b6
|
Add liveGraph class and update index.html
|
2024-03-06 15:02:34 +01:00 |
|
Sietse Jonker
|
9b01523f0e
|
makes class for graphs
|
2024-03-06 15:01:20 +01:00 |
|
Dano van den Bosch
|
b971fe0b54
|
dev page documentation added to pages
|
2024-03-06 11:25:58 +01:00 |
|
Sietse Jonker
|
a2219fa03a
|
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59
|
2024-03-05 16:37:02 +01:00 |
|
Sietse Jonker
|
67d77d59d1
|
changes html and css for testing class
|
2024-03-05 16:36:58 +01:00 |
|
Sietse Jonker
|
db9c984446
|
adds class for graph
|
2024-03-05 16:36:42 +01:00 |
|
Dano van den Bosch
|
026bd92d65
|
I did it 😊
|
2024-03-05 16:03:15 +01:00 |
|
sam
|
698b3055a4
|
File creation + text centre + split array
|
2024-03-05 16:02:34 +01:00 |
|
sam
|
2b31f80655
|
File creation
|
2024-03-05 16:02:17 +01:00 |
|
sam
|
d3952306b2
|
Added reset
|
2024-03-05 16:02:12 +01:00 |
|
Dano van den Bosch
|
de1ae975a4
|
added code for muliple nodes
|
2024-03-05 14:46:43 +01:00 |
|
sam
|
f99d7b5c3d
|
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59
|
2024-03-05 14:22:43 +01:00 |
|
sam
|
21ef8604c2
|
changed asset
|
2024-03-05 14:22:40 +01:00 |
|
sam
|
e09651a90c
|
Added asset
|
2024-03-05 14:22:06 +01:00 |
|
sam
|
0886352a1c
|
added script
|
2024-03-05 14:21:57 +01:00 |
|
sam
|
307257eefc
|
Added writetext function
|
2024-03-05 14:21:47 +01:00 |
|
sam
|
fba7ada367
|
Simple button script
|
2024-03-05 14:21:35 +01:00 |
|
Sietse Jonker
|
1596f0c641
|
Fix grammatical error from dano
|
2024-03-05 14:10:52 +01:00 |
|
Dano van den Bosch
|
3ebe661de0
|
Fix node identification number in webSocket message
|
2024-03-05 14:03:10 +01:00 |
|
Sietse Jonker
|
fed0adb299
|
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59
|
2024-03-05 13:48:56 +01:00 |
|
Sietse Jonker
|
7476f98590
|
Commented out debug print statements in webSocketEvent function
|
2024-03-05 13:48:54 +01:00 |
|
Dano van den Bosch
|
db9380816c
|
added node identivication
|
2024-03-05 13:42:12 +01:00 |
|
Dano van den Bosch
|
d127a6001d
|
Add WebSocket connection error handling and JSON in to array
|
2024-03-05 13:38:09 +01:00 |
|
Sietse Jonker
|
bcbb8080c2
|
Add Arduino code for sensor data collection and websocket communication
|
2024-03-05 11:40:25 +01:00 |
|
Sietse Jonker
|
072752cec8
|
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59
|
2024-03-05 11:27:31 +01:00 |
|
Sietse Jonker
|
9193a753ce
|
Refactor survey questions and add conclusion
|
2024-03-05 11:27:29 +01:00 |
|
Dano van den Bosch
|
902031cfd5
|
Fixt arduino file location
|
2024-03-05 10:55:58 +01:00 |
|
Dano van den Bosch
|
d24744823b
|
Set the websocket data to JSON format
|
2024-03-05 10:48:15 +01:00 |
|
Bram Barbieri
|
5b26d6b844
|
Bram documentation buzzers pt 2
|
2024-03-04 15:28:05 +01:00 |
|
Bram Barbieri
|
ce24a782ed
|
Bram Documentation themperature sensors.
|
2024-03-04 14:15:16 +01:00 |
|
Sietse Jonker
|
5d9d377010
|
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59
|
2024-03-01 14:14:25 +01:00 |
|
Sietse Jonker
|
a70575d8b8
|
adds comments
|
2024-03-01 14:14:24 +01:00 |
|
Sietse Jonker
|
4db11e3035
|
adds gebruikerstest voor questions enquete
|
2024-03-01 14:14:11 +01:00 |
|
sam
|
20a5446c8c
|
Added UML
|
2024-03-01 14:09:23 +01:00 |
|
sam
|
5c59dc033c
|
Updated documentation
|
2024-03-01 14:00:45 +01:00 |
|
sam
|
ff296eefb0
|
Updated documenation
|
2024-03-01 13:56:17 +01:00 |
|
sam
|
2389c068bf
|
Added new script
|
2024-03-01 13:52:36 +01:00 |
|
sam
|
f533e1a9c1
|
Added to pages
|
2024-03-01 13:52:16 +01:00 |
|
Bram Barbieri
|
7b48a4a04e
|
standup
|
2024-03-01 11:48:30 +01:00 |
|