kurisaw 1 éve
szülő
commit
7afc56c9b2

+ 5 - 5
SConscript

@@ -11,18 +11,18 @@ group = []
 src = Glob('src/common/*.c')
 SrcRemove(src, ['src/common/pf_snmp.c'])
 
-group_common = DefineGroup('p-net/common', src, depend = [''], CPPPATH = CPPPATH)
+group_common = DefineGroup('p-net/common', src, depend = ['PKG_USING_PNET'], CPPPATH = CPPPATH)
 
 CPPPATH = [cwd + '/src/device']
 src = Glob('src/device/*.c')
 
-group_device = DefineGroup('p-net/device', src, depend = [''], CPPPATH = CPPPATH)
+group_device = DefineGroup('p-net/device', src, depend = ['PKG_USING_PNET'], CPPPATH = CPPPATH)
 
 CPPPATH = [cwd + '/osal/include']
 CPPPATH += [cwd + '/osal/src/rtthread']
 src = Glob('osal/src/rtthread/*.c')
 
-group_osal = DefineGroup('p-net/osal', src, depend = [''], CPPPATH = CPPPATH)
+group_osal = DefineGroup('p-net/osal', src, depend = ['PKG_USING_PNET'], CPPPATH = CPPPATH)
 
 CPPPATH = [cwd + '/src/ports/rtthread']
 CPPPATH += [cwd + '/src/ports/rtthread/pnal']
@@ -30,12 +30,12 @@ CPPPATH += [cwd + '/src/ports/rtthread/pnal']
 src = src + Glob('src/ports/rtthread/pnal/*.c')
 SrcRemove(src, ['src/ports/rtthread/pnal/pnal_snmp.c'])
 
-group_port = DefineGroup('p-net/port', src, depend = [''], CPPPATH = CPPPATH)
+group_port = DefineGroup('p-net/port', src, depend = ['PKG_USING_PNET'], CPPPATH = CPPPATH)
 
 CPPPATH = [cwd + '/src/ports/rtthread/pn_dev']
 src = Glob('src/ports/rtthread/pn_dev/*.c')
 
-group_sample = DefineGroup('p-net/sample', src, depend = [''], CPPPATH = CPPPATH)
+group_sample = DefineGroup('p-net/sample', src, depend = ['PKG_USING_PNET'], CPPPATH = CPPPATH)
 
 group = group_common + group_device + group_port + group_sample
 

+ 3 - 6
src/ports/rtthread/pn_dev/sampleapp_board.c

@@ -19,20 +19,17 @@
 
 #include "drv_gpio.h"
 
-#define LED_PIN     rt_pin_get("PI8")
-#define USER_KEY    rt_pin_get("PB11")
-
 /************************* Utilities ******************************************/
 
 void app_set_led (uint16_t id, bool led_state)
 {
    if (id == APP_DATA_LED_ID)
    {
-       rt_pin_write(LED_PIN, led_state ? 1 : 0);
+       rt_pin_write(PNET_LED_PIN, led_state ? 1 : 0);
    }
    else if (id == APP_PROFINET_SIGNAL_LED_ID)
    {
-       rt_pin_write(LED_PIN, led_state ? 1 : 0);
+       rt_pin_write(PNET_LED_PIN, led_state ? 1 : 0);
    }
 }
 
@@ -40,7 +37,7 @@ bool app_get_button (uint16_t id)
 {
     if (id == 0)
     {
-        return rt_pin_read(USER_KEY) == 1;
+        return rt_pin_read(PNET_USER_KEY) == 1;
     }
     else if (id == 1)
     {

+ 17 - 2
src/ports/rtthread/pn_dev/sampleapp_main.c

@@ -26,8 +26,11 @@
 
 #include <string.h>
 
+#if !defined(APP_DEFAULT_ETHERNET_INTERFACE) || (APP_DEFAULT_FILE_DIRECTORY)
 #define APP_DEFAULT_ETHERNET_INTERFACE "e00"
-#define APP_DEFAULT_FILE_DIRECTORY     "/sdcard"
+#define APP_DEFAULT_FILE_DIRECTORY     "/"
+#endif
+
 #define APP_LOG_LEVEL                  APP_LOG_LEVEL_DEBUG
 
 #define APP_BG_WORKER_THREAD_PRIORITY  6
@@ -110,7 +113,19 @@ void pnet_main (void *param)
 
 int pnet_app(void)
 {
-    rt_thread_t pnet_thread = rt_thread_create("pnet", pnet_main, RT_NULL, 51240, 10, 10);
+#if defined(PNET_USING_RAMFS)
+   static char ramfs_buf[8192];
+   if (dfs_mount(RT_NULL, "/", "ram", 0, dfs_ramfs_create(ramfs_buf,8192)) == 0)
+   {
+      rt_kprintf("RAM file system initializated!\n");
+   }
+   else
+   {
+      rt_kprintf("RAM file system initializate failed!\n");
+   }
+#endif
+
+    rt_thread_t pnet_thread = rt_thread_create("pnet", pnet_main, RT_NULL, 5124, 10, 10);
     rt_thread_startup(pnet_thread);
     return 0;
 }