Diff: main.cpp

Revision:

5:2c3f6ab7028a

Parent:

4:40dd020463ea

Child:

6:ab0b47cb3cfe

diff -r 40dd020463ea -r 2c3f6ab7028a main.cpp
--- a/main.cpp	Fri Aug 28 01:37:50 2015 +0000
+++ b/main.cpp	Mon Aug 03 01:25:38 2020 +0000
@@ -1,31 +1,13 @@
-// ESP8266 Static page WEB server to control Mbed
-
 #include "mbed.h"
-//#include "DS18B20.h"
 
 Serial pc(USBTX, USBRX);
 Serial esp(p28, p27); // tx, rx
 
-//DS18B20 thermom(A0, DS18B20::RES_12_BIT);
-
 // Standard Mbed LED definitions
-DigitalOut  led1(LED1);      // (PTB18)
-DigitalOut  led2(LED2);    // (PTB19)
-DigitalOut  led3(LED3);     // (PTD1)
-
-// Digital Out and In pins, can be configured to any suitable pin depending on Platform
-DigitalOut  Out1(p6);
-DigitalOut  Out2(p7);
-DigitalOut  Out3(p8);
-DigitalOut  reset(p26);
-
-DigitalIn  In1(p9);
-DigitalIn  In2(p10);
-DigitalIn  In3(p11);
-
-PwmOut speaker(p21);
-AnalogIn   Ain1(p18);
-AnalogIn   Ain2(p19);
+DigitalOut  led1(LED1);    
+DigitalOut  led2(LED2);    
+DigitalOut  led3(LED3);
+DigitalOut  led4(LED4);     
 
 Timer t1;
 Timer t2;
@@ -33,32 +15,23 @@
 struct tm t;
 
 int bufflen, DataRX, count, getcount, replycount, servreq, timeout;
-int bufl, ipdLen, linkID, weberror, webcounter;
+int bufl, ipdLen, linkID, weberror, webcounter,click_flag;
 float temperature, AdcIn, Ht;
 float R1=100000, R2=10000; // resistor values to give a 10:1 reduction of measured AnalogIn voltage
 char Vcc[10];
-char Temp[10];
-char temp[10];
 char webcount[8];
-char lasthit[30];
-char timebuf[30];
 char type[16];
 char type1[16];
 char channel[2];
 char cmdbuff[32];
 char replybuff[1024];
+
 char webdata[1024]; // This may need to be bigger depending on WEB browser used
-char webbuff[4096];     // Currently using 1986 characters, Increase this if more web page data added
-
-void SendCMD(),getreply(),ReadWebData(),startserver(),sendpage(),SendWEB(),sendcheck();
-void gettime(),gettemp(),getbattery(),setRTC(),beep();
+char webbuff[4096*4];     // Currently using 1986 characters, Increase this if more web page data added
 
-// manual set RTC values
-int minute      =00;    // 0-59
-int hour        =12;    // 2-23
-int dayofmonth  =26;    // 1-31
-int month       =8;     // 1-12
-int year        =15;    // last 2 digits
+
+void SendCMD(),getreply(),ReadWebData(),startserver(),sendpage(),SendWEB(),sendcheck(),touchuan();
+
 
 int port        =80;  // set server port
 int SERVtimeout =5;    // set server timeout in seconds in case link breaks.
