Revision 93:6afc7c06037f, committed 2014-10-02

Comitter:

nyatla

Date:

Thu Oct 02 05:21:58 2014 +0000

Parent:

92:4f77028cce64

Child:

94:b5eabbb28ae0

Commit message:

???????????K64????????????????????????

Changed in this revision

--- a/core/NyLPC_cMiMicEnv.c	Wed Oct 01 13:58:53 2014 +0000
+++ b/core/NyLPC_cMiMicEnv.c	Thu Oct 02 05:21:58 2014 +0000
@@ -1,21 +1,24 @@
 #include "NyLPC_cMiMicEnv.h"
 #include "../uip/NyLPC_cUipService_protected.h"
 
-const static char* VERSION="MiMic/1.6.0";
+const static char* VERSION="MiMic/1.6.2";
 
 #if NyLPC_MCU==NyLPC_MCU_LPC4088
 const static char* MCU="LPC4088";
+static const char* PNAME_LPCXPRESSO="LPCXpresso";
+static const char* PNAME_MBED="mbed";
 #elif NyLPC_MCU==NyLPC_MCU_LPC17xx
 const static char* MCU="LPC176x";
+static const char* PNAME_LPCXPRESSO="LPCXpresso";
+static const char* PNAME_MBED="mbed";
 #elif NyLPC_MCU==NyLPC_MCU_K64F
 const static char* MCU="K64F";
+static const char* PNAME_FRDM="FRDM";
 #endif
 
 const static char* UNKNOWN="UNKNOWN";
 
 
-static const char* PNAME_LPCXPRESSO="LPCXpresso";
-static const char* PNAME_MBED="mbed";
 
 
 
@@ -25,6 +28,9 @@
     case NyLPC_cMiMicEnv_VERSION:
         return VERSION;
     case NyLPC_cMiMicEnv_SHORT_NAME:
+#if NyLPC_MCU==NyLPC_MCU_K64F
+        return PNAME_FRDM;
+#else
         switch(*(NyLPC_cUipService_refDeviceName())){
         case 'L':
             return PNAME_LPCXPRESSO;
@@ -33,6 +39,7 @@
         default:
             return UNKNOWN;
         }
+#endif
     case NyLPC_cMiMicEnv_ETHERNET_PHY:
         return NyLPC_cUipService_refDeviceName();
     case NyLPC_cMiMicEnv_MCU_NAME:

--- a/core/driver/flash/k64f/NyLPC_cMiMicConfiglation_K64F.c	Wed Oct 01 13:58:53 2014 +0000
+++ b/core/driver/flash/k64f/NyLPC_cMiMicConfiglation_K64F.c	Thu Oct 02 05:21:58 2014 +0000
@@ -57,6 +57,8 @@
     d.mac_04_05_xx_xx=i_congfiglation->mac_04_05_xx_xx;
     d.ipv4_flags=i_congfiglation->ipv4_flags;
     d.ipv4_addr_net=i_congfiglation->ipv4_addr_net;
+    d.ipv4_mask_net=i_congfiglation->ipv4_mask_net;
+    d.ipv4_drut_net=i_congfiglation->ipv4_drut_net;
     d.srv_flags=i_congfiglation->srv_flags;
     d.http_port=i_congfiglation->http_port;
     d.padding32=0xffff;

--- a/mbed/utils/PlatformInfo.cpp	Wed Oct 01 13:58:53 2014 +0000
+++ b/mbed/utils/PlatformInfo.cpp	Thu Oct 02 05:21:58 2014 +0000
@@ -7,15 +7,24 @@
 namespace MiMic
 {
     int PlatformInfo::_pftype=PF_UNKNOWN;
+#if PlatformInfo_DETECTION_MODE==PlatformInfo_DETECTION_MODE_MBED
     void PlatformInfo::check()
     {
-    #if PlatformInfo_DETECTION_MODE==PlatformInfo_DETECTION_MODE_MBED
         _pftype=PF_MBED;
         return;
-    #elif PlatformInfo_DETECTION_MODE==PlatformInfo_DETECTION_MODE_LPCXPRESSO
+    }
+#elif PlatformInfo_DETECTION_MODE==PlatformInfo_DETECTION_MODE_LPCXPRESSO
+    void PlatformInfo::check()
+    {
         _pftype=PF_LPCXPRESSO;
         return;
-    #elif PlatformInfo_DETECTION_MODE==PlatformInfo_DETECTION_MODE_AUTO
+    }
+#elif PlatformInfo_DETECTION_MODE==PlatformInfo_DETECTION_MODE_AUTO    
+    void PlatformInfo::check()
+    {
+#   ifdef TARGET_K64F
+        _pftype=PF_MBED;        
+#   else
         //LPCXpresso is return S_RESET_ST==1 when standalone.
         wait_ms(200);
         unsigned int v;
@@ -34,10 +43,12 @@
         }
         _pftype=PF_LPCXPRESSO;
         return;
-    #else
-        #error "ERROR!"
-    #endif
+#   endif        
     }
+#else
+    #error "ERROR!"
+#endif
+    
     int PlatformInfo::getPlatformType()
     {
         if(_pftype==PF_UNKNOWN){