Commit Graph

79 Commits

Author SHA1 Message Date
7b8f98cb3c Fully functioning screen code 2024-04-01 16:49:44 +02:00
47a228123e moved files around 2024-04-01 13:17:15 +02:00
c6f3c7c018 fixed screen code + added some documentation on our choices 2024-03-28 13:32:08 +01:00
Sietse Jonker
072ff99624 Merge branch 'main' into '44-als-gebruiker-wil-ik-dat-de-website-automatisch-het-aantal-nodes-dat-ik-heb-aangesloten-op-de'
# Conflicts:
#   arduino/node-code/node-code-final/node-code-final.ino
#   arduino/node-code/node-code-final/nodeCodeFinal.ino
#   arduino/node-code/node-code-final/nodeCodeHeader.h
2024-03-14 12:02:13 +01:00
Dano van den Bosch
10eee12189 Arduino oop adding functions from the original aduino code 2024-03-13 16:06:10 +01:00
Dano van den Bosch
c4880ce0e2 Added the header files to for changing the arduino code to OOP 2024-03-13 15:47:42 +01:00
Dano van den Bosch
3801b074f6 Arduino oop 2024-03-13 15:03:11 +01:00
Sietse Jonker
6c3b523208 Update webSocket message format and add classes for websockets 2024-03-13 14:44:32 +01:00
Dano van den Bosch
85a49151ac JSON format message 2024-03-13 13:07:49 +01:00
Dano van den Bosch
5d2223e5d7 Merge branch 'main' of gitlab.fdmci.hva.nl:propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59 2024-03-13 11:49:29 +01:00
Dano van den Bosch
dd6b5caa33 Begin aan OOP in arduino 2024-03-13 11:49:25 +01:00
d542da7db9 attempt to write text in full 2024-03-12 16:24:26 +01:00
Sietse Jonker
856775c2a8 Update WiFi password and handle node addresses 2024-03-08 16:46:02 +01:00
sam
60d86bc0d5 Added comments and cleanup 2024-03-08 14:25:24 +01:00
Sietse Jonker
9acd2b44a8 Add header file and refactor code 2024-03-08 13:26:23 +01:00
Sietse Jonker
3886292110 Refactor code and update websocket connection 2024-03-08 12:58:33 +01:00
Sietse Jonker
08c9bedb44 adds mac adress code to arduino folder 2024-03-08 11:38:31 +01:00
Sam
56abd5cbde removed libraryies and made delay longer 2024-03-07 19:55:02 +01:00
Sam
3b375266ee Moved libraries over 2024-03-07 19:54:48 +01:00
Sam
2351c515f3 Added function to header 2024-03-07 19:54:41 +01:00
Sam
aa6c35044e Added a function to attempt to diplay the words in full 2024-03-07 19:54:31 +01:00
Sam
d1c962f71c added so the answer text is at the bottom 2024-03-07 13:04:14 +01:00
Sam
f2964ebce8 added new function to have text automaticly at the bottom 2024-03-07 13:03:58 +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
sam
5a8e13c0d6 Added class 2024-03-06 15:46:39 +01:00
sam
284071b4ee Class creation 2024-03-06 15:46:32 +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
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
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
Sietse Jonker
bcbb8080c2 Add Arduino code for sensor data collection and websocket communication 2024-03-05 11:40:25 +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
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
sam
2389c068bf Added new script 2024-03-01 13:52:36 +01:00
Sietse Jonker
9238d9841e test commit 2024-02-28 12:09:34 +01:00
Sietse Jonker
734dca30bc fixes interval and stuff 2024-02-28 12:06:43 +01:00
sietse jonker
1d76c5ff7a fixes sgp30 sensor not displaying data 2024-02-28 09:40:06 +01:00
sietse jonker
3afc7797ab display function now executes every loop instead of 5 seconds 2024-02-28 09:24:16 +01:00
sietse jonker
b0731f739b adds last changes to code that clean it up 2024-02-27 21:55:47 +01:00
sietse jonker
dcb2f37694 finishes up code for node 2024-02-27 19:46:52 +01:00