smart-home
Final version of program with changed pin for PWM, freq for led and bluetooth comma seperated values
Revision 7:871a3d9dc680, committed 2018-11-30
- Comitter:
- farhan_saeed
- Date:
- Fri Nov 30 03:53:40 2018 +0000
- Parent:
- 6:22673b8098a0
- Commit message:
- final version of our program for appendix section of report
Changed in this revision
| functions.cpp | Show annotated file Show diff for this revision Revisions of this file |
| main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/functions.cpp Wed Nov 28 01:22:24 2018 +0000
+++ b/functions.cpp Fri Nov 30 03:53:40 2018 +0000
@@ -76,16 +76,16 @@
void setLED(int &light_value)
{
if (light_value == 0) {
- led_o.period(0.1);
+ led_o.period(0.01);
led_o.write(1);
} else if (light_value == 1) {
- led_o.period(0.1);
+ led_o.period(0.01);
led_o.write(0.75);
} else if (light_value == 2) {
- led_o.period(0.1);
+ led_o.period(0.01);
led_o.write(0.5);
} else if (light_value == 3) {
- led_o.period(0.1);
+ led_o.period(0.01);
led_o.write(0.25);
} else {
led_o.period(0.1);
@@ -95,16 +95,16 @@
void setPWM(int &speed)
{
- if (speed == 0) {
+ if (speed == 4) {
pwm.period(0);
pwm.write(0);
- } else if (speed == 1) {
+ } else if (speed == 3) {
pwm.period(1);
pwm.write(0.25);
} else if (speed == 2) {
pwm.period(1);
pwm.write(0.5);
- } else if (speed == 3) {
+ } else if (speed == 1) {
pwm.period(1);
pwm.write(0.75);
} else {
--- a/main.cpp Wed Nov 28 01:22:24 2018 +0000
+++ b/main.cpp Fri Nov 30 03:53:40 2018 +0000
@@ -3,7 +3,7 @@
TextLCD lcd(PTC7,PTC0,PTC3,PTC4,PTC5,PTC6);
AnalogIn temp_sen(A0);
AnalogIn light_sen(A1);
-PwmOut pwm(A2);
+PwmOut pwm(PTE20);
PwmOut led_o(PTB18);
Serial mobile(PTE22, PTE23);
DigitalIn enter(D8);
@@ -31,7 +31,7 @@
//modeProcess();
if (state == 0) {
mainScreen();
- mobile.printf("temp: %i fan: %i light: %i \n",temp_measure, fanLevel_dis, lightLevel_dis);
+ mobile.printf("%i,%i,%i\n",temp_measure,fanLevel_dis,lightLevel_dis);
//mobile.printf("%i",temp_measure);
}
if (state == 1) {