From 88b354837025e344638c883e5a2aa566e8bc51d8 Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 8 Sep 2023 10:01:12 +0200 Subject: [PATCH 1/9] uitleg toegevoegt voor lichtsensor --- docs/cheat sheet.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/cheat sheet.md b/docs/cheat sheet.md index 46230d8..a6a3c12 100644 --- a/docs/cheat sheet.md +++ b/docs/cheat sheet.md @@ -1,9 +1,10 @@ # Hardware cheat sheet -### Lichtsensor wiring + [link uitleg](https://esp32io.com/tutorials/esp32-light-sensor) +### Lichtsensor wiring + [link uitleg/bron](https://esp32io.com/tutorials/esp32-light-sensor) +zorg er voor dat de pin die je gebruikt een analoge pin is anders kan je de data niet goed lezen. de analoge pin kan je herkennen door op de [pin layout](https://knowledgebase.hbo-ict-hva.nl/1_beroepstaken/hardware_interfacing/realiseren/verwerking/esp32-s3-devkitc-1/) te kijken en te zoeken naar een pin met ABC. ![electro diagram lichtsensor](https://esp32io.com/images/tutorial/esp32-light-sensor-wiring-diagram.jpg) --- -### Humid + Temp sensor wiring + [link uitleg](https://projecthub.arduino.cc/arcaegecengiz/using-dht11-12f621) +### Humid + Temp sensor wiring + [link uitleg/bron](https://projecthub.arduino.cc/arcaegecengiz/using-dht11-12f621) Gebruik niet de code die daar staat die werkt niet. Gebruik de [officiële documentatie](https://github.com/dhrubasaha08/DHT11) van de sensor

In plaats van de 5v pin moet je de 3v3 pin gebruiken, want de esp32 S3 heeft geen 5v pin. De resistor is een 10KΩ

