Diff: main.cpp

Revision:

11:17ccf6a50944

Parent:

10:f03c1cb12f45

Child:

12:aedaf4554a44

diff -r f03c1cb12f45 -r 17ccf6a50944 main.cpp
--- a/main.cpp	Sat Jan 10 15:35:53 2015 +0000
+++ b/main.cpp	Wed Jan 14 20:53:52 2015 +0000
@@ -73,13 +73,6 @@
     setup();
 
     runController();
-
-//
-
-//    pc.printf("Entering loop\r\n");
-//
-//    //the endless loop keeps mbed in low power mode
-//    runProgram();
 }
 
 /*************************
@@ -95,195 +88,16 @@
     wait_ms(200);
 }
 
-
-/*
-void    start ()
-    Start the timer.
-void    stop ()
-    Stop the timer.
-void    reset ()
-    Reset the timer to 0.
-float   read ()
-    Get the time passed in seconds.
-int     read_ms ()
-    Get the time passed in mili-seconds.
-int     read_us ()
-    Get the time passed in micro-seconds. */
-
 void runController()
 {
     int count;
     tim.start();
-    while(1) {
+    while(1) {//programma loop
         if(tim.read() > intervalSec) { //polling interval passed, update tables
             printf("\r\n\r\n*%f seconds passed, reset timer*\r\n", tim.read());
             tim.reset();
-            c.update();
+            c.update();//update Table collection with API data
         }
-        c.sendCommands(&tim, intervalSec);
-        //send 1 command if available, else do nothing
+        c.sendCommands(&tim, intervalSec);//Send a number of commands if commands in commandList
     }
-}
-
-
-void runProgram()
-{
-
-//
-
-
-//        //GET data
-//    printf("\nTrying to fetch page...\r\n");
-//    int ret = http.get("http://core.motiv.jvanbaarsen.com/v1/tables", str, 128);
-//    if (!ret)
-//    {
-//      printf("Page fetched successfully - read %d characters\r\n", strlen(str));
-//      printf("Result: %s\r\n", str);
-//      c.lcdWriteLine(1, str);
-//    }
-//    else
-//    {
-//      printf("Error - ret = %d - HTTP return code = %d\n", ret, http.getHTTPResponseCode());
-//    }
-
-    c.setStatus(Controller::READY);
-    pc.printf("Controller ready\r\n");
-
-    c.printCommandList();
-    //Reset flower
-    rfd.putc(2);
-    rfd.putc(0);
-    rfd.putc(0);
-    rfd.putc(';');
-    wait_ms(2000);
-
-    string str = "";
-    int counter = 0;
-    int counterLast = -1;
-    bool pushedUp = false;
-    bool pushedDown = false;
-
-    while(1) {
-
-//        received = rfd.txGetLastChar();
-//        c.displWriteLine(3, 'a');
-//        pc.printf("%c", received);
-//        received = 'b';
-        if(!Up && !pushedUp) {
-            pushedUp = true;
-            //Last resort
-//            c.setStatus(c.BUSY);
-            if(counter >= 6)
-                counter = 0;
-            else
-                counter++;
-        } else if(!Down && !pushedDown) {
-            pushedDown = true;
-            //Last resort
-            //  c.setStatus(c.READY);
-            if(counter < 0)
-                counter = 5;
-            else
-                counter--;
-        } else if(Up)
-            pushedUp = false;
-        else if(Down)
-            pushedDown = false;
-
-        if(counter != counterLast) {
-            switch(counter) {
-                case 0: //Tafel vrij
-                    rfd.putc(2);
-                    rfd.putc(50);
-                    rfd.putc(1);
-                    rfd.putc(';');
-                    str = "Tafel vrij";
-                    break;
-
-                case 1: //Tafel gereserveerd
-                    rfd.putc(2);
-                    rfd.putc(52);
-                    rfd.putc(1);
-                    rfd.putc(';');
-                    str = "Tafel gereserveerd";
-                    break;
-
-                case 2: //Tafel in gebruik
-                    rfd.putc(2);
-                    rfd.putc(29);
-                    rfd.putc(1);
-                    rfd.putc(';');
-                    wait_ms(500);
-                    rfd.putc(2);
-                    rfd.putc(51);
-                    rfd.putc(1);
-                    rfd.putc(';');
-                    str = "Tafel in gebruik";
-                    break;
-
-                case 3: //Eten besteld 20
-                    rfd.putc(2);
-                    rfd.putc(54);
-                    rfd.putc(50);
-                    rfd.putc(';');
-                    str = "Eten best. 50";
-                    break;
-
-                case 4: //Eten besteld 100
-                    rfd.putc(2);
-                    rfd.putc(54);
-                    rfd.putc(100);
-                    rfd.putc(';');
-                    str = "Eten best. 100";
-                    break;
-
-                case 5: //Demo 1
-                    rfd.putc(2);
-                    rfd.putc(101);
-                    rfd.putc(1);
-                    rfd.putc(';');
-                    str = "Demo 1";
-                    break;
-
-                default: //Default: lamp modus
-                    rfd.putc(2);
-                    rfd.putc(100);
-                    rfd.putc(1);
-                    rfd.putc(';');
-                    break;
-            }
-            counterLast = counter;
-            c.lcdWriteLine(2, str);
-        }
-
-
-        wait_ms(200);
-        //__WFI();
-    }
-}
-
-
-/*
-EthernetInterface eth;
-    eth.init(); //Use DHCP
-    eth.connect();
-
-    UDPSocket sock;
-    sock.init();
-
-    Endpoint nist;
-    nist.set_address("utcnist.colorado.edu", 37);
-
-    char out_buffer[] = "plop"; // Does not matter
-    sock.sendTo(nist, out_buffer, sizeof(out_buffer));
-
-    char in_buffer[4];
-    int n = sock.receiveFrom(nist, in_buffer, sizeof(in_buffer));
-
-    unsigned int timeRes = ntohl( *((unsigned int*)in_buffer));
-    printf("Received %d bytes from server %s on port %d: %u seconds since 1/01/1900 00:00 GMT\n", n, nist.get_address(), nist.get_port(), timeRes);
-
-    sock.close();
-
-    eth.disconnect();
-    */
\ No newline at end of file
+}
\ No newline at end of file