Fix the Deluge rollback gesture and increase the total number of Deluge images to...

[tinyos-2.x.git] / tos / lib / net / Deluge / extra / NetProgC.nc

diff --git a/tos/lib/net/Deluge/extra/NetProgC.nc b/tos/lib/net/Deluge/extra/NetProgC.nc
index f88966181c924910d3c72cae08e144aa3f91b4c3..aeef0279559c661f87ee64a4a8210ac1f1ede017 100644 (file)
--- a/tos/lib/net/Deluge/extra/NetProgC.nc
+++ b/tos/lib/net/Deluge/extra/NetProgC.nc
@@ -46,9 +46,18 @@ implementation {
   NetProg = NetProgM;
 
   MainC.SoftwareInit -> NetProgM.Init;
-  NetProgM.StorageMap[0] -> DelugeStorageC.StorageMap[0];
-  NetProgM.StorageMap[1] -> DelugeStorageC.StorageMap[1];
+  NetProgM.DelugeStorage[VOLUME_GOLDENIMAGE] -> DelugeStorageC.DelugeStorage[VOLUME_GOLDENIMAGE];
+  NetProgM.DelugeStorage[VOLUME_DELUGE1] -> DelugeStorageC.DelugeStorage[VOLUME_DELUGE1];
+  NetProgM.DelugeStorage[VOLUME_DELUGE2] -> DelugeStorageC.DelugeStorage[VOLUME_DELUGE2];
+  NetProgM.DelugeStorage[VOLUME_DELUGE3] -> DelugeStorageC.DelugeStorage[VOLUME_DELUGE3];
   NetProgM.DelugeMetadata -> DelugeStorageC;
   NetProgM.IFlash -> IFlash;
   NetProgM.Crc -> CrcP;
+  
+  components LedsC;
+  NetProgM.Leds -> LedsC;
+  
+  components CC2420ControlP, ActiveMessageAddressC;
+  NetProgM.CC2420Config -> CC2420ControlP;
+  NetProgM.setAmAddress -> ActiveMessageAddressC;
 }