From a0f521441c6fb533ae05bf750ec827473747c3b8 Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 8 Sep 2023 10:54:32 +0200 Subject: [PATCH 2/9] small error correction --- docs/cheat sheet.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/cheat sheet.md b/docs/cheat sheet.md index a6a3c12..ab35f7c 100644 --- a/docs/cheat sheet.md +++ b/docs/cheat sheet.md @@ -1,6 +1,6 @@ # Hardware cheat sheet ### Lichtsensor wiring + [link uitleg/bron](https://esp32io.com/tutorials/esp32-light-sensor) -zorg er voor dat de pin die je gebruikt een analoge pin is anders kan je de data niet goed lezen. de analoge pin kan je herkennen door op de [pin layout](https://knowledgebase.hbo-ict-hva.nl/1_beroepstaken/hardware_interfacing/realiseren/verwerking/esp32-s3-devkitc-1/) te kijken en te zoeken naar een pin met ABC. +zorg er voor dat de pin die je gebruikt een analoge pin is anders kan je de data niet goed lezen. de analoge pin kan je herkennen door op de [pin layout](https://knowledgebase.hbo-ict-hva.nl/1_beroepstaken/hardware_interfacing/realiseren/verwerking/esp32-s3-devkitc-1/) te kijken en te zoeken naar een pin met ADC. ![electro diagram lichtsensor](https://esp32io.com/images/tutorial/esp32-light-sensor-wiring-diagram.jpg) --- From 1ca164a646a9110a93f106bff7ca37b70663bb07 Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 8 Sep 2023 10:55:38 +0200 Subject: [PATCH 3/9] betere variabelen en update documentatie --- arduino/sensor combo/combi/combi.ino | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/arduino/sensor combo/combi/combi.ino b/arduino/sensor combo/combi/combi.ino index ba02b9f..6b9278a 100644 --- a/arduino/sensor combo/combi/combi.ino +++ b/arduino/sensor combo/combi/combi.ino @@ -1,10 +1,11 @@ //de library van de tempratuur en vochtisheid sensor er bij pakken. +//moet je instaleren via linker tabje moet boeken en dan dht11 op te zoeke n in het zoek veld en daarna de dht11 extensie te installeren #include // LDR = 12, geeft gaan dat het variable LDR terugwijst naar 12. #define LDR 12 -//tegen DHT11 library zeggen dat we het variabel TLV willen geven en dat het de informatie van pin 18 kan halen. +//tegen DHT11 library zeggen dat we het variabel TLV(Temparatuur LuchtVochtigheid) willen geven en dat het de informatie van pin 18 kan halen. DHT11 TLV(18); @@ -17,21 +18,21 @@ void loop() { //int geeft aan dat het een geheeld nummer moet zijn, als je float gebruikt kan het ook nog decimalen hebben // eerste 2 zijn van DHT om data van af te lezen en op te slaan in het variabel //laatste is om de lichtsensor analoog af te lezen en op te slaan in een variabel - int hoomid = TLV.readHumidity(); - int temp = TLV.readTemperature(); - int analogValue = analogRead(LDR); + int Luchtvochtigheid = TLV.readHumidity(); + int Temparatuur = TLV.readTemperature(); + int Lichtsterkte = analogRead(LDR); //hier worden alle variabelen in de serial monitor uitgespuugt Serial.println("----------"); - Serial.print("temparatuur celcius: "); - Serial.println(temp); + Serial.print("Temparatuur celcius: "); + Serial.println(Temparatuur); Serial.print("vochtigheid: "); - Serial.println(hoomid); + Serial.println(Luchtvochtigheid); Serial.print("LDR reading: "); - Serial.println(analogValue); + Serial.println(Lichtsterkte); From f8fc86966527245c53824e4bdc1d0da982f47a9a Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 8 Sep 2023 11:26:57 +0200 Subject: [PATCH 4/9] documentatie toegevoegd --- arduino/licht-test/sketch_sep6a/sketch_sep6a.ino | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arduino/licht-test/sketch_sep6a/sketch_sep6a.ino b/arduino/licht-test/sketch_sep6a/sketch_sep6a.ino index 238a253..6fa2778 100644 --- a/arduino/licht-test/sketch_sep6a/sketch_sep6a.ino +++ b/arduino/licht-test/sketch_sep6a/sketch_sep6a.ino @@ -5,6 +5,8 @@ * * Tutorial page: https://arduinogetstarted.com/tutorials/arduino-light-sensor */ + + //zegt dat het variable LDR wijst naar pin 12 #define LDR 12 void setup() { // initialize serial communication at 9600 bits per second: From bb11d5920586715472288c7ff45e69339a4126fe Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 8 Sep 2023 11:27:26 +0200 Subject: [PATCH 5/9] basis van website gebouwd --- web/css.css | 38 ++++++++++++++++++++++++++++++++++++++ web/index.html | 17 +++++++++++++++-- web/serialviewer.ts | 0 web/statestiek.html | 23 +++++++++++++++++++++++ 4 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 web/css.css create mode 100644 web/serialviewer.ts create mode 100644 web/statestiek.html diff --git a/web/css.css b/web/css.css new file mode 100644 index 0000000..687697d --- /dev/null +++ b/web/css.css @@ -0,0 +1,38 @@ + +body { + display: flex; + flex-direction: column; + min-height: 100vh; +} + +html { + background-color: rgb(71, 68, 68); +} + +div { + color: white; +} +.menubalk a { + float: left; + color: #f2f2f2; + text-align: center; + padding: 14px 16px; + text-decoration: none; + font-size: 17px; +} + +.menubalk a:hover { + background-color: rgb(199, 71, 71); + color: black; +} + +.menubalk a.active { + background-color: #aa0404; + color: white; +} + +.menubalk { + background-color: #333; + overflow: hidden; +} + diff --git a/web/index.html b/web/index.html index 225f9dc..39f6416 100644 --- a/web/index.html +++ b/web/index.html @@ -3,9 +3,22 @@ - Document + + Weerstation + + + -

test

+
+

Dit is een weerstation website.

+

Deze website weergeeft statestieke informatie van een weerstation