@@ -66,12 +39,14 @@
 // Serial Interrupt read ESP data
 void callback()
 {
+    //pc.printf("\n\r------------ callback is being called --------------\n\r");
     led3=1;
     while (esp.readable()) {
         webbuff[count] = esp.getc();
         count++;
     }
     if(strlen(webbuff)>bufflen) {
+        pc.printf("\f\n\r------------ webbuff over bufflen --------------\n\r");
         DataRX=1;
         led3=0;
     }
@@ -79,36 +54,38 @@
 
 int main()
 {
-    reset=0;
     pc.baud(115200);
 
-    pc.printf("\f\n\r------------ ESP8266 Hardware Reset --------------\n\r");
+    pc.printf("\f\n\r------------ ESP8266 Hardware Reset psq --------------\n\r");
     wait(0.5);
-    reset=1;
     led1=1,led2=0,led3=0;
     timeout=6000;
     getcount=500;
     getreply();
     esp.baud(115200);   // ESP8266 baudrate. Maximum on KLxx' is 115200, 230400 works on K20 and K22F
-    if (time(NULL) < 1420070400) {
-        setRTC();
-    }
-    beep();
     startserver();
-
+    
     while(1) {
         if(DataRX==1) {
+            pc.printf("\f\n\r------------ main while > if --------------\n\r");
+            click_flag = 1;
             ReadWebData();
-            beep();
+            pc.printf("\f\n\r------------ click_flag=%d --------------\n\r",click_flag); 
+            //if ((servreq == 1 && weberror == 0) && click_flag == 1) {
             if (servreq == 1 && weberror == 0) {
+                pc.printf("\f\n\r------------ befor send page --------------\n\r");        
                 sendpage();
             }
+            pc.printf("\f\n\r------------ send_check begin --------------\n\r"); 
+            
+            //sendcheck();
+            pc.printf("\f\n\r------------ ssend_check end--------------\n\r"); 
+            
             esp.attach(&callback);
             pc.printf(" IPD Data:\r\n\n Link ID = %d,\r\n IPD Header Length = %d \r\n IPD Type = %s\r\n", linkID, ipdLen, type);
             pc.printf("\n\n  HTTP Packet: \n\n%s\n", webdata);
             pc.printf("  Web Characters sent : %d\n\n", bufl);
             pc.printf("  -------------------------------------\n\n");
-            strcpy(lasthit, timebuf);
             servreq=0;
         }
     }
@@ -116,99 +93,138 @@
 // Static WEB page
 void sendpage()
 {
-    gettemp();
-    getbattery();
-    gettime();
+// WEB page data
+
+strcpy(webbuff, "<!DOCTYPE html>");
+strcat(webbuff, "<html><head><title>RobotCar</title><meta name='viewport' content='width=device-width'/>");    
+strcat(webbuff, "</head><body><center><p><strong>Robot Car Remot Controller");
+strcat(webbuff, "</strong></p><td style='vertical-align:top;'><strong>Battery level ");
+strcat(webbuff, "<input type=\"text\" id=\"leftms\" size=4 value=250>%</strong>");
+strcat(webbuff, "</td></p><tr ><strong>Now speed : </strong></tr><nobr id=\"speprint\">ready");
+strcat(webbuff, "</nobr><br><tr ><strong>Now action : </strong></tr>");
+strcat(webbuff, "<nobr id=\"funprint\">ready</nobr><table><tr><td></td><td>");
+
+strcat(webbuff, "<button id='gobtn' type='button' style='width:100px;height:60px'  value=\"GO\"  onClick='send_mes(this.id,this.value)'>GO");
+strcat(webbuff, "</button></td><td></td></tr><tr><td>");
+strcat(webbuff, "<button id='leftbtn' type='button' style='width:100px;height:60px' value=\"LEFT\"  onClick='send_mes(this.id,this.value)' >LEFT");
+strcat(webbuff, "</button></td><td>");
+
+strcat(webbuff, "<button id='stopbtn' type='button' style='width:100px;height:60px' value=\"STOP\"  onClick='send_mes(this.id,this.value)' >STOP");
+strcat(webbuff, "</button></td><td>");
+strcat(webbuff, "<button id='rightbtn' type='button' style='width:100px;height:60px' value=\"RIGHT\"  onClick='send_mes(this.id,this.value)' >RIGHT");
+strcat(webbuff, "</button></td></tr><td></td><td>");
+strcat(webbuff, "<button id='backbtn' type='button' style='width:100px;height:60px' value=\"BACK\" onClick='send_mes(this.id,this.value)' >BACK");
+strcat(webbuff, "</button></td><td style='vertical-align:top; text-align:right;'></td></tr></table>");
+
+
 
-// WEB page data
-    strcpy(webbuff, "<!DOCTYPE html>");
-    strcat(webbuff, "<html><head><title>ESP8266 Mbed LPC1768</title></head>");
-    strcat(webbuff, "<body>");
-    strcat(webbuff, "<div style=\"text-align:center; background-color:#F4F4F4; color:#00AEDB;\"><h1>ESP8266 Mbed IoT Web Controller</h1>");
-    strcat(webbuff, "Hit Count - ");
-    strcat(webbuff, webcount);
-    strcat(webbuff, "<br>Last Hit - ");
-    strcat(webbuff, lasthit);
-    strcat(webbuff, "</div><br /><hr>");
-    strcat(webbuff, "<h3>Mbed RTC Time -&nbsp&nbsp");
-    strcat(webbuff, timebuf);
-    strcat(webbuff, "</h3>\r\n");
-    strcat(webbuff, "<p><form method=\"POST\"><strong> Analog 1:&nbsp&nbsp<input type=\"text\" size=6 value=\"");
-    strcat(webbuff, Temp);
-    strcat(webbuff, "\"> </sup>V <form method=\"POST\"> <strong> &nbsp&nbspAnalog 2:&nbsp&nbsp<input type=\"text\" size=4 value=\"");
-    strcat(webbuff, Vcc);
-    strcat(webbuff, "\"> </sup>V");
-    if(led1==0) {
-        strcat(webbuff, "<p><input type=\"radio\" name=\"led1\" value=\"0\" checked>  LED 1 off");
-        strcat(webbuff, "<br><input type=\"radio\" name=\"led1\" value=\"1\" >  LED 1 on");
-    } else {
-        strcat(webbuff, "<p><input type=\"radio\" name=\"led1\" value=\"0\" >  LED 1 off");
-        strcat(webbuff, "<br><input type=\"radio\" name=\"led1\" value=\"1\" checked>  LED 1 on");
-    }
-    if(Out1==0) {
-        strcat(webbuff, "<p><input type=\"radio\" name=\"Out1\" value=\"0\" checked>  Digital Out 1  off");
-        strcat(webbuff, "<br><input type=\"radio\" name=\"Out1\" value=\"1\" >  Digital Out 1 on");
-    } else {
-        strcat(webbuff, "<p><input type=\"radio\" name=\"Out1\" value=\"0\" >  Digital Out 1 off");
-        strcat(webbuff, "<br><input type=\"radio\" name=\"Out1\" value=\"1\" checked>  Digital Out 1 on");
-    }
-    if(Out2==0) {
-        strcat(webbuff, "<p><input type=\"radio\" name=\"Out2\" value=\"0\" checked>  Digital Out 2 off");
-        strcat(webbuff, "<br><input type=\"radio\" name=\"Out2\" value=\"1\" >  Digital Out 2 on");
-    } else {
-        strcat(webbuff, "<p><input type=\"radio\" name=\"Out2\" value=\"0\" >  Digital Out 2 off");
-        strcat(webbuff, "<br><input type=\"radio\" name=\"Out2\" value=\"1\" checked>  Digital Out 2 on");
-    }
-    if(Out3==0) {
-        strcat(webbuff, "<p><input type=\"radio\" name=\"Out3\" value=\"0\" checked>  Digital Out 3 off");
-        strcat(webbuff, "<br><input type=\"radio\" name=\"Out3\" value=\"1\" >  Digital Out 3 on");
-    } else {
-        strcat(webbuff, "<p><input type=\"radio\" name=\"Out3\" value=\"0\" >  Digital Out 3 off");
-        strcat(webbuff, "<br><input type=\"radio\" name=\"Out3\" value=\"1\" checked>  Digital Out 3 on");
-    }
-    if(In1==0) {
-        strcat(webbuff, "<p><input type=\"radio\" name=\"In1\" value=\"0\" >  Digital In 1");
-    } else {
-        strcat(webbuff, "<p><input type=\"radio\" name=\"In1\" value=\"1\" checked>  Digital In 1");
-    }
-    if(In2==0) {
-        strcat(webbuff, "<br><input type=\"radio\" name=\"In2\" value=\"0\" >  Digital In 2");
-    } else {
-        strcat(webbuff, "<br><input type=\"radio\" name=\"In2\" value=\"1\" checked>  Digital In 2");
-    }
-    if(In3==0) {
-        strcat(webbuff, "<br><input type=\"radio\" name=\"In3\" value=\"0\" >  Digital In 3");
-    } else {
-        strcat(webbuff, "<br><input type=\"radio\" name=\"In3\" value=\"1\" checked>  Digital In 3");
-    }
-    strcat(webbuff, "</strong><p><input type=\"submit\" value=\"send-refresh\" style=\"background: #3498db;");
-    strcat(webbuff, "background-image:-webkit-linear-gradient(top, #3498db, #2980b9);");
-    strcat(webbuff, "background-image:linear-gradient(to bottom, #3498db, #2980b9);");
-    strcat(webbuff, "-webkit-border-radius:12;border-radius: 12px;font-family: Arial;color:#ffffff;font-size:20px;padding:");
-    strcat(webbuff, "10px 20px 10px 20px; border:solid #103c57 3px;text-decoration: none;");
-    strcat(webbuff, "background: #3cb0fd;");
-    strcat(webbuff, "background-image:-webkit-linear-gradient(top,#3cb0fd,#1a5f8a);");
-    strcat(webbuff, "background-image:linear-gradient(to bottom,#3cb0fd,#1a5f8a);");
-    strcat(webbuff, "text-decoration:none;\"></form></span>");
-    strcat(webbuff, "<p/><h2>How to use:</h2><ul>");
-    strcat(webbuff, "<li>Select the Radio buttons to control the digital out pins.</li>");
-    strcat(webbuff, "<li>Click 'Send-Refresh' to send.</li>");
-    strcat(webbuff, "<li>Use the 'Send-Refresh' button to refresh the data.</li>");
-    strcat(webbuff, "</ul>");
-    strcat(webbuff, "</body></html>");
+//begin
+strcat(webbuff, "<strong>Addition functions:</strong><table>");
+strcat(webbuff, "<td>");//ok
+strcat(webbuff, "<button id='avoidbtn' type='button' style='width:100px;height:60px' value=\"AVOIDANCE\"  onClick='send_mes_fun(this.id,this.value)' >");
+strcat(webbuff, "AVOIDANCE</button></td><td>");
+strcat(webbuff, "<button id='tracebtn' type='button' style='width:100px;height:60px' value=\"LINE TRACE\"  onClick='send_mes_fun(this.id,this.value)' >LINE TRACE");
+strcat(webbuff, "</button></td><td>");
+strcat(webbuff, "<button id='defbtn' type='button' style='width:100px;height:60px' value=\"DEFAULT\"  onClick='send_mes_fun(this.id,this.value)' >DEFAULT");
+strcat(webbuff, "</button></td></table><table><td>");
+strcat(webbuff, "</td><strong>Speed level:</strong>");
+strcat(webbuff, "</table><table><td>");
+strcat(webbuff, "<button id='sp1btn' type='button' style='width:100px;height:60px' value=\"SLOW\"  onClick='send_mes_spe(this.id,this.value)' >SLOW");
+strcat(webbuff, "</button></td><td>");
+strcat(webbuff, "<button id='sp2btn' type='button' style='width:100px;height:60px' value=\"FAST\"  onClick='send_mes_spe(this.id,this.value)' >FAST");
+strcat(webbuff, "</button>");
+strcat(webbuff, "</td>");    
+strcat(webbuff, "<td>");
+strcat(webbuff, "<button id='sp3btn' type='button' style='width:100px;height:60px' value=\"FLY\"  onClick='send_mes_spe(this.id,this.value)' >FLY");
+strcat(webbuff, "</button>");
+strcat(webbuff, "</td></table>");    
+strcat(webbuff, "<table>");        
+strcat(webbuff, "<td>");
+strcat(webbuff, "</td>");    
+strcat(webbuff, "</table>");    //end
+
+
+
+strcat(webbuff, "</center>");
+strcat(webbuff, "</body>");
+strcat(webbuff, "</html>");
+strcat(webbuff, "<script language=\"javascript\" type=\"text/javascript\">");
+strcat(webbuff, "function send_mes(btnmes,btnval){");
+strcat(webbuff, "var url = \"http://\" + window.location.hostname + \"/cargo?a=\" + btnval;");
+strcat(webbuff, "htmlacs(url);");
+strcat(webbuff, "console.log(url);");
+strcat(webbuff, "}");
+strcat(webbuff, "function htmlacs(url) {");
+strcat(webbuff, "var xhr = new XMLHttpRequest();");
+strcat(webbuff, "xhr.open(\"GET\", url);");
+strcat(webbuff, "xhr.send(\"\");");
+strcat(webbuff, "}");
+strcat(webbuff, "function send_mes_spe(btnmes,btnval){");
+strcat(webbuff, "console.log(btnmes);");
+strcat(webbuff, "if(document.getElementById(\"speprint\")){");
+strcat(webbuff, "document.getElementById(\"speprint\").innerHTML=btnval;");
+strcat(webbuff, "}");
+strcat(webbuff, "}");
+strcat(webbuff, "function send_mes_fun(btnmes,btnval){");
+strcat(webbuff, "console.log(btnmes);");
+strcat(webbuff, "if(document.getElementById(\"funprint\")){");
+strcat(webbuff, "document.getElementById(\"funprint\").innerHTML=btnval;");
+strcat(webbuff, "}");
+strcat(webbuff, "}");
+strcat(webbuff, "</script>");
 // end of WEB page data
     bufl = strlen(webbuff); // get total page buffer length
-    sprintf(cmdbuff,"AT+CIPSEND=%d,%d\r\n", linkID, bufl); // send IPD link channel and buffer character length.
-    timeout=200;
-    getcount=7;
+    //sprintf(cmdbuff,"AT+CIPSEND=%d,%d\r\n", linkID, bufl); // send IPD link channel and buffer character length.
+    
+    sprintf(cmdbuff,"AT+CIPSENDBUF=%d,%d\r\n", linkID, (bufl>2048?2048:bufl)); // send IPD link channel and buffer character length.
+    timeout=500;
+    getcount=40;
     SendCMD();
     getreply();
+    pc.printf(replybuff);
+    pc.printf("\n++++++++++ AT+CIPSENDBUF=%d,%d+++++++++\r\n", linkID, (bufl>2048?2048:bufl));
+    
+    pc.printf("\n++++++++++ bufl is %d ++++++++++\r\n",bufl);
+    
+    //pastthrough mode
     SendWEB();  // send web page
+    pc.printf("\n++++++++++ webbuff clear  ++++++++++\r\n");
+  
     memset(webbuff, '\0', sizeof(webbuff));
     sendcheck();
 }
 
-//  wait for ESP "SEND OK" reply, then close IP to load web page
+// Large WEB buffer data send
+void SendWEB()
+{
+    int i=0;
+    if(esp.writeable()) {
+        while(webbuff[i]!='\0') {
+            esp.putc(webbuff[i]);
+                 
+          //****
+          //output at command when 2000 
+            if(((i%2047)==0) && (i>0)){    
+                    //wait_ms(10);
+                    sprintf(cmdbuff,"AT+CIPSENDBUF=%d,%d\r\n", linkID, (bufl-2048)>2048?2048:(bufl-2048)); // send IPD link channel and buffer character length.
+                    pc.printf("\r\n++++++++++ AT+CIPSENDBUF=%d,%d ++++++++++\r\n", linkID, (bufl-2048)>2048?2048:(bufl-2048));
+                    timeout=600;
+                    getcount=50;
+                    SendCMD();
+                    getreply();
+                    pc.printf(replybuff);
+                    pc.printf("\r\n+++++++++++++++++++\r\n");
+               }    
+    //****  
+            i++;     
+            pc.printf("%c",webbuff[i]);
+        }
+    }
+     pc.printf("\n++++++++++ send web i= %dinfo ++++++++++\r\n",i);
+}
+
+
+    
 void sendcheck()
 {
     weberror=1;
@@ -216,12 +232,15 @@
     getcount=24;
     t2.reset();
     t2.start();
+    
+    /*
     while(weberror==1 && t2.read() <5) {
         getreply();
         if (strstr(replybuff, "SEND OK") != NULL) {
             weberror=0;   // wait for valid SEND OK
         }
     }
+    */
     if(weberror==1) { // restart connection
         strcpy(cmdbuff, "AT+CIPMUX=1\r\n");
         timeout=500;
@@ -247,6 +266,7 @@
 // Reads and processes GET and POST web data
 void ReadWebData()
 {
+    pc.printf("+++++++++++++++++Read Web Data+++++++++++++++++++++\r\n");
     wait_ms(200);
     esp.attach(NULL);
     count=0;
@@ -258,40 +278,35 @@
         strcpy(webdata, webbuff + x);
         weberror=0;
         int numMatched = sscanf(webdata,"+IPD,%d,%d:%s", &linkID, &ipdLen, type);
-        if( strstr(webdata, "led1=1") != NULL ) {
-            led1=1;
-        }
-        if( strstr(webdata, "led1=0") != NULL ) {
-            led1=0;
-        }
-        if( strstr(webdata, "Out1=1") != NULL ) {
-            Out1=1;
-        }
-        if( strstr(webdata, "Out1=0") != NULL ) {
-            Out1=0;
+        //int i=0;
+        pc.printf("+++++++++++++++++succed rec begin+++++++++++++++++++++\r\n");
+        pc.printf("%s",webdata);
+        pc.printf("+++++++++++++++++succed rec end+++++++++++++++++++++\r\n");
+        if( strstr(webdata, "LEFT") != NULL ) {
+             click_flag = 0;
+             led4=!led4;
+             pc.printf("+++++++++++++++++bbutton left clicked+++++++++++++++++++++\r\n");
         }
-        if( strstr(webdata, "Out2=1") != NULL ) {
-            Out2=1;
-        }
-        if( strstr(webdata, "Out2=0") != NULL ) {
-            Out2=0;
+        
+        if( strstr(webdata, "RIGHT") != NULL ) {
+            led4=!led4;
+            pc.printf("\r\n+++++++++++++++++bbutton right clicked+++++++++++++++++++++\r\n");
         }
-        if( strstr(webdata, "Out3=1") != NULL ) {
-            Out3=1;
-        }
-        if( strstr(webdata, "Out3=0") != NULL ) {
-            Out3=0;
-        }
+
         sprintf(channel, "%d",linkID);
         if (strstr(webdata, "GET") != NULL) {
             servreq=1;
+            pc.printf("\r\n+++++++++++++++++GET+++++++++++++++++++++\r\n");
+
         }
         if (strstr(webdata, "POST") != NULL) {
             servreq=1;
+            pc.printf("\r\n+++++++++++++++++POST+++++++++++++++++++++\r\n");
         }
         webcounter++;
         sprintf(webcount, "%d",webcounter);
     } else {
+        pc.printf("\n++++++++++ webbuff clear  ++++++++++\r\n");
         memset(webbuff, '\0', sizeof(webbuff));
         esp.attach(&callback);
         weberror=1;
@@ -300,9 +315,6 @@
 // Starts and restarts webserver if errors detected.
 void startserver()
 {
-    gettemp();
-    gettime();
-    pc.printf("\n\n RTC time   %s\r\n\n",timebuf);
     pc.printf("++++++++++ Resetting ESP ++++++++++\r\n");
     strcpy(cmdbuff,"AT+RST\r\n");
     timeout=8000;
@@ -352,33 +364,32 @@
         pc.printf(webdata);
         led2=1;
         bufflen=200;
+        //bufflen=100;
         count=0;
         pc.printf("\n\n++++++++++ Ready ++++++++++\r\n\n");
         esp.attach(&callback);
     } else {
         pc.printf("\n++++++++++ ESP8266 error, check power/connections ++++++++++\r\n");
-        while(1) {}
+        led1=1;
+        led2=1;
+        led3=1;
+        led4=1;
+        while(1) {
+            led1=!led1;
+            led2=!led2;
+            led3=!led3;
+            led4=!led4;
+            wait(1);
+        }
     }
     t2.reset();
     t2.start();
-    beep();
 }
 // ESP Command data send
 void SendCMD()
 {
     esp.printf("%s", cmdbuff);
 }
-// Large WEB buffer data send
-void SendWEB()
-{
-    int i=0;
-    if(esp.writeable()) {
-        while(webbuff[i]!='\0') {
-            esp.putc(webbuff[i]);
-            i++;
-        }
-    }
-}
 // Get Command and ESP status replies
 void getreply()
 {
@@ -393,44 +404,4 @@
         }
     }
     t1.stop();
-}
-// Analog in example
-void getbattery()
-{
-    AdcIn=Ain1.read();
-    Ht = (AdcIn*3.3); // set the numeric to the exact MCU analog reference voltage for greater accuracy
-    sprintf(Vcc,"%2.3f",Ht);
-}
-// Temperature example
-void gettemp()
-{
- 
-    AdcIn=Ain2.read();
-    Ht = (AdcIn*3.3); // set the numeric to the exact MCU analog reference voltage for greater accuracy  
-    sprintf(Temp,"%2.3f",Ht);
-}
-// Get RTC time
-void gettime()
-{
-    time_t seconds = time(NULL);
-    strftime(timebuf,50,"%H:%M:%S %a %d %b %y", localtime(&seconds));
-}
-
-void beep()
-{
-    speaker.period(1.0/2000); // 2000hz period
-    speaker = 0.5; //50% duty cycle - max volume
-    wait_ms(60);
-    speaker=0.0; // turn off audio
-}
-
-void setRTC()
-{
-    t.tm_sec = (0);             // 0-59
-    t.tm_min = (minute);        // 0-59
-    t.tm_hour = (hour);         // 0-23
-    t.tm_mday = (dayofmonth);   // 1-31
-    t.tm_mon = (month-1);       // 0-11  "0" = Jan, -1 added for Mbed RCT clock format
-    t.tm_year = ((year)+100);   // year since 1900,  current DCF year + 100 + 1900 = correct year
-    set_time(mktime(&t));       // set RTC clock
-}
+}
\ No newline at end of file