Smikkelbakje/J1B3-Sensor-boxes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59

Browse Source
This commit is contained in:
Sam Hos
2024-03-12 19:48:50 +01:00
parent 4fd0badd3c 15f897f4d9
commit 8da5b9f215
8 changed files with 246 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arduino/Screen code/Screen-code-full/Screen-code-full.ino
View File

@@ -39,5 +39,5 @@ void loop() {
// writeText(Answer[0], 2, 50, 300, 4000); // writeText(Answer[0], 2, 50, 300, 4000);
displayText.writeText(Question[i], 3, 0, 0, 0, true, false); displayText.writeText(Question[i], 3, 0, 0, 0, true, false);
displayText.writeText(Answer[i], 3, 0, 200, 0, true, true); displayText.writeText(Answer[i], 3, 0, 200, 0, true, true);
delay(20000); delay(2000);
} }

79
arduino/Screen code/Screen-code-full/displayText.cpp
View File

@@ -11,14 +11,15 @@ void DisplayText::writeText(char* text, int size, int posX, int posY, int screen
if (center) { if (center) {
posX = centerText(text); posX = centerText(text);
} }
if (bottom) { // if (bottom) {
posY = bottomText(text); // posY = bottomText(text);
} // }
tft.setCursor(posX, posY); tft.setCursor(posX, posY);
tft.setTextSize(size); tft.setTextSize(size);
printWordsFull(text); printWordsFull(text);
delay(screenTime); delay(screenTime);
} }
//to center the text when enabled in the public function //to center the text when enabled in the public function
int DisplayText::centerText(char* text) { int DisplayText::centerText(char* text) {
int16_t x1, y1; int16_t x1, y1;
@@ -27,49 +28,49 @@ int DisplayText::centerText(char* text) {
int x = (tft.width() - w) / 2; int x = (tft.width() - w) / 2;
return x; return x;
} }
//to dijsplay the text at the bottom when enabled in the public function
int DisplayText::bottomText(char* text) { // //to display the text at the bottom when enabled in the public function
int16_t x1, y1; // int DisplayText::bottomText(char* text) {
uint16_t w, h; // int16_t x1, y1;
tft.getTextBounds(text, 0, 0, &x1, &y1, &w, &h); // uint16_t w, h;
int y = (tft.height() - h); // tft.getTextBounds(text, 0, 0, &x1, &y1, &w, &h);
return y; // int y = (tft.height() - h);
} // return y;
// }
//attempt to write the text out in full (wip) //attempt to write the text out in full (wip)
void DisplayText::printWordsFull(char* text) { void DisplayText::printWordsFull(char* text) {
const int screenWidth = 320; // replace with your TFT display width
char* textArray[100]; const int lineHeight = 22; // replace with your text line height
int i = 0;
//copy the text into a variable so the string can be re-used later
char* textCopy = strdup(text);
//split the text into words and put them into a array
char* word = strtok(text, " "); char* word = strtok(text, " ");
char line[100] = "";
int lineCount = 0;
while (word != NULL) { while (word != NULL) {
textArray[i] = word; char tempLine[100];
word = strtok(NULL, " "); strcpy(tempLine, line);
i++; strcat(tempLine, word);
} strcat(tempLine, " ");
int lineWidth = 0; int16_t x1, y1;
int maxLineWidth = 320; // replace with the width of your TFT display uint16_t w, h;
int charWidth = 11; // replace with the width of your characters tft.getTextBounds(tempLine, 0, 0, &x1, &y1, &w, &h);
for (int j = 0; j < i; j++) {
//count the amount of letters in the word
int wordLength = strlen(textArray[j]);
// If the word won't fit on the current line, move to the next line if (w > screenWidth && strlen(line) > 0) {
if (lineWidth + wordLength * charWidth > maxLineWidth) { tft.setCursor(0, lineHeight * lineCount);
tft.println(); tft.println(line);
//reset lineWidth lineCount++;
lineWidth = 0; strcpy(line, word);
strcat(line, " ");
} else {
strcpy(line, tempLine);
} }
//print the text
tft.print(textArray[j]);
tft.print(" ");
lineWidth += (wordLength + 1) * charWidth; // +1 for the space
}
//removes textCopy out of the memory
free(textCopy);
word = strtok(NULL, " ");
}
// print the last line
tft.setCursor(0, lineHeight * lineCount);
tft.println(line);
} }

2
arduino/Screen code/Screen-code-full/displayText.h
View File

