Diff: main.cpp

Revision:

28:3d7bac2a6278

Parent:

27:a3b49b4a814d

Child:

33:8e869201db67

--- a/main.cpp	Thu Jul 18 08:54:13 2013 +0000
+++ b/main.cpp	Fri Aug 09 09:06:45 2013 +0000
@@ -11,6 +11,8 @@
 LocalFileSystem2 lf("local");
 SDFileSystem sd(p5, p6, p7, p8,"sd");
 
+Net* net;
+
 
 /**
  * MiMic RemoteMCU httpd.<br/>
@@ -30,17 +32,22 @@
     ModRemoteMcu remotemcu; // remotemcu API
     ModLocalFileSystem modlocal; //FileSystem mounter
     ModLocalFileSystem modsd; //FileSystem mounter
-    ModFileIo modfio;   //fileupload API    
+    ModFileIo modfio;   //fileupload API
+    ModUPnPDevice modupnp;
 public:
-    MiMicRemoteMcu(NetConfig& i_cfg):Httpd(i_cfg._inst.services.http_port)
+    MiMicRemoteMcu(NetConfig& i_cfg):Httpd(i_cfg.getHttpPort())
     {
-        this->modromfs.setParam("rom",RMCU_FSDATA,17);
+        this->modromfs.setParam("rom",RMCU_FSDATA,18);
         this->mimicsetting.setParam("setup");
         this->remotemcu.setParam("mvm");
         this->modlocal.setParam("local");
-        this->modsd.setParam("sd");
+        this->modsd.setParam("sd",ModLocalFileSystem::FST_SDFATFS);
         this->modfio.setParam("fio");
+        this->modupnp.setParam(*net);
     }
+    /**
+     * Http handler
+     */
     virtual void onRequest(HttpdConnection& i_connection)
     {
         //try to ModRomFS module.
@@ -67,6 +74,10 @@
         if(this->modfio.execute(i_connection)){
             return;
         }
+        //try to UPnP
+        if(this->modupnp.execute(i_connection)){
+            return;
+        }
         
         //Otherwise, Send the redirect response to /rom/index.html
         i_connection.sendHeader(302,
@@ -77,17 +88,25 @@
     }
 };
 
+
+NetConfig cfg; //create network configulation  with onchip-setting.
 int main()
 {
-    NetConfig cfg; //create network configulation  with onchip-setting.
-    Net net;  //create a net instance    
+    net=new Net();//Net constructor must be created after started RTOS
+    //Prepare configulation.
+    cfg.setUPnPIcon(64,64,8,"image/png","/rom/icon.png");
+    cfg.setUPnPUdn(0xe29f7101,0x4ba2,0x01e0,0);
+    cfg.setFriendlyName("MiMicRemoteMCU");
+    cfg.setUPnPPresentationURL("/rom/index.html");
+
     //try to override setting by local file.
     if(!cfg.loadFromFile("/local/mimic.cfg")){
         Thread::wait(2000);//wait for SD card initialization.
         cfg.loadFromFile("/sd/mimic.cfg");
     }
+    
     MiMicRemoteMcu httpd(cfg); //create a httpd instance.
-    net.start(cfg);
+    net->start(cfg);
     httpd.loop();  //start httpd loop.
     return 0;
 }