English

Revision 51:45d42af201c2, committed 2013-08-09

Comitter:

nyatla

Date:

Fri Aug 09 05:19:01 2013 +0000

Parent:

50:35e765380772

Child:

52:2b047f8788ab

Commit message:

bugfix; update onchip contents; update MiMic core library to r301

Changed in this revision

--- a/core/NyLPC_cMiMicEnv.h	Thu Aug 08 15:21:43 2013 +0000
+++ b/core/NyLPC_cMiMicEnv.h	Fri Aug 09 05:19:01 2013 +0000
@@ -13,7 +13,7 @@
 #endif /* __cplusplus */
 
 
-#define NyLPC_cMiMicEnv_VERSION "MiMic/1.4.30"
+#define NyLPC_cMiMicEnv_VERSION "MiMic/1.4.50"
 
 
 #ifdef __cplusplus

--- a/core/net/NyLPC_cNetConfig.h	Thu Aug 08 15:21:43 2013 +0000
+++ b/core/net/NyLPC_cNetConfig.h	Fri Aug 09 05:19:01 2013 +0000
@@ -71,20 +71,20 @@
 
     /** インタフェイス層の設定*/
 };
-#define NyLPC_TcNetConfig_IPV4_FLAG_MODE_MASK 3
-#define NyLPC_TcNetConfig_IPV4_FLAG_MODE_MANUAL 0
-#define NyLPC_TcNetConfig_IPV4_FLAG_MODE_DHCP 1
-#define NyLPC_TcNetConfig_IPV4_FLAG_MODE_AUTOIP 2
+#define NyLPC_TcNetConfig_IPV4_FLAG_MODE_MASK   0x00000003
+#define NyLPC_TcNetConfig_IPV4_FLAG_MODE_MANUAL 0x00000000
+#define NyLPC_TcNetConfig_IPV4_FLAG_MODE_DHCP   0x00000001
+#define NyLPC_TcNetConfig_IPV4_FLAG_MODE_AUTOIP 0x00000002
 #define NyLPC_TcNetConfig_IPV4_FLAG_MODE_APIPA (NyLPC_TcNetConfig_IPV4_FLAG_MODE_DHCP|NyLPC_TcNetConfig_IPV4_FLAG_MODE_AUTOIP)
 /*--------------------------------------------------
  * NyLPC_TcNetConfig.services.flags
  --------------------------------------------------*/
 
 /**
- * MDNSサービスの有効・無効
+ * MDNSサービスの有効・無効(いまのところビットパターンなので注意！)
  */
-#define NyLPC_TcNetConfig_SERVICE_FLAG_MDNS 1
-#define NyLPC_TcNetConfig_SERVICE_FLAG_UPNP 2
+#define NyLPC_TcNetConfig_SERVICE_FLAG_MDNS 0x00000001
+#define NyLPC_TcNetConfig_SERVICE_FLAG_UPNP 0x00000002
 
 
 /**

--- a/core/net/httpd/mod/NyLPC_cMocMiMicSetting.c	Thu Aug 08 15:21:43 2013 +0000
+++ b/core/net/httpd/mod/NyLPC_cMocMiMicSetting.c	Fri Aug 09 05:19:01 2013 +0000
@@ -33,7 +33,7 @@
 #include "../../NyLPC_cNet.h"
 #include <ctype.h>
 
-#define MOD_VERSION "ModMiMicSetting/1.3"
+#define MOD_VERSION "ModMiMicSetting/1.4"
 #define SIZE_OF_SETUP_PARAM 8
 struct TModMiMicSettingRequest
 {

--- a/mbed/Net.cpp	Thu Aug 08 15:21:43 2013 +0000
+++ b/mbed/Net.cpp	Fri Aug 09 05:19:01 2013 +0000
@@ -7,6 +7,7 @@
 #include "mbed.h"
 namespace MiMic
 {
+
     const char* Net::UPNP_ROOT_PATH="upnp";
 
     Net::Net()
@@ -42,12 +43,12 @@
             }
         }
         //start mDNS
-        if(base_cfg->services.flags & NyLPC_TcNetConfig_SERVICE_FLAG_MDNS !=0){
+        if((base_cfg->services.flags & NyLPC_TcNetConfig_SERVICE_FLAG_MDNS) !=0){
             this->_mdns=(NyLPC_TcMDnsServer_t*)malloc(sizeof(NyLPC_TcMDnsServer_t));
             NyLPC_cMDnsServer_initialize(this->_mdns,i_cfg.refMdnsRecord());        
         }
         //start UPnP
-        if(base_cfg->services.flags & NyLPC_TcNetConfig_SERVICE_FLAG_UPNP !=0){
+        if((base_cfg->services.flags & NyLPC_TcNetConfig_SERVICE_FLAG_UPNP) !=0){
             this->_upnp=(NyLPC_TcUPnP_t*)malloc(sizeof(NyLPC_TcUPnP_t));
             NyLPC_cUPnP_initialize(this->_upnp,i_cfg.getHttpPort(),UPNP_ROOT_PATH,i_cfg.refUPnPDevDesc());        
 

--- a/mbed/NetConfig.cpp	Thu Aug 08 15:21:43 2013 +0000
+++ b/mbed/NetConfig.cpp	Fri Aug 09 05:19:01 2013 +0000
@@ -12,7 +12,7 @@
  */
 const static char* UPNP_DEVICE_TYPE ="urn:schemas-upnp-org:device:Basic:1";
 const static char* UPNP_DEFAULT_FRENDLY_NAME="MiMic Device(LPC176x)";