@@ -8,7 +8,7 @@ class DisplayText {
private: private:
Adafruit_ST7796S_kbv& tft; Adafruit_ST7796S_kbv& tft;
int centerText(char* text); int centerText(char* text);
int bottomText(char* text); // int bottomText(char* text);
void printWordsFull(char* text); void printWordsFull(char* text);
public: public:

348
docs/LearningProcessBram/Sprint1/FirstDocumentation.md
View File

@@ -1,193 +1,235 @@
## Bram's Learning Curve ## Bram's Learning Curve
Here i post my progress on learning and mastering arduino. I originally did the Gamedevelopment study but decided to switch to "Technische Informatica". That is why i need to learn everything from scratch, and everything is new to me.
This is the reason that i made these documents, in order to track my progression in this new study.
Here I post my progress on learning and mastering Arduino. I originally did the Game development study but decided to switch to "Technische Informatica". That is why I need to learn everything from scratch, and everything is new to me.
This is the reason that I made these documents, in order to track my progression in this new study.
### Buzzer ### Buzzer
For one of my first projects I wanted to learn how to use a buzzer with different notes. For one of my first projects, I wanted to learn how to use a buzzer with different notes.
To achieve this, i went on a search accross sites to see how i can use frequenties to make different sounds. To achieve this, I went on a search across sites to see how I can use frequencies to make different sounds.
Then i came accross a teaching site (https://www.codingkids.nl/arduino-buzzer.html) that taught me the language to communicate to the buzzer what frequenties to use. This way i can make any sound come out of this simple buzzer. Then I came across a teaching site (https://www.codingkids.nl/arduino-buzzer.html) that taught me the language to communicate to the buzzer what frequencies to use. This way I can make any sound come out of this simple buzzer.
### Arduino Video ### Arduino Video
I watched a video about using arduino and took alot op notes along the way. I watched a video about using Arduino and took a lot of op notes along the way.
The link is: (https://www.youtube.com/watch?v=BLrHTHUjPuw). The link is: (https://www.youtube.com/watch?v=BLrHTHUjPuw).
\/\/arduino information: \/\/Arduino information:
\/pinnumber(locatie, in-/output) \/pinnumber(locatie, in-/output)
\/digitalwrite(locatie, high/low) \/digitalwrite(locatie, high/low)
\/delay(time in millisec) \/delay(time in millisec)
\/int... <- variable \/int... <- variable
\/with a decimal its a double -> 1,2
\/a character is a char -> "a"
\/\/serial communications: \/with a decimal its a double -> 1,2
\/setup:
Serial.begin(9600) -> the text speed
Serial.sprintLn(text)
\/Loop: \/a character is a char -> "a"
Serial.print("text")
Serial.printLn(....) -> variable because no "
\/Ctrl + shift + M = serial monitor. \/\/serial communications:
The text speed needs to be the same as given.
\/\/If Statements: \/setup:
if(condition){ Serial.begin(9600) -> the text speed
action Serial.sprintLn(text)
}else{
action
}
\/&& = "and" \/Loop:
\/|| = "or" Serial.print("text")
Serial.printLn(....) -> variable because no "
\/\/For loops: \/Ctrl + shift + M = serial monitor.
For(int*i; i <= 10 ; i++){ The text speed needs to be the same as given.
serial.print(i)
}
\/The fading of led's: \/\/If Statements:
examples, basics, fade
\/ servo's if(condition){
examples, servo, sweep
### Linux and raspberryPI. action
To gain more knowledge about linux, i first asked my class mates if they could get me started.
They showed me how to gain acces to a server, and told me how to navigate through files.
By doing this i got taught the following commands:
~ $ 'ls -la' = show file / volders }else{
~ $ 'top' = see currently running programs
~ $ 'cd ' = change directory
~ $ 'mkdir name' = make directory
~ $ 'touch name' = make file
~ $ 'ping ip addres'
~ $ 'ssh username@ip address' = open ssh connection.
action
### Air, temperature, and all sort of stuff. }
After the linux coding i decided to take a step back and began gaining experience with sensors.
I began trying to make our group project's "node" for myself.
I did this by using one of the main sensors and tried programing it in myself.
I used this website for the information and for the right library:(https://randomnerdtutorials.com/esp32-dht11-dht22-temperature-humidity-sensor-arduino-ide/).
Aside from the website i used my teammates for help where it was needed.
I wanted to make my own spin on the original design by including a button to activate the sensor and an LED to show if its on.
The rest of the tutorial was clear and worked like a charm.
the code used looks like this:
```
#include "DHT.h"
#define DHTPIN 4 \/&& = "and"
#define DHTTYPE DHT11
DHT dht(DHTPIN, DHTTYPE); \/|| = "or"
void setup() { \/\/For loops:
Serial.begin(9600);
Serial.println(F("DHTxx test!"));
dht.begin();
}
void loop() { For(int*i; i <= 10 ; i++){
delay(2000);
float h = dht.readHumidity();
float t = dht.readTemperature();
float f = dht.readTemperature(true);
if (isnan(h) || isnan(t) || isnan(f)) { serial.print(i)
Serial.println(F("Failed to read from DHT sensor!"));
return;
}
float hif = dht.computeHeatIndex(f, h); }
float hic = dht.computeHeatIndex(t, h, false);
Serial.print(F("Humidity: ")); \/The fading of led's:
Serial.print(h);
Serial.print(F("% Temperature: ")); examples, basics, fade
Serial.print(t);
Serial.print(F("°C ")); \/ servo's
Serial.print(f);
Serial.print(F("°F Heat index: ")); examples, servo, sweep
Serial.print(hic);
Serial.print(F("°C ")); ### Linux and raspberry PI.
Serial.print(hif);
Serial.println(F("°F")); To gain more knowledge about Linux, I first asked my classmates if they could get me started.
}
``` They showed me how to gain access to a server and told me how to navigate through files.
And The fysical board looks like this:
![Fysical DHT11 board off](<assets/DHT11 state 1.jpg>) By doing this I got taught the following commands:
And here it looks in action:
![fysical DHT11 board on](<assets/DHT11 state 2.jpg>) ~ $ 'ls -la' = show file / folders
Later on i could expand this code and the fysical product to include the rest of the sensors.
~ $ 'top' = see currently running programs
~ $ 'cd ' = change directory
~ $ 'mkdir name' = make directory
~ $ 'touch name' = make file
~ $ 'ping ip addres'
~ $ 'ssh username@ip address' = open ssh connection.
### Air, temperature, and all sort of stuff.
After the Linux coding I decided to take a step back and began gaining experience with sensors.
I began trying to make our group project's "node" for myself.
I did this by using one of the main sensors and tried programing it myself.
I used this website for the information and for the right library:(https://randomnerdtutorials.com/esp32-dht11-dht22-temperature-humidity-sensor-arduino-ide/).
Aside from the website I used my teammates for help where it was needed.
I wanted to make my own spin on the original design by including a button to activate the sensor and an LED to show if its on.
The rest of the tutorial was clear and worked like a charm.
the code used looks like this:
### Buzzers .pt 2
I found out how to make multiple buzzers go off with the press of one button and increase as mutch as there are pins.
I tried to not look up anything for this one, but did ask questions form time to time.
I designed it to work with scaning if there is and input and then output this signal to activate the buzzers.
This output signal can activate over multiple pins so this one button can set off all sorts of stuff.
The code is short and simple:
``` ```
int button = 20; #include "DHT.h"
int buzzerone = 12; #define DHTPIN 4
int buzzertwo = 11; #define DHTTYPE DHT11
DHT dht(DHTPIN, DHTTYPE);
void setup() { void setup() {
// put your setup code here, to run once: //the serial port:
pinMode(button, INPUT); Serial.begin(9600);
pinMode(buzzerone, OUTPUT);
pinMode(buzzertwo, OUTPUT);
}
void loop() { //the initial test if the code works
Serial.println(F("DHTxx test!"));
if(digitalRead(button) == HIGH){ //the library start
digitalWrite(buzzerone, HIGH); dht.begin();
digitalWrite(buzzertwo, HIGH); }
}else{
digitalWrite(buzzerone, LOW);
digitalWrite(buzzertwo, LOW);
} void loop() {
} delay(2000);
//a float has decimal numbers and the library reads the measurements.
float h = dht.readHumidity();
float t = dht.readTemperature();
float f = dht.readTemperature(true);
//isnan = there is no reading , the || is "or"
if (isnan(h) || isnan(t) || isnan(f)) {
Serial.println(F("Failed to read from DHT sensor!"));
return;
}
float hif = dht.computeHeatIndex(f, h);
float hic = dht.computeHeatIndex(t, h, false);
//all serial.ptint's send stuff to the serial board to showcase.
Serial.print(F("Humidity: "));
Serial.print(h);
Serial.print(F("% Temperature: "));
Serial.print(t);
Serial.print(F("°C "));
Serial.print(f);
Serial.print(F("°F Heat index: "));
Serial.print(hic);
Serial.print(F("°C "));
Serial.print(hif);
Serial.println(F("°F"));
}
``` ```
And the physical board looks like this:
![Physical DHT11 board off](<assets/DHT11 state 1.jpg>)
And here it looks in action:
![physical DHT11 board on](<assets/DHT11 state 2.jpg>)
### Python For Dummies. Later on, I could expand this code and the physical product to include the rest of the sensors.
My job was to make a connection between the websocket and the database we had set up, and to do this we wanted to use python.
I had never used python before and was totaly new to the entire code structure and wording.
Because I was totaly new to all of python, I asked chatGPT for and example and some concrete code.
I asked it my question wich was the assignment I was given and tried to reverse learn this way.
I went and looked up fitting tutorials on W3SChools.
The following were used:
(https://www.w3schools.com/python/python_mysql_getstarted.asp)
(https://websockets.readthedocs.io/en/stable/)
(https://www.w3schools.com/python/python_mysql_insert.asp)
(https://www.w3schools.com/python/python_json.asp)
after still not getting it verry well i asked Dano ( a teammate of mine ) if he could learn me soem basics, and so we did.
He taught me how to make a simple calculator and told me why my code worked the way it did.
(This was the code:
print("1 = + 2 = -")
c = int(input())
print("first number")
a = input()
print("second number") ### Buzzers .pt 2
b= input() I found out how to make multiple buzzers go off with the press of one button and increase as Mutch as there are pins.
I tried to not look up anything for this one but did ask questions from time to time.
I designed it to work with scanning if there is any input and then output this signal to activate the buzzers.
This output signal can activate over multiple pins so this one button can set off all sorts of stuff.
The code is short and simple:
if c == 1: ```
print(int(a) + int(b)) //set up some variables
elif c == 2: int button = 20;
print(int(a) - int(b)) int buzzerone = 12;
int buzzertwo = 11;
)
even if it looked simple,this was the ignition i needed to understand python better and continue my own research. void setup() {
//put down some pins that will output , and some that input.
pinMode(button, INPUT);
pinMode(buzzerone, OUTPUT);
pinMode(buzzertwo, OUTPUT);
}
void loop() {
//read is there is input on the button pin, if so send output to the other pins., otherwise keep them off.
if(digitalRead(button) == HIGH){
digitalWrite(buzzerone, HIGH);
digitalWrite(buzzertwo, HIGH);
}else{
digitalWrite(buzzerone, LOW);
digitalWrite(buzzertwo, LOW);
}
}
```
Here I made the physical design but instead of buzzers i used lights in order to show it working.
![board turned off.](<assets/Buzzer board off.jpg>)
And here is the the board working:
![board working and turned on.](<assets/Buzzer board on.jpg>)
### Python For Dummies.
My job was to make a connection between the WebSocket and the database we had set up, and to do this we wanted to use python.
I had never used python before and was totally new to the entire code structure and wording.
Because I was totally new to all of python, I asked ChatGPT for and example and some concrete code.
I asked it my question which was the assignment I was given and tried to reverse learn this way.
I went and looked up fitting tutorials on W3SChools.
The following were used:
(https://www.w3schools.com/python/python_mysql_getstarted.asp)
(https://websockets.readthedocs.io/en/stable/)
(https://www.w3schools.com/python/python_mysql_insert.asp)
(https://www.w3schools.com/python/python_json.asp)
After still not getting it very well i asked Dano (a teammate of mine) if he could teach me some basics, and so we did.
He taught me how to make a simple calculator and told me why my code worked the way it did.
(This was the code:
print("1 = + 2 = -")
c = int(input())
print("first number")
a = input()
print("second number")
b= input()
if c == 1:
print(int(a) + int(b))
elif c == 2:
print(int(a) - int(b))
)
Even if it looked simple, this was the ignition I needed to understand python better and continue my own research.

BIN
docs/LearningProcessBram/Sprint1/assets/Buzzer board off.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 MiB

BIN
docs/LearningProcessBram/Sprint1/assets/Buzzer board on.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 MiB

2
docs/rpi-documentation/websockets.md
View File

@@ -9,6 +9,8 @@ There are different languages to serve websockets with, but we are going to use
## Issues ## Issues
Not all ports are open so we need to make a reverse proxy to use websockets.
### Ports ### Ports
We can only use certain ports like 113, 80, 443. These are common ports and are not blocked by firewalls. Something in the network is blocking all other ports which makes it hard to use websockets. We can only use certain ports like 113, 80, 443. These are common ports and are not blocked by firewalls. Something in the network is blocking all other ports which makes it hard to use websockets.

7
teamdocumentatie/dailyStandupNotes.md
View File

@@ -28,4 +28,11 @@ and im going to continue with working on the connection between the websocket an
Sam is going to finish the code for the big questionaire screen. Sam is going to finish the code for the big questionaire screen.
Dano is going to be writing some documentation and will be working with classes in arduino. Dano is going to be writing some documentation and will be working with classes in arduino.
Bram will do research on python to finish the connection to the database and the websocket. Bram will do research on python to finish the connection to the database and the websocket.
}
12 - 3 - 2024 {
Sam is going to continue to build his custom library for out custom questionaire screen.
Sietse is going to make a class in python.
Dano is making classes for the code of the node.
Bram is correcting some of his documentation and will continue the coding in python( to still make the connection between the database and the websocket.)
} }