new conf

Author: benny.saxen

help.txt

@@ -27,10 +27,10 @@ Window:
  w  toggles window layout mode.
 
 Information:
- c  show current configuration
  d  show scenario delay overview
  l  show loop information
  s  show debug sketch
+ e  show runtime error log
 ------------------------------------
  q  quit Run Mode, enter Admin Mode. 
  h  show this information

help_command.txt

@@ -1,13 +1,11 @@
 exit             Exit Simuino
 
-load <steps>     Load current configuration and
-                 create scenario of length <steps>
-                 if no parameters, <steps> are as configured
+load             Load selected sketch
 
-list             List available configurations (max 10). 
+list             List available sketches (max 100). 
                  Selected is marked with '>'
 
-<n>              Select configuration according to number in list
+<n>              Select sketch according to number in list
 
 run <steps>      Step until step=<steps>
                  If no steps given - enter Run Mode
@@ -16,33 +14,24 @@ loop <loop>      Step until loop <loop>
 
 reset            Reset simulation. Current step set to 0
 
-save  <name>     Save current configuration as <name>
-                 If no <name>, saved to current configuration
-
-del   <name>     Delete configuration. If no parameter,
-                 current configuration will be deleted.
-                 Default configuration cannot be deleted.
-
 add   <...>      Add pin-value-point in scenario
                  Ex. add a 3 100 650
                  Analog Pin 3 will read values 650 
                  from step 100 and forward.
 
-rem   <...>	 Remove pin-value-point in scenario
+rem   <...>	     Remove pin-value-point in scenario
                  Ex. rem d 7 50
                  Digital Pin 7 will no longer read values
                  specified at step 50	 
 
-info  <area>     Show info about <area>
+info  <par>      Show info about <par>
     - scen       Show scenario data
     - conf       Display configuration
     - loop       Show loop information
     - error      Show Servuino errors
     - g++        Show compilation errors
     - help       Show command information
 
-conf             Show current configuration
-conf <par> <val> Edit configuration with commands below:
-   - win         Set Window layout mode to <val> (0,1,2,3,4)
-   - sketch      Set sketch source file
-   - sim <steps> Total steps in simulation
+sketch           Show current sketch
+   
+help             Show this information

settings.txt

@@ -1,2 +1,2 @@
-# Simuino Setting Sun Oct 27 22:11:49 2013
+# Simuino Setting Mon Oct 28 21:23:20 2013
 SKETCH: helloWorld_UNO.ino

simuino.c

@@ -59,11 +59,11 @@ int x_pinRW[MAX_TOTAL_PINS][SCEN_MAX];
 #define WIN_MODES 5
 
 // Sketch Status 
-#define SO_VOID      1
-#define SO_SELECTED  2
-#define SO_LOADED    3
-#define SO_ERROR     4
-
+#define SO_VOID       1
+#define SO_SELECTED   2
+#define SO_LOADED     3
+#define SO_COMP_ERROR 4
+#define SO_RUN_ERROR  5
 
 // Current data
 int  currentStep = 0;
@@ -332,7 +332,9 @@ void loadCurrentSketch()
     unoInfo();
     sprintf(temp,"Sketch load ready: %s",confSketchFile);
     putMsg(msg_h-2,temp);
+    g_currentSketchStatus = SO_LOADED;
   }
+  if(res != 0)g_currentSketchStatus = SO_COMP_ERROR;
 }
 
 //====================================
@@ -506,7 +508,7 @@ void openCommand()
 	      strcpy(currentConf,command[1]);
 	      strcat(currentConf,".ino");
 	      readConfig(currentConf);
-              g_warning = S_YES;
+          g_warning = S_YES;
 	      unoInfo();
 	    }
 	  readMsg(currentConf);
@@ -638,6 +640,7 @@ void openCommand()
 	      selectProj(projNo,g_currentSketch);
 	      readConfig(g_currentSketch);
 	      g_warning = S_YES;
+	      g_currentSketchStatus = SO_SELECTED;
 	      setRange(confBoardType);
 	      init(confWinMode);
           unoInfo();
@@ -721,23 +724,27 @@ void runMode(int stop)
 	  return;
 	}
 
-      if (ch=='h')
-        {
+    if (ch=='h')
+    {
           readMsg(fileInfoRun);
-        }
-      else if (ch=='c')
-        {
+    }
+    else if (ch=='c')
+    {
           readMsg(currentConf);
-        }
-      else if (ch=='d')
-        {
+    }
+    else if (ch=='e')
+    {
+         readMsg(fileServError);
+    }
+    else if (ch=='d')
+    {
           readMsg(fileServTime);
-        }
-      else if(ch=='y' ) // scenario
+    }
+    else if(ch=='y' ) // scenario
 	{
 	  readMsg(fileServScen);
 	}
-      else if (ch=='x')
+    else if (ch=='x')
 	{
 	  readMsg(fileServScenario);
 	}

simuino_lib.c

@@ -94,10 +94,11 @@ void show(WINDOW *win)
       wmove(win,1,2);
       wprintw(uno,"Selected Sketch: %s              ",g_currentSketch);
       wmove(win,2,2);
-     if(g_currentSketchStatus == SO_VOID)wprintw(uno,"Status.........: -");
-     if(g_currentSketchStatus == SO_SELECTED)wprintw(uno,"Status.........: selected");
-     if(g_currentSketchStatus == SO_LOADED)wprintw(uno,"Status.........: loaded");
-     if(g_currentSketchStatus == SO_ERROR)wprintw(uno,"Status.........: error");
+     if(g_currentSketchStatus == SO_VOID)      wprintw(uno,"Status.........: -");
+     if(g_currentSketchStatus == SO_SELECTED)  wprintw(uno,"Status.........: selected");
+     if(g_currentSketchStatus == SO_LOADED)    wprintw(uno,"Status.........: loaded");
+     if(g_currentSketchStatus == SO_RUN_ERROR) wprintw(uno,"Status.........: runtime error");
+     if(g_currentSketchStatus == SO_COMP_ERROR)wprintw(uno,"Status.........: compile error");
     }
   if(win == ser)
     {
@@ -298,9 +299,14 @@ void unoInfo()
   wmove(uno,ap+2,3); 
 
   if(g_existError == S_YES)
-    wprintw(uno,"  [Errors - err]            ");
+  {
+    wprintw(uno,"  [More details - type: err  (or r in run-mode)]");
+  }
   else if(g_warning == S_YES)
-    wprintw(uno,"  [Possible Mismatch - load]");
+  {
+    wprintw(uno,"  [Load status unknown - load]");
+   // g_currentSketchStatus = SO_SELECTED;
+  }
   else
     wprintw(uno,"                            ");
 
@@ -1502,7 +1508,11 @@ void anyErrors()
   sprintf(syscom,"cat %s %s %s> %s",fileError,fileServError,fileCopyError,fileTemp);
   x = system(syscom); 
   x = countRowsInFile(fileTemp);
-  if(x > 0 && x != 999)g_existError = S_YES;
+  if(x > 0 && x != 999)
+  {
+	  g_existError = S_YES;
+	  g_currentSketchStatus = SO_RUN_ERROR;
+  }
   if(x == 999)putMsg(2,"Unable to read error file");
   show(uno);
 }
@@ -1532,7 +1542,7 @@ int loadSketch(char sketch[])
       wprintw(msg,"press any key to continue >>");
       wrefresh(msg);
       ch = getchar();
-      putMsg(2,"Check your sketch or report an Issue to Simuino");
+      putMsg(2,"Check your sketch or report an issue to Simuino");
       return(1);
     }
   readSketchInfo();