-const static char* UPNP_DEFAULT_MANUFACTUR_NAME="MiMicProject@nyatla.jp";
+const static char* UPNP_DEFAULT_MANUFACTUR_NAME="nyatla.jp";
 const static char* UPNP_DEFAULT_MANUFACTUR_URL="http://nyatla.jp/";
 const static char* UPNP_DEFAULT_MODEL_NAME="MiMic UPnP device.";
 const static char* STR_EMPTY="";
@@ -43,7 +43,7 @@
     strcpy(v.hostname,"MiMic");
     NyLPC_uitoa2(NyLPC_TcIPv4Config_getEtherMac000120203(&(v.super)),v.hostname+ 5,16,8);
     NyLPC_uitoa2((NyLPC_TcIPv4Config_getEtherMac0405xxxx(&(v.super))>>16)&0xffff,v.hostname+13,16,4);
-    v.services.flags=NyLPC_TcNetConfig_SERVICE_FLAG_MDNS;
+    v.services.flags=NyLPC_TcNetConfig_SERVICE_FLAG_MDNS|NyLPC_TcNetConfig_SERVICE_FLAG_UPNP;
 }
 
 static void updateOnchipConfig(NyLPC_TcNetConfig& v)
@@ -270,6 +270,7 @@
 
 bool NetConfig::loadFromFile(const char* i_file)
 {
+#define NUMBER_OF_NAME 8
     const static char* tbl[]= {
         "macaddr",  //0
         "ipaddr",   //1
@@ -277,7 +278,8 @@
         "gateway",  //3
         "srv_http_port",//4
         "srv_mdns",//5
-        "host",//6
+        "srv_upnp"  //6
+        "host",//7
     };
     char tmp[32];
     union {
@@ -296,7 +298,7 @@
     while(fgets(tmp,31,fp)) {
         p=NyLPC_cFormatTextReader_seekSpace(tmp)+tmp;//skip space
         l=NyLPC_cFormatTextReader_readWord(p,&key);
-        for(int i=0; i<7; i++) {
+        for(int i=0; i<NUMBER_OF_NAME; i++) {
             if(l>=0 && NyLPC_strnicmp(key,tbl[i],l)==0) {
                 p+=l;//skip keyname
                 p=NyLPC_cFormatTextReader_seekSpace(p)+p;//skip space
@@ -349,6 +351,14 @@
                         break;
                     case 6:
                         l=NyLPC_cFormatTextReader_readWord(p,&t);
+                        if((*t=='y' || *t=='Y')) {
+                            this->setSrvUPnP(true);
+                        } else if((*t=='n' || *t=='N')) {
+                            this->setSrvUPnP(false);
+                        }
+                        break;
+                    case 7:
+                        l=NyLPC_cFormatTextReader_readWord(p,&t);
                         if(l>1) {
                             this->setHostName(t,l);
                         }