Kojo / Mbed 2 deprecated IF-SmartClock

Smart Clock

Dependencies:   AlarmClock DigitalClock EthernetInterface FourDigitLED HTTPClient NTPClient SDFileSystem TrainStat WeatherInfo XML_aide mbed-rtos mbed picojson wolfSSL

Files at this revision

API Documentation at this revision

Revision 7:53dd54df1441, committed 2015-11-22

Comitter:
takashikojo
Date:
Sun Nov 22 08:52:05 2015 +0000
Parent:
6:406cd8c6dceb
Commit message:
Cleaned up for publishing

Changed in this revision

AlarmClock.lib Show annotated file Show diff for this revision Revisions of this file
FourDigitLED.lib Show annotated file Show diff for this revision Revisions of this file
TrainStat.lib Show annotated file Show diff for this revision Revisions of this file
WeatherInfo.lib 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
main.txt Show diff for this revision Revisions of this file 
diff -r 406cd8c6dceb -r 53dd54df1441 AlarmClock.lib
--- a/AlarmClock.lib	Fri Oct 23 06:10:11 2015 +0000
+++ b/AlarmClock.lib	Sun Nov 22 08:52:05 2015 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/users/takashikojo/code/AlarmClock/#08b49402846d
+https://developer.mbed.org/users/takashikojo/code/AlarmClock/#864d5c5f98ee

diff -r 406cd8c6dceb -r 53dd54df1441 FourDigitLED.lib
--- a/FourDigitLED.lib	Fri Oct 23 06:10:11 2015 +0000
+++ b/FourDigitLED.lib	Sun Nov 22 08:52:05 2015 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/users/takashikojo/code/FourDigitLED/#73f31aea935a
+https://developer.mbed.org/users/takashikojo/code/FourDigitLED/#5ed17505c88e

diff -r 406cd8c6dceb -r 53dd54df1441 TrainStat.lib
--- a/TrainStat.lib	Fri Oct 23 06:10:11 2015 +0000
+++ b/TrainStat.lib	Sun Nov 22 08:52:05 2015 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/users/takashikojo/code/TrainStat/#6105553963bb
+https://developer.mbed.org/users/takashikojo/code/TrainStat/#d4d781f31f70

diff -r 406cd8c6dceb -r 53dd54df1441 WeatherInfo.lib
--- a/WeatherInfo.lib	Fri Oct 23 06:10:11 2015 +0000
+++ b/WeatherInfo.lib	Sun Nov 22 08:52:05 2015 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/users/takashikojo/code/WeatherInfo/#76b812680942
+https://developer.mbed.org/users/takashikojo/code/WeatherInfo/#6618936f930a

diff -r 406cd8c6dceb -r 53dd54df1441 main.cpp
--- a/main.cpp	Fri Oct 23 06:10:11 2015 +0000
+++ b/main.cpp	Sun Nov 22 08:52:05 2015 +0000
@@ -22,11 +22,9 @@
 #define ERR(x, ...) std::printf("[Main : ERR]"x"\r\n", ##__VA_ARGS__);
 
 AlarmClock alarmclock (
-    /* Segment 0 - 6, Dot */    //D11,D6, D3, D1, D0, D10,D4, D2 ,
-                                  PTB19,PTC0, D3, D1, D0, PTC1, D4, D2,
-    /* Digit 1 - 4        */    //D5, D7, D9, D12,
-                                  D5, PTC9, PTC8, PTB18,
-    /* Alarm, Hour, Min, Tone */D13, D15, D14, PTC11
+    /* Segment 0 - 6, Dot */       PTB19,PTC0, D3, D1, D0, PTC1, D4, D2,
+    /* Digit 1 - 4        */       D5, PTC9, PTC8, PTB18,
+    /* Alarm, Hour, Min, Tone */   D13, D15, D14, PTC11
 )  ;
 
 TrainStat   trainstat(/* YAHOO_TRAIN*/ TOKYO_METRO) ;
@@ -55,14 +53,16 @@
     while(1) {
         alarmclock.poll() ;
     }
-    printf("clock_main\n") ;
+
 }
 
