From 22c923992092ed0cdc7995e2265f33b62a34a99f Mon Sep 17 00:00:00 2001 From: Niels Gras Date: Wed, 8 May 2024 15:57:02 +0200 Subject: [PATCH 1/3] added orange --- .../documentation/brainstorm/colorsforlayout.md | 7 +++++++ docs/documentation/brainstorm/orangepalette.png | Bin 0 -> 13163 bytes 2 files changed, 7 insertions(+) create mode 100644 docs/documentation/brainstorm/orangepalette.png diff --git a/docs/documentation/brainstorm/colorsforlayout.md b/docs/documentation/brainstorm/colorsforlayout.md index 51fec86..190c23b 100644 --- a/docs/documentation/brainstorm/colorsforlayout.md +++ b/docs/documentation/brainstorm/colorsforlayout.md @@ -17,6 +17,13 @@ Red is an interesting color because it increases excitement, activity, aggressio ![palettes of red](redpalette.png) + + ORANGE: + + +Orange is a warm color that is a combination of red and yellow, making it a good middle ground between the two. Orange is an interesting color for our project because it promotes emotions like playful, warm, friendly, social, gregarious, cheerful, vibrant, confident, and successful. As we can see, there is a good balance of red and yellow emotions. People associate the color orange with extroversion, adventure, celebration, courage, confidence, good health, friendship, and success. This makes it a suitable choice for our project because it triggers most of the emotions we wanted. It is not as aggressive as red, but it basically has the same effect. Deeper oranges are warmer, while lighter tints make it feel more like yellow. We should consider orange for our app because it stimulates the desired emotions. +![palettes of orange](orangepalette.png) + YELLOW: diff --git a/docs/documentation/brainstorm/orangepalette.png b/docs/documentation/brainstorm/orangepalette.png new file mode 100644 index 0000000000000000000000000000000000000000..a053702424c575c4a747bd108e8667c6cc76fdd0 GIT binary patch literal 13163 zcmeAS@N?(olHy`uVBq!ia0y~yU~XYxV2a>i0*Y*1zQ2coL4m>3#WAFU@$C&m-Xjb= zERMoFvlnpAc7LY+Ak|>fYVGAwmEX+!4(NV3YsIwufc0yRIZWr*C>L;@0TP@VflRsu zVI30>EO+7Dav)OCjj3Nqbpn&DlHD?v5b;JKi})lrruEx38pU?RCDkouDRb))%4p;g zv}U~Ox`1U51Lu?m2~`20`hQIUQAl z2xL;cp!i7N!=Xq}17r#qa|qTuG9^uM;121y!RevLq^hu!1Gll_qs9t+91R3u0vip4 z(LjI{HKQqEG$o9t1bEFmnjJ>7!)SIG%?`+|@zFA2v`iQ+6GqE~(J}#Tm}0bG94#0} z3&zocakO9@Ef_Heu}5o%(b{3Ob{MT4Mr()B+F`VIz&g)6T15_qD$;O$d@Tcmuo`GB z!03Fsb>rxw0^sV3(LfjtgwZuNqYI5jS6huPIU8MfH@f(6bOq+L#%)H&Y6f7KqF$tZTT<1@$=twAGz^}uelF{r5}E)+8Oiwo literal 0 HcmV?d00001 From ca34413fd7616bcd68e6300e86cf381f72396940 Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Wed, 8 May 2024 16:22:44 +0200 Subject: [PATCH 2/3] Added wifi --- .../Movement-sensor-code.ino | 18 ++++++++++++++---- code/arduino/Movement-sensor-code/headerFIle.h | 17 +++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/code/arduino/Movement-sensor-code/Movement-sensor-code.ino b/code/arduino/Movement-sensor-code/Movement-sensor-code.ino index d20f77e..04cccb2 100644 --- a/code/arduino/Movement-sensor-code/Movement-sensor-code.ino +++ b/code/arduino/Movement-sensor-code/Movement-sensor-code.ino @@ -1,14 +1,24 @@ -#include "SensorManager.h" +#include "headerFile.h" SensorManager sensorManager; +ESP8266WiFiMulti wifi; void setup() { - Wire.setClockStretchLimit(150000L); // Default stretch limit 150mS Serial.begin(9600); Serial.println("startup"); - delay(10000); - sensorManager.sensorSetup(); + delay(5000); + //Wifi + WiFi.mode(WIFI_STA); + wifi.addAP(ssid, pass); + while (WiFi.status() != WL_CONNECTED) { + Serial.println("connecting to wifi"); + delay(1000); + } + Serial.println(WiFi.localIP()); + + Wire.setClockStretchLimit(150000L); // Default stretch limit 150mS + sensorManager.sensorSetup(); } void loop() { diff --git a/code/arduino/Movement-sensor-code/headerFIle.h b/code/arduino/Movement-sensor-code/headerFIle.h index 4b96a47..a03e393 100644 --- a/code/arduino/Movement-sensor-code/headerFIle.h +++ b/code/arduino/Movement-sensor-code/headerFIle.h @@ -1 +1,18 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define ssid "LAPTOP3028043" +#define pass "619#5gJ5" + +//custom classes #include "SensorManager.h" \ No newline at end of file From aef59c8b880292e95ef7a86ec2fdc004fd7a40f2 Mon Sep 17 00:00:00 2001 From: Niels Gras Date: Wed, 8 May 2024 16:30:58 +0200 Subject: [PATCH 3/3] added black --- docs/documentation/brainstorm/blackpalette.png | Bin 0 -> 11167 bytes .../documentation/brainstorm/colorsforlayout.md | 13 +++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 docs/documentation/brainstorm/blackpalette.png diff --git a/docs/documentation/brainstorm/blackpalette.png b/docs/documentation/brainstorm/blackpalette.png new file mode 100644 index 0000000000000000000000000000000000000000..76e6689c0b729f2b658863af69ef6b4a14ab417a GIT binary patch literal 11167 zcmeI2y-Ncz7{=3>VyINF_=$*ID^mPGbW`kbZLiucRfLAsrr-H5R&_Ndw zaS$A=QV_w-3JU5U;No%=S5bEnU&lCi^O;@}^6@0Rm-{^-x#{?%+tuk}jJab`Gr?Hh zHe);~In`X9-V_+qS>9E_ z!Owe_eHxz!8r(>lUhj;DL7YqwfdmBsMgmMXxJ&l@gP<%72x zR0U-2u}#<}WD`C*oJ}~w@uve200_WMz)Mg#%nCdmtS@c|a6^EL6b>K&5C8}O1ONg6 z0e}EN03Z+m0ssMkpmsp8ztH@|Si{`!TL5GhGOKo(g=|7LA)8=aU|e8aU|e8a + BLACK: + +Black is not a color but we can use this as the main tone for our app. However since old people tend to have issues when there isnt much light and black is the absence of light we are not very likely to sue it. Black boost emotions like Mysterious, elegant, sophisticated, worldly, powerful, strength, and intelligence. This makes black not that interesting for us since we want to make a simple app that everyone can understand. People associate the color black with Authority, sophistication, simplicity, protection, formality, elegance, night, power, and mystery. This is very intersting but not for our project since we do not desire people to associate our project with these emotions. If we tone the color black we get gray and white of which i will discuss the color white seperatly. Too much black can be frightening. Depressing unless used with other colors. + +![palletes of black](blackpalette.png) + + + WHITE: + +White is not a color so it has the same purpose as black being a main tone to our app. + ### Conclusion We decided to go for