Revision 14:c24a683e40a9, committed 2018-11-23

Comitter:

WAIYIP

Date:

Fri Nov 23 14:38:32 2018 +0000

Parent:

13:9a2016106dae

Commit message:

for alpaca jack

Changed in this revision

diff -r 9a2016106dae -r c24a683e40a9 DHT11.lib
--- a/DHT11.lib	Sat May 06 17:39:25 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://mbed.org/users/s_inoue_mbed/code/DHT11/#e91c151d1798

diff -r 9a2016106dae -r c24a683e40a9 HC_SR04_Ultrasonic_Library.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/HC_SR04_Ultrasonic_Library.lib	Fri Nov 23 14:38:32 2018 +0000
@@ -0,0 +1,1 @@
+https://os.mbed.com/users/ejteb/code/HC_SR04_Ultrasonic_Library/#e0f9c9fb4cf3

diff -r 9a2016106dae -r c24a683e40a9 Servo.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Servo.lib	Fri Nov 23 14:38:32 2018 +0000
@@ -0,0 +1,1 @@
+https://os.mbed.com/users/simon/code/Servo/#36b69a7ced07

diff -r 9a2016106dae -r c24a683e40a9 X_NUCLEO_IKS01A1.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/X_NUCLEO_IKS01A1.lib	Fri Nov 23 14:38:32 2018 +0000
@@ -0,0 +1,1 @@
+https://developer.mbed.org/teams/ST/code/X_NUCLEO_IKS01A1/#d1c67d482bad

diff -r 9a2016106dae -r c24a683e40a9 main.cpp
--- a/main.cpp	Sat May 06 17:39:25 2017 +0000
+++ b/main.cpp	Fri Nov 23 14:38:32 2018 +0000
@@ -1,80 +1,46 @@
-/* SpwfInterface NetworkSocketAPI Example Program
- * Copyright (c) 2015 ARM Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 #include "mbed.h"
 #include "SpwfInterface.h"
-//#include "NTPClient.h"
-//#include "HTTPClient.h"
+#include "x_nucleo_iks01a1.h"
 #include "TCPSocket.h"
-#include "DHT11.h"
+#include "Servo.h"
+#include "ultrasonic.h"
+
 
 
-#define PORT 1234
-#define MAX_PENDING 1
-/*Thing speak settings */
-//NTPClient ntp;
-//HTTPClient http;
- 
+int distance1;
+int distance;
+ void dist(int distance)
+{
+    //put code here to happen when the distance is changed
+    printf("Distance changed to %dmm\r\n", distance);
+    distance1= distance;
+}
+
+
+ultrasonic mu(D8, D9, .1, 1, &dist);    //Set the trigger pin to D8 and the echo pin to D9
+                                        //have updates every .1 seconds and a timeout after 1
+                                        //second, and call dist when the distance changes
+Servo myservo(D6); 
 //char* ntpServerUrl = "0.ca.pool.ntp.org";
-#define IP "184.106.153.149" 
+//#define IP "184.106.153.149/update"
+#define IP "184.106.153.149"
 char* thingSpeakUrl = "http://api.thingspeak.com/update";
-char* thingSpeakKey = "SBYDOEXE50MNOBSI";
-//------------------------------------
-// Hyperterminal configuration
-// 9600 bauds, 8-bit data, no parity
-//------------------------------------
+char* thingSpeakKey = "5WJ5OYWTWTQX4310";
 
 Serial pc(USBTX, USBRX);
 DigitalOut myled(LED1);
-AnalogIn   ain(A0);
-DHT11 sensor(PA_1);
-/*************************************/
-
-//NUCLEO: D8->UART1_TX (PA_9), D2->UART1_RX (PA_10)
+/*************/
 SpwfSAInterface spwf(D8, D2, false);
-const double Rl      = 10000.0;               // Rl (Ohm) - Load resistance
-const double Vadc_5  = 0.0048828125;         // ADC step 5V/1024 4,88mV (10bit ADC)
+uint8_t id;
+float value1, value2;
+char buffer1[32], buffer2[32];
 
-//const double Vadc_33 = 0.0032226562;         // ADC step 3,3V/1024 3,22mV (10bit ADC)
-double Vrl;                                  // Output voltage
-double Rs;                                   // Rs (Ohm) - Sensor resistance
-double ppm;                                  // ppm
-double ratio;
-int temp;
-int humid;   
-
-//Calculation of PPM
-void calculatePPM() 
-{
-  double lgPPM;
-  Vrl = (double)ain*Vadc_5;             // For 5V Vcc use Vadc_5
-  Rs = (5 - Vrl)/Vrl;                   // Calculate sensor resistance
-  ratio = Rs/Rl;                             // Calculate ratio
-  lgPPM = (log10(ratio) * -0.8)+ 0.9;        // Calculate ppm
-  ppm = pow(10,lgPPM);                       // Calculate ppm
-  pc.printf("The ppm value is %lf \n",ppm);
-  pc.printf("The raw Rs is %2.3lf\n",ratio);
-  pc.printf("The raw voltage is %2.3lf \n",Vrl);
-}
 
 int http_demo(void)
 {
     TCPSocket socket(&spwf);
     char buffer[256];
-    char message[40];
+    char message[160];
     int err;
     printf("Sending HTTP Data to thingspeak...\r\n");
 
@@ -86,14 +52,10 @@
       pc.printf("\r\nCould not connect to Socket, err = %d!!\r\n", err); 
       return -1;
     } else pc.printf("\r\nconnected to host server\r\n"); 
