diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1772bee..abbc216 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,5 +24,24 @@ pages:
- "mkdocs.yml"
- ".gitmodules"
+game:
+ stage: deploy
+ tags:
+ - hva
+ script:
+ - time cp -rf web public
+ - time cp -rf webdev public
+
+ artifacts:
+ paths:
+ - public
+ rules:
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+ changes:
+ - web/**/*"
+ - "webdev/**/*"
+ - ".gitmodules"
+
+
variables:
GIT_SUBMODULE_STRATEGY: recursive
\ No newline at end of file
diff --git a/docs/brainstorm/task flow.md b/docs/brainstorm/task flow.md
index d08a97c..1c3839e 100644
--- a/docs/brainstorm/task flow.md
+++ b/docs/brainstorm/task flow.md
@@ -55,7 +55,7 @@ Vraag: Wat denk je dat je moet doen en welke functies verwacht je in het spel?
* De boss schiet en de speler moet ontwijken
* Speler kan terug schieten
* Als je de boss aantikt krijgt hij damage of gaat hij dood
-* Submit save knop voor score
+* Submit save knop bij scoren invoeren zodat je zeker weet dat de score is opgestuurd
* tussenzijnde scores laten zien met jouw eigen scoren wanneer je het opzoekt
#### Persoon 2:
diff --git a/webdev/Serial.js b/webdev/Serial.js.old
similarity index 98%
rename from webdev/Serial.js
rename to webdev/Serial.js.old
index 5b163e5..1980c8b 100644
--- a/webdev/Serial.js
+++ b/webdev/Serial.js.old
@@ -60,8 +60,6 @@ async function readLoop() {
}
}
-export {booleanArray};
-
// Sluit de poort
async function disconnect() {
await reader.cancel();
diff --git a/webdev/game.js b/webdev/game.js
index 3e3b4e0..e1ff54e 100644
--- a/webdev/game.js
+++ b/webdev/game.js
@@ -1,6 +1,75 @@
+let port;
+let reader;
+const decoder = new TextDecoder("utf-8");
+let readibleoutput = 0;
+
+// Request a port and open a connection.
+async function connect() {
+ //vraag aan de browser om een serial port te selecteren
+ port = await navigator.serial.requestPort();
+ await port.open({ baudRate: 9600 });
+ reader = port.readable.getReader();
+ console.log("Port is open!");
+ readLoop()
+}
+
+// Read data from serial port
+async function readLoop() {
+ let buffer = [];
+
+ // loop until reader.cancel() is called
+ while (true) {
+ // Wait for data
+ const { value, done } = await reader.read();
+
+
+ for (let iByte = 0; iByte < value.length; iByte++) {
+ let singleByte = value[iByte];
+ //functie maken er van met boolean!!!
+ if (singleByte != 10) {
+ buffer.push(singleByte);
+ }
+ else {
+ let sensorString = decoder.decode(new Uint8Array(buffer));
+ //Put all data in a json Array and parse it to a boolean array
+ try {
+ // Parse the incoming data as JSON
+ // "replace(/'/g, '\"')" replaces all single quotes with double quotes with use of regular expressions. So we can use Jsonparse to parse it into a booleanArray
+ let SerialArray = JSON.parse(sensorString.replace(/'/g, '"'));
+ // Ensure SerialArray is an array
+ if (Array.isArray(SerialArray)) {
+ //Convert the array of strings to a boolean array
+ //When a bit is 1 it becomes true, when a bit is 0 it becomes false
+ let booleanArray = SerialArray.map(bit => bit == '1');
+ console.log(booleanArray);
+ } else {
+ console.error("Dit is geen Array");
+ }
+ } catch (e) {
+ console.log("json niet geparserd");
+ }
+
+ buffer = [];
+ }
+ if (done) {
+ console.log('[readLoop] DONE', done);
+ reader.releaseLock();
+ break;
+ }
+ }
+ }
+
+}
+// Sluit de poort
+async function disconnect() {
+ await reader.cancel();
+ await port.close();
+ console.log("Port is closed!");
+}
+//--------------------Game--------------------
+
let Playerposx = 500;
let Playerposy = 300;
-import {booleanArray} from './Serial.js';
if (booleanArray) {
if (booleanArray[1]) {
@@ -30,4 +99,6 @@ function draw(){
// draw a circle at the mouse position
circle(Playerposx, Playerposy, 50);
-}
\ No newline at end of file
+}
+//test
+//test2
\ No newline at end of file
diff --git a/webdev/index.html b/webdev/index.html
index f1ae588..8315834 100644
--- a/webdev/index.html
+++ b/webdev/index.html
@@ -9,7 +9,6 @@
-