diff options
| -rw-r--r-- | dumblogger/ConsoleApp.py | 22 | ||||
| -rw-r--r-- | dumblogger/ConsoleFrame.py | 83 | ||||
| -rw-r--r-- | dumblogger/Monitor.cpp | 10 | ||||
| -rw-r--r-- | dumblogger/datalogger.cpp | 20 |
4 files changed, 120 insertions, 15 deletions
diff --git a/dumblogger/ConsoleApp.py b/dumblogger/ConsoleApp.py new file mode 100644 index 0000000..5bc07de --- /dev/null +++ b/dumblogger/ConsoleApp.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +#Boa:App:BoaApp + +import wx + +import ConsoleFrame + +modules ={u'ConsoleFrame': [1, 'Main frame of Application', u'ConsoleFrame.py']} + +class BoaApp(wx.App): + def OnInit(self): + self.main = ConsoleFrame.create(None) + self.main.Show() + self.SetTopWindow(self.main) + return True + +def main(): + application = BoaApp(0) + application.MainLoop() + +if __name__ == '__main__': + main() diff --git a/dumblogger/ConsoleFrame.py b/dumblogger/ConsoleFrame.py new file mode 100644 index 0000000..276103a --- /dev/null +++ b/dumblogger/ConsoleFrame.py @@ -0,0 +1,83 @@ +#Boa:Frame:Frame1 + +import wx + +def create(parent): + return Frame1(parent) + +[wxID_FRAME1, wxID_FRAME1CMD, wxID_FRAME1OUTPUT, wxID_FRAME1REBUILD, + wxID_FRAME1RESET, wxID_FRAME1STATUSBAR1, +] = [wx.NewId() for _init_ctrls in range(6)] + +class Frame1(wx.Frame): + def _init_coll_boxSizer1_Items(self, parent): + # generated method, don't edit + + parent.AddSizer(self.boxSizer2, 0, border=0, flag=wx.EXPAND) + parent.AddSizer(self.boxSizer3, 1, border=0, flag=wx.EXPAND) + parent.AddWindow(self.statusBar1, 0, border=0, flag=0) + + def _init_coll_boxSizer2_Items(self,parent): + parent.AddWindow(self.RESET, 0, border=0, flag=0) + parent.AddWindow(self.REBUILD, 0, border=0, flag=0) + + def _init_coll_boxSizer3_Items(self, parent): + parent.AddWindow(self.OUTPUT, 1, border=0, flag=wx.EXPAND) + parent.AddWindow(self.CMD, 0, border=0, flag=wx.EXPAND) + + def _init_sizers(self): + # generated method, don't edit + self.boxSizer1 = wx.BoxSizer(orient=wx.VERTICAL) + + self.boxSizer2 = wx.BoxSizer(orient=wx.HORIZONTAL) + + self.boxSizer3 = wx.BoxSizer(orient=wx.VERTICAL) + + self._init_coll_boxSizer1_Items(self.boxSizer1) + self._init_coll_boxSizer2_Items(self.boxSizer2) + self._init_coll_boxSizer3_Items(self.boxSizer3) + + self.SetSizer(self.boxSizer1) + + def _init_ctrls(self, prnt): + # generated method, don't edit + wx.Frame.__init__(self, id=wxID_FRAME1, name='', parent=prnt, + pos=wx.Point(265, 195), size=wx.Size(838, 526), + style=wx.DEFAULT_FRAME_STYLE, title='BOM5k Console') + self.SetClientSize(wx.Size(838, 504)) + + self.CMD = wx.TextCtrl(id=wxID_FRAME1CMD, name=u'CMD', parent=self, + pos=wx.Point(0, 62), size=wx.Size(100, 22), style=0, value=u'>') + self.CMD.Bind(wx.EVT_TEXT, self.OnCMDText, id=wxID_FRAME1CMD) + self.CMD.Bind(wx.EVT_KILL_FOCUS, self.OnCMDKillFocus) + + self.OUTPUT = wx.TextCtrl(id=wxID_FRAME1OUTPUT, name=u'OUTPUT', + parent=self, pos=wx.Point(0, 40), size=wx.Size(100, 22), style=0, + value=u'...') + + self.REBUILD = wx.Button(id=wxID_FRAME1REBUILD, label=u'REBUILD', + name=u'REBUILD', parent=self, pos=wx.Point(0, 20), + size=wx.Size(84, 20), style=0) + self.REBUILD.Bind(wx.EVT_BUTTON, self.OnREBUILDButton, + id=wxID_FRAME1REBUILD) + + self.RESET = wx.Button(id=wxID_FRAME1RESET, label=u'RESET', + name=u'RESET', parent=self, pos=wx.Point(0, 0), size=wx.Size(84, + 20), style=0) + + self.statusBar1 = wx.StatusBar(id=wxID_FRAME1STATUSBAR1, + name='statusBar1', parent=self, style=0) + + self._init_sizers() + + def __init__(self, parent): + self._init_ctrls(parent) + + def OnREBUILDButton(self, event): + event.Skip() + + def OnCMDText(self, event): + event.Skip() + + def OnCMDKillFocus(self, event): + event.Skip() diff --git a/dumblogger/Monitor.cpp b/dumblogger/Monitor.cpp index 5b37c4d..93e82ea 100644 --- a/dumblogger/Monitor.cpp +++ b/dumblogger/Monitor.cpp @@ -87,11 +87,13 @@ extern "C" {int sdoPrintf(char *out, const char *format, ...);} void toConsole(const char *format, ...){ va_list args; va_start( args, format ); - sprintf(actionBuffer, format, args ); + vsprintf(actionBuffer, format, args ); if(SerialUSB.isConnected() && (SerialUSB.getDTR() || SerialUSB.getRTS())) { SerialUSB.write(actionBuffer); SerialUSB.write("\r\n"); - } + } + va_end(args); + } uint8_t NOPaction(uint8_t source) { @@ -255,7 +257,7 @@ struct tm theTime; void parseLine(cmdBuffer *buff) { // should check for more than 4 characters - buff->args=buff->line+4; + buff->args=(buff->line)+4; buff->verb=buff->line[3]; //buff->line[3]='\0'; buff->kwIndex=lookupIndex(buff->line); @@ -275,7 +277,7 @@ int handleDeviceInput(cmdBuffer * cmd) { int handleConsoleInput(cmdBuffer * cmd) { int retval; parseLine(cmd); - toConsole("?%s?",cmd->line); + if ((cmd->kwIndex) >=0 ) { retval=actions[cmd->kwIndex](CONSOLE); } diff --git a/dumblogger/datalogger.cpp b/dumblogger/datalogger.cpp index 9916a49..d683b71 100644 --- a/dumblogger/datalogger.cpp +++ b/dumblogger/datalogger.cpp @@ -157,31 +157,30 @@ void setup( void ) } -void loop( void ) -{ -} -/*--------------------------------------------------------------------vLedTask() +/*---------------------------------------------------------------------LedTask() * stubb *----------------------------------------------------------------------------*/ static void ledTask() { togglePin(BLU_LED); - } static void serialTasks() { char ch; + while ((consoleComm.gotline==false) && (SerialUSB.available())) { - if ((((ch=SerialUSB.read())!='\r')||(ch!='\n')) + if ((((ch=SerialUSB.read())!='\r') && (ch!='\n')) &&(consoleComm.len<MAX_COMMAND_LINE_LENGTH) ) { - consoleComm.line[consoleComm.len++]=ch; + consoleComm.line[consoleComm.len++] = ch; } else { if (consoleComm.len) { - consoleComm.gotline=true; + consoleComm.gotline = true; } + consoleComm.line[consoleComm.len]='\0'; } + SerialUSB.write(ch); } } @@ -196,12 +195,11 @@ int main(void) { // should never get past setup. while (true) { serialTasks(); //move to - if (consoleComm.gotline) { + if (consoleComm.gotline) { handleConsoleInput(&consoleComm); } - loop(); - } + } return 0; |