-    // Send a simple http request
-    //buffer[0] = 0;
-    //sprintf(buffer, "GET https://api.thingspeak.com/update?api_key=SBYDOEXE50MNOBSI&field1=%f&field2=%d&field3=%d",(float)ppm,temp,humid);//thingSpeakUrl,thingSpeakKey,
-    sprintf(message,"field1=%f&field2=%d&field3=%d",ppm,temp,humid);
+    sprintf(message,"field1=%d",distance1);
     printf("Message Length=%d\r\n",(int)strlen(message));
     sprintf(buffer,"POST /update HTTP/1.1\r\nHost: api.thingspeak.com\r\nConnection: close\r\nX-THINGSPEAKAPIKEY: %s\r\nContent-Type: application/x-www-form-urlencoded\r\nContent-Length: %d\r\n\r\n%s",thingSpeakKey,(int)strlen(message),message);
     pc.printf("Request to %s\r\n", buffer);
-    //char sbuffer[] = "GET / HTTP/1.1\r\nHost: www.arm.com\r\n\r\n";
     int scount = socket.send(buffer, (int)strlen(buffer));
     printf("sent %d [%.*s]\r\n", scount, strstr(buffer, "\r\n")-buffer, buffer);
 
@@ -109,14 +71,11 @@
 
 int main() 
 {
-    int err;    
-    char * ssid = "VM957191-2G";
-    char * seckey = "krzvzkcw";  
-    //char buffer[255];
-    //time_t ctTime;
-    //Host server(IpAddr(), 123, ntpServerUrl);
-    //ntp.setTime(server);
-    pc.printf("\r\nAir Quality and Environment monitoring Application\r\n");     
+    
+       
+    char * ssid = "homebb@unifi";
+    char * seckey = "homebb987";  
+    pc.printf("\r\nReal Time Weather System\r\n");     
     pc.printf("\r\nconnecting to AP\r\n");
             
     if(spwf.connect(ssid, seckey, NSAPI_SECURITY_WPA2)) {      
@@ -130,46 +89,22 @@
     const char *mac = spwf.get_mac_address();
     
     pc.printf("\r\nIP Address is: %s\r\n", (ip) ? ip : "No IP");
-    pc.printf("\r\nMAC Address is: %s\r\n", (mac) ? mac : "No MAC");     
+    pc.printf("\r\nMAC Address is: %s\r\n", (mac) ? mac : "No MAC"); 
+    wait (3);    
     
     while(1) 
     { 
-      wait(20);
-      myled = !myled;
-      calculatePPM();
-      err = sensor.readData();
-        if (err ==DHT11::OK)
-        {
-         temp=sensor.readTemperature();
-         humid=sensor.readHumidity();
-         pc.printf("\r\nT: %d oC, H: %d\r\n",temp,humid);   
-        }
-         else
-         printf("\r\nErr %i \n",err);
-         int err=http_demo();
-         if(err ==0)
-         pc.printf("Thingspeak update completed successfully\r\n");
-         else
-         pc.printf("Error occurred %d\r\n",err);
-       /* buffer[0] = 0;
-        sprintf(buffer, "%s?key=%s&field1=%s&field2=%d&field3=%d", thingSpeakUrl, thingSpeakKey, , (float)ppm,temp,humid);
-        printf("Request to %s\r\n", buffer);
-        
-        HTTPText resp;
-        HTTPResult res = http.get(buffer, &resp);
-        if (res == HTTP_OK)
-        {
-            printf("Result :\"%s\"\r\n", resp.gets());
-        }
-        else
-        {
-            printf("Error %d\r\n", res);
-        } */        
-             
-            
-      
+      mu.checkDistance();     //call checkDistance() as much as possible, as this is where
+                                //the class checks if dist needs to be called.
+                if(distance1 <55){
+                    printf("ok\r\n");
+      //for(float p=0; p<1.0; p += 0.99) 
+       // myservo = p;
+        //wait(0.2);
+      http_demo();
+      //x=0;y=0;z=0;
+      pc.printf("Thingspeak update completed successfully\r\n");
+      //buz=0;//RESET CONDITION  
+      wait(10);
     }
-    
- 
-}
-
+}}
\ No newline at end of file