+#if defined(ANIMATION)
 #define FRONT0 0x06
 #define FRONT1 0x79 
 #define FRONT2 0x49
 #define MIDDLE 0x49
 #define TAIL0  0x49
+
 #define TAIL1  0x4f
 #define TAIL2  0x30
 #define ROCK   0x5c
@@ -86,9 +86,6 @@
 } ;
 
 static unsigned int noDelayPtn[14][4] = {
-    
-//    { MIDDLE, FRONT1,BLANK,  BLANK } ,
-//    { MIDDLE, FRONT2,FRONT0, BLANK } ,
     { BLANK,  BLANK, BLANK,  BLANK } ,
     { MIDDLE, FRONT1,BLANK,  BLANK } ,
     { TAIL0,  FRONT2,FRONT0, BLANK } ,
@@ -104,32 +101,36 @@
     { BLANK,  BLANK, BLANK,  BLANK } ,
     { BLANK,  BLANK, BLANK,  BLANK } 
 } ;
-       
+#endif
+
 static void setLED_Tdelay(bool delay)
 {
+#if !defined(ANIMATION)
 /* Delay/No Delay */
-//    const unsigned int d[4] = { 0x6e, 0x77, 0x38, 0x5e} ;
-//    const unsigned int n[4] = { 0x5c, 0x37, 0x38, 0x5e,} ;
-/*const unsigned int n[4] = { 0x09, 0x09, 0x29, 0x58} ;
-const unsigned int d[4] = { 0x09, 0x29, 0x58, 0x14} ;
+    const unsigned int d[4] = { 0x6e, 0x77, 0x38, 0x5e} ;
+    const unsigned int n[4] = { 0x38, 0x5e, 0x5c, 0x37} ;
+
     int index ;
 
     if(delay){
          DBG("Delay\n") ;
-         for(index=8*3; index<8*4; index++)
+         for(index=8*4; index<8*5; index++)
              alarmclock.setOptVal(index, d, 8) ;
     } else {
          DBG("No Delay\n") ;
-         for(index=8*3; index<8*4; index++)
+         for(index=8*4; index<8*5; index++)
              alarmclock.setOptVal(index, n, 8) ;
     }
-*/
+#else
     #define TRAIN_INDEX (8*4)
     for(int i=0; i<14; i++)
         alarmclock.setOptVal(i+TRAIN_INDEX, delay ? delayPtn[i] : noDelayPtn[i], 1) ;
+#endif
+
 }
  
-#define DUSH 0x40
+#define DUSH  0x40
+#define BLANK 0x00
 static void char2LED(const char *str, unsigned int *ptn) {
     int i ;
     
@@ -137,6 +138,9 @@
         i = atoi(str) ; 
         ptn[0] = alarmclock.getPtn(i%10) ;
         ptn[1] = alarmclock.getPtn(i/10) ;
+    } else if((str[0] == ' ')&&(str[1] == '0')) {
+        ptn[0] = alarmclock.getPtn(0) ;    
+        ptn[1] = BLANK ;   
     } else {
         ptn[0] = DUSH ;
         ptn[1] = DUSH ;
@@ -180,41 +184,11 @@
     }
 }
 