+
\ No newline at end of file diff --git a/web/serialviewer.ts b/web/serialviewer.ts new file mode 100644 index 0000000..e69de29 diff --git a/web/statestiek.html b/web/statestiek.html new file mode 100644 index 0000000..70c3c31 --- /dev/null +++ b/web/statestiek.html @@ -0,0 +1,23 @@ + + + + + + + Weerstation + + + + + +
+ +
+ + \ No newline at end of file From 9379297d29bd2832d30885bc5b4a71997970cc7e Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 8 Sep 2023 12:36:56 +0200 Subject: [PATCH 6/9] config generation --- tsconfig.json | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 tsconfig.json diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..e075f97 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,109 @@ +{ + "compilerOptions": { + /* Visit https://aka.ms/tsconfig to read more about this file */ + + /* Projects */ + // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ + // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ + // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ + // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ + // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ + // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ + + /* Language and Environment */ + "target": "es2016", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ + // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ + // "jsx": "preserve", /* Specify what JSX code is generated. */ + // "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */ + // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ + // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ + // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ + // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ + // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ + // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ + // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ + // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ + + /* Modules */ + "module": "commonjs", /* Specify what module code is generated. */ + // "rootDir": "./", /* Specify the root folder within your source files. */ + // "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */ + // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ + // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ + // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ + // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ + // "types": [], /* Specify type package names to be included without being referenced in a source file. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ + // "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */ + // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ + // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ + // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ + // "resolveJsonModule": true, /* Enable importing .json files. */ + // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ + // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ + + /* JavaScript Support */ + // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */ + // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ + // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ + + /* Emit */ + // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ + // "declarationMap": true, /* Create sourcemaps for d.ts files. */ + // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ + // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ + // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ + // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ + // "outDir": "./", /* Specify an output folder for all emitted files. */ + // "removeComments": true, /* Disable emitting comments. */ + // "noEmit": true, /* Disable emitting files from a compilation. */ + // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ + // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ + // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ + // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ + // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ + // "newLine": "crlf", /* Set the newline character for emitting files. */ + // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ + // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ + // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ + // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ + // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ + // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ + + /* Interop Constraints */ + // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ + // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ + // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ + "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */ + // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ + "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */ + + /* Type Checking */ + "strict": true, /* Enable all strict type-checking options. */ + // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ + // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ + // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ + // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ + // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ + // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ + // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ + // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ + // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ + // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ + // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ + // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ + // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ + // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ + // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ + // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ + // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ + // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ + + /* Completeness */ + // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ + "skipLibCheck": true /* Skip type checking all .d.ts files. */ + } +} From bb8703c2b1bc8bf8f9e411fa92a5faf6fc2d73ac Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 8 Sep 2023 12:37:07 +0200 Subject: [PATCH 7/9] documentatie aangemaakt --- docs/webserial.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 docs/webserial.md diff --git a/docs/webserial.md b/docs/webserial.md new file mode 100644 index 0000000..689e5d1 --- /dev/null +++ b/docs/webserial.md @@ -0,0 +1,4 @@ +javascript of typescript gebruiken voor serialport +# Webserial +--- +Om webserial te kunnen lezen op mijn website ga ik Typescript gebruiken. Typescript word vaak een betere javascript genoemd. \ No newline at end of file From 0d9eda4bf6ef7e6afb29488162af906464d377ed Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 8 Sep 2023 12:37:20 +0200 Subject: [PATCH 8/9] script update --- web/serialviewer.js | 50 +++++++++++++++++++++++++++++++++++++++++++++ web/serialviewer.ts | 38 ++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 web/serialviewer.js diff --git a/web/serialviewer.js b/web/serialviewer.js new file mode 100644 index 0000000..2291e76 --- /dev/null +++ b/web/serialviewer.js @@ -0,0 +1,50 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +// main.ts +const connectButton = document.getElementById('connectButton'); +const outputTextarea = document.getElementById('output'); +let port = null; +function connect() { + return __awaiter(this, void 0, void 0, function* () { + try { + port = yield navigator.serial.requestPort(); + yield port.open({ baudRate: 9600 }); // Adjust baud rate as per your device settings + outputTextarea.value = ''; // Clear previous output + readLoop(); + connectButton.disabled = true; + } + catch (error) { + console.error('Error connecting to the serial port:', error); + } + }); +} +function readLoop() { + return __awaiter(this, void 0, void 0, function* () { + while (port && port.readable) { + try { + const reader = port.readable.getReader(); + while (true) { + const { value, done } = yield reader.read(); + if (done) { + reader.releaseLock(); + break; + } + // Display the received data + outputTextarea.value += new TextDecoder().decode(value); + } + } + catch (error) { + console.error('Error reading from the serial port:', error); + } + } + }); +} +connectButton.addEventListener('click', connect); diff --git a/web/serialviewer.ts b/web/serialviewer.ts index e69de29..dc9709f 100644 --- a/web/serialviewer.ts +++ b/web/serialviewer.ts @@ -0,0 +1,38 @@ +// main.ts +const connectButton = document.getElementById('connectButton') as HTMLButtonElement; +const outputTextarea = document.getElementById('output') as HTMLTextAreaElement; + +let port: SerialPort | null = null; + +async function connect() { + try { + port = await navigator.serial.requestPort(); + await port.open({ baudRate: 9600 }); // Adjust baud rate as per your device settings + outputTextarea.value = ''; // Clear previous output + readLoop(); + connectButton.disabled = true; + } catch (error) { + console.error('Error connecting to the serial port:', error); + } +} + +async function readLoop() { + while (port && port.readable) { + try { + const reader = port.readable.getReader(); + while (true) { + const { value, done } = await reader.read(); + if (done) { + reader.releaseLock(); + break; + } + // Display the received data + outputTextarea.value += new TextDecoder().decode(value); + } + } catch (error) { + console.error('Error reading from the serial port:', error); + } + } +} + +connectButton.addEventListener('click', connect); From 0a47a3346302af57db06fc1921f808d7ec0c9f15 Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 8 Sep 2023 12:37:36 +0200 Subject: [PATCH 9/9] website update for serial port acces --- web/statestiek.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/statestiek.html b/web/statestiek.html index 70c3c31..f459d4f 100644 --- a/web/statestiek.html +++ b/web/statestiek.html @@ -16,8 +16,9 @@ -
- -
+ + + + \ No newline at end of file