Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / tossim / tossim.i

diff --git a/tos/lib/tossim/tossim.i b/tos/lib/tossim/tossim.i
index e819846db63ff32b4fe077df9b7b81c5a0f75548..5735a1d5513d62efe7e1adf723255b77a0f4bc77 100644 (file)
--- a/tos/lib/tossim/tossim.i
+++ b/tos/lib/tossim/tossim.i
@@ -298,8 +298,8 @@ PyObject* listFromArray(char* type, char* ptr, int len) {
         }
       }
       else {
-        app->variableNames[i] = "<bad string>";
-        app->variableTypes[i] = "<bad string>";
+        app->variableNames[i] = (char*)"<bad string>";
+        app->variableTypes[i] = (char*)"<bad string>";
       }
     }
 
@@ -347,6 +347,9 @@ class Mote {
   void turnOn();
   Variable* getVariable(char* name);
 
+  void addNoiseTraceReading(int val);
+  void createNoiseModel();
+  int generateNoise(int when);
 };
 
 class Tossim {
@@ -367,6 +370,7 @@ class Tossim {
 
   void addChannel(char* channel, FILE* file);
   bool removeChannel(char* channel, FILE* file);
+  void randomSeed(int seed);
 
   bool runNextEvent();
   MAC* mac();