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 diff --git a/docs/documentation/brainstorm/blackpalette.png b/docs/documentation/brainstorm/blackpalette.png new file mode 100644 index 0000000..76e6689 Binary files /dev/null and b/docs/documentation/brainstorm/blackpalette.png differ diff --git a/docs/documentation/brainstorm/colorsforlayout.md b/docs/documentation/brainstorm/colorsforlayout.md index 51fec86..93d5742 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: @@ -40,6 +47,19 @@ Green is on the opposite side of the spectrum from red and yellow. Green is a co Blue is also a colder color, so it takes the same path as green, giving it a more calming effect. However, it is not comparable to green because they influnce other emotions. Blue enhances emotions like calm, security, peace, patience, loyalty, trust, and sadness. It has the same soothing effect as green, but it does not give people the feeling of being healthy. It gives people trust and peace, which are interesting emotions, but they are not beneficial to us. People associate the color blue with stability, protection, trust, loyalty, patience, perseverance, security, peace, loyalty, sadness and depression, and masculinity. This further confirms that blue gives people a sense of security, which is not important for us because we want people to start exercising. Pale blue is cooling and relaxing, but it should not be used inappropriately because it can make people feel sad and depressed. Indigo is useful in situations where fear prevents activity. Indigo may be useful for a cool-down exercise or if someone is afraid of exercising. ![palletes of blue](bluepalette.png) + + + 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 diff --git a/docs/documentation/brainstorm/orangepalette.png b/docs/documentation/brainstorm/orangepalette.png new file mode 100644 index 0000000..a053702 Binary files /dev/null and b/docs/documentation/brainstorm/orangepalette.png differ