-static     EthernetInterface eth ;
-#if 0
-static bool restartEth(void)
-{
-    int ret ;
-    printf("==== RESTARTING Ethernet ===\n") ;
-    eth->disconnect();
-    printf("eth.disconnect\n") ;
-    /*free(eth) ;
-    printf("free(eth)\n") ;
-    eth = new EthernetInterface ;
-    if(eth == NULL) {
-        ERR("Ethernet can not Restart") ;
-        return false ;
-    }
-    printf("new EthernetInterface|n") ;
-    alarmclock.setLED(11, 11) ;
-    ret = eth->init();*/
-    alarmclock.setLED(22, 22) ;
-    while(1) {
-        ret = eth->connect();
-        if(ret == 0)break ;
-        Thread::wait(10);
-    }
-    return true ;
-}
-#endif
-
 #define BUFF_SIZE 1024*64
 static char recvBuff[BUFF_SIZE] ;
 void net_main(void const *av)
 {
     int count = 0 ;
-    time_t t ; 
-    char *p[1000] ; int i ;
 #define TEMP_SIZE 5
     char hiTemp[TEMP_SIZE], loTemp[TEMP_SIZE], prec[TEMP_SIZE] ;
 
@@ -223,41 +197,32 @@
     weatherinfo.setBuff(recvBuff, BUFF_SIZE) ;
 
     while(1) {
-        setLED_Tdelay(trainstat.getStat()) ;
-        if(count%1 ==0) {
+        if(count%60 ==0){
+            int stat = trainstat.getStat() ;
+            setLED_Tdelay(stat) ;
+            if(stat)alarmclock.alarmAhead(1*60*60) ;
+            else    alarmclock.alarmAhead(0) ;
+            
+        }
+        if(count%60 ==0) {
             DBG("weatherinfo.getInfo") ;
             weatherinfo.getInfo(hiTemp, loTemp, prec) ;
             setLED_WInfo(hiTemp, loTemp, prec) ;
         }
-        t = time(NULL);
-        for( i=0; i<sizeof(p) ; i++) {
-            p[i] = (char *)malloc(1000) ;
-            if(p[i]==NULL) {
-                printf("\nHeap=%d\n", (unsigned int)i) ;
-                break ;
-            } else printf("+") ;
-        }
-        for(i=0; p[i] != NULL; i++){ printf("-") ; free(p[i]) ;}
-        printf("\n") ;
-        Thread::wait(60) ;
-        printf("wait=%d\n", time(NULL) - t ) ;
+        if(count%60*60*24)
+                ntp("ntp.jst.mfeed.ad.jp") ;
         count++ ;
-        /*
-        if((count % 1) == 0)
-            if(restartEth() == false)break ;
-        */
+        wait(1.0) ;
     }
-    printf("net_main\n") ;
 }
  
 int main()
 {
 
     int ret ;
-
+    EthernetInterface eth ;
 #define RESTART_TIMES 3
 
-    //eth =  new EthernetInterface ;
     alarmclock.setLED(11, 11) ;
     ret = eth.init();
     alarmclock.setLED(22, 22) ;

diff -r 406cd8c6dceb -r 53dd54df1441 main.txt
--- a/main.txt	Fri Oct 23 06:10:11 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,233 +0,0 @@
-#include "mbed.h"
-#include <ctype.h>
-
-#include "EthernetInterface.h"
-#include "HTTPClient.h"
-#include "NTPClient.h"
-#include "AlarmClock.h"
-#include "TrainStat.h"
-#include "WeatherInfo.h"
-#include "matchLine.h"
-  
-#if 0
-//Enable debug
-#define DBG(x, ...) std::printf("[Main : DBG]"x"\r\n", ##__VA_ARGS__);
-#define WARN(x, ...) std::printf("[Main : WARN]"x"\r\n", ##__VA_ARGS__);
-#else
-//Disable debug
-#define DBG(x, ...)
-#define WARN(x, ...)
-#endif
-
-#define ERR(x, ...) std::printf("[Main : ERR]"x"\r\n", ##__VA_ARGS__);
-
-AlarmClock alarmclock (                          
-    /* Segment 0 - 6, Dot */    D11,D6, D3, D1, D0, D10,D4, D2 , 
-    /* Digit 1 - 4        */    D5, D7, D9, D12, 
-    /* Alarm, Hour, Min, Tone */D13, D14, D15, PTC11
-)  ;
-
-TrainStat   trainstat(TOKYO_METRO /*YAHOO_TRAIN*/) ;
-WeatherInfo weatherinfo(WEATHER_HACKS) ;
-HTTPClient  httpClient;
-matchLine   watchList ;
-
-static void ntp(char *site)
-{
-    NTPClient ntp;
-
-    alarmclock.setLED(33, 33) ;
-    if (ntp.setTime(site) == 0) {
-        alarmclock.flashLED() ;
-    } else {
-        alarmclock.setLED(0, 0) ;
-        wait(30.0) ;
-        return ;
-    }
-}
-
-void clock_main(void const *av)
-{
-
-    alarmclock.start() ; 
-    while(1){        
-        alarmclock.poll() ;
-        Thread::wait(100);
-    } 
-} 
-
-#define FRONT0 0x06
-#define FRONT1 0x79 
-#define FRONT2 0x49
-#define MIDDLE 0x49
-#define TAIL0  0x49
-#define TAIL1  0x4f
-#define TAIL2  0x30
-#define ROCK   0x5c
-#define BLANK  0x00
-
-static unsigned int delayPtn[14][4] = {
-    { BLANK,  BLANK, BLANK,  BLANK } ,
-    { FRONT1, BLANK, BLANK, ROCK } ,
-    { FRONT2, FRONT0,BLANK, ROCK } ,
-    { TAIL0, FRONT1,BLANK, ROCK } ,
-    { TAIL1, FRONT2, FRONT0,ROCK } ,
-    { TAIL2, MIDDLE, FRONT1,ROCK } ,
-    { TAIL2, MIDDLE, FRONT1,ROCK } ,
-    { TAIL2, MIDDLE, FRONT1,ROCK } ,
-    { TAIL2, MIDDLE, FRONT1,ROCK } ,
-    { TAIL2, MIDDLE, FRONT1,ROCK } ,
-    { TAIL2, MIDDLE, FRONT1,ROCK } ,
-    { TAIL2, MIDDLE, FRONT1,ROCK } ,
-    { TAIL2, MIDDLE, FRONT1,ROCK } ,
-    { BLANK,  BLANK, BLANK,  BLANK } 
-} ;
-
-static unsigned int noDelayPtn[14][4] = {
-    
-//    { MIDDLE, FRONT1,BLANK,  BLANK } ,
-//    { MIDDLE, FRONT2,FRONT0, BLANK } ,
-    { BLANK,  BLANK, BLANK,  BLANK } ,
-    { MIDDLE, FRONT1,BLANK,  BLANK } ,
-    { TAIL0,  FRONT2,FRONT0, BLANK } ,
-    { TAIL1,  MIDDLE,FRONT1, BLANK } ,
-    { TAIL2,  TAIL0, FRONT2, FRONT0 } ,
-    { BLANK,  TAIL1, MIDDLE, FRONT1 } ,
-    { BLANK,  TAIL2, TAIL0,  FRONT2 } ,
-    { BLANK,  BLANK, TAIL1,  MIDDLE  } ,
-    { BLANK,  BLANK, TAIL2,  TAIL0 } ,
-    { BLANK,  BLANK, BLANK,  TAIL1 } ,
-    { BLANK,  BLANK, BLANK,  TAIL2 } ,
-    { BLANK,  BLANK, BLANK,  BLANK } ,
-    { BLANK,  BLANK, BLANK,  BLANK } ,
-    { BLANK,  BLANK, BLANK,  BLANK } 
-} ;
-       
-static void setLED_Tdelay(bool delay)
-{
-/* Delay/No Delay */
-//    const unsigned int d[4] = { 0x6e, 0x77, 0x38, 0x5e} ;
-//    const unsigned int n[4] = { 0x5c, 0x37, 0x38, 0x5e,} ;
-/*const unsigned int n[4] = { 0x09, 0x09, 0x29, 0x58} ;
-const unsigned int d[4] = { 0x09, 0x29, 0x58, 0x14} ;
-    int index ;
-
-    if(delay){
-         DBG("Delay\n") ;
-         for(index=8*3; index<8*4; index++)
-             alarmclock.setOptVal(index, d, 8) ;
-    } else {
-         DBG("No Delay\n") ;
-         for(index=8*3; index<8*4; index++)
-             alarmclock.setOptVal(index, n, 8) ;
-    }
-*/
-    #define TRAIN_INDEX (8*4)
-    for(int i=0; i<14; i++)
-        alarmclock.setOptVal(i+TRAIN_INDEX, delay ? delayPtn[i] : noDelayPtn[i], 1) ;
-}
- 
-#define DUSH 0x40
-static void char2LED(const char *str, unsigned int *ptn) {
-    int i ;
-    
-    if(isdigit(str[0]) && isdigit(str[1])){
-        i = atoi(str) ; 
-        ptn[0] = alarmclock.getPtn(i%10) ;
-        ptn[1] = alarmclock.getPtn(i/10) ;
-    } else {
-        ptn[0] = DUSH ;
-        ptn[1] = DUSH ;
-    }
-}
-
-static unsigned int precPtn[8][2] = {
-    { 0x20, 0x00 } ,    { 0x30, 0x20 } ,    { 0x12, 0x30 } ,    { 0x06, 0x12 } ,
-    { 0x24, 0x06 } ,    { 0x30, 0x24 } ,    { 0x10, 0x30 } ,    { 0x00, 0x10 } 
-
-} ;
-
-#define PREC(j, led0, led1) { led0 = precPtn[j][0]; led1 = precPtn[j][1]; }
- 
-static void setLED_WInfo(const char *hi, const char *lo, const char *prec)
-{
-    unsigned int hi_ptn[4] ;
-    unsigned int lo_ptn[4] ; 
-    unsigned int prec_ptn[4] ;
-    int index ;
-
-    DBG("hi=%s, lo=%s, prec=%s\n", hi, lo, prec) ;
-
-    char2LED(hi, hi_ptn) ;
-    hi_ptn[2] = 0x10 ;
-    hi_ptn[3] = 0x76 ; 
-    for(index=0; index<8; index++)
-        alarmclock.setOptVal(index, hi_ptn, 8) ;
-      
-    char2LED(lo, lo_ptn) ;
-    lo_ptn[2] = 0x5c ;
-    lo_ptn[3] = 0x38 ; 
-    for( ; index<16; index++)
-    alarmclock.setOptVal(index, lo_ptn, 8) ;
-
-    #define PREC_INDEX (8*2)
-    for(int i=0; i<16; i++) {
-        char2LED(prec, prec_ptn) ;
-        PREC(i%8, prec_ptn[3], prec_ptn[2]) ;
-        alarmclock.setOptVal(i+PREC_INDEX, prec_ptn, 1) ;
-    }
-}
-
-#define BUFF_SIZE 1024*64
-static char recvBuff[BUFF_SIZE] ;
-void net_main(void const *av)
-{
-    int count = 0 ;
-    time_t t ; 
-    bool sw = true ;
-    #define TEMP_SIZE 5
-    char hiTemp[TEMP_SIZE], loTemp[TEMP_SIZE], prec[TEMP_SIZE] ;
-    char *p ;
-    
-    watchList.getList("/sd/watchingLines.txt") ;
-    trainstat.setBuff(recvBuff, BUFF_SIZE) ;
-    weatherinfo.setBuff(recvBuff, BUFF_SIZE) ;
-
-    while(1) {
-        sw = !sw ;
-        trainstat.getStat() ;
-        setLED_Tdelay(sw) ;
-        if(count%1 ==0){
-            DBG("weatherinfo.getInfo") ;
-            weatherinfo.getInfo(hiTemp, loTemp, prec) ;
-            setLED_WInfo(hiTemp, loTemp, prec) ;
-        }
-        p = (char *)malloc(10000) ;
-        printf("Heap=%x\n", (unsigned int)p) ;
-        free(p) ;
-        t = time(NULL); 
-        wait(60.0) ;
-        printf("wait=%d\n", time(NULL) - t ) ;
-        count++ ;
-    }
-}
- 
-int main() {
-    EthernetInterface eth;
-    int ret ;
-    
-    alarmclock.setLED(11, 11) ;
-    ret = eth.init(); 
-    alarmclock.setLED(22, 22) ;
-    while(1) {
-        ret = eth.connect();
-        if(ret == 0)break ;
-        Thread::wait(10);
-    }
-    ntp("ntp.jst.mfeed.ad.jp") ;
-
-    #define NET_STACK   24000
-    Thread t_clock(clock_main, NULL, osPriorityNormal);
-    Thread t_net  (net_main,   NULL, osPriorityNormal, NET_STACK  );
-    while(1)Thread::wait(1000);
-}