Changeset 603:fa52efd1e870

Timestamp:

06/11/08 11:24:18 (7 months ago)

Author:

Maxime Petazzoni <maxime.petazzoni@…>

Branch:

default

Message:

Record commands from the RCMD console to the file. Also add
a direct command execution mode.

Location:

nxos/systems/tag-route

Files:

• main.h (modified) (2 diffs)
• record.c (modified) (2 diffs)
• usb.c (modified) (1 diff)

nxos/systems/tag-route/main.h

@@ -11 +11 @@
 
 #include "base/types.h"
+#include "base/lib/fs/fs.h"
 
 #define ROUTE_FILE "tag.data"
@@ -17 +18 @@
 void replay(char *filename);
 void usb_recv(void);
+void usb_recv_to(fs_fd_t fd);
 
 #endif /* __NXOS_TAG_ROUTE_MAIN_H__ */

nxos/systems/tag-route/record.c

@@ -15 +15 @@
 #include "main.h"
 
-#define TEST_DATA "print hello world\nmove A,B 100 1500\nwait 2000\nplay 1500 1000 sync\nprint done"
-#define DATA_SIZE strlen(TEST_DATA)
-
 void record(char *filename) {
   fs_fd_t fd;
   fs_err_t err;
-  size_t i;
 
   nx_display_clear();
@@ -47 +43 @@
   }
 
-  nx_display_string("File opened.\n\n");
-  nx_display_string("Writing...\n");
-
-  for (i=0; i<DATA_SIZE; i++) {
-    err = nx_fs_write(fd, (U8)TEST_DATA[i]);
-
-    if (err != FS_ERR_NO_ERROR) {
-      nx_display_string("Err: ");
-      nx_display_uint(err);
-      nx_display_end_line();
-    }
-  }
+  nx_display_string("File opened.\n");
+  nx_display_string("Waiting...\n");
+  usb_recv_to(fd);
 
   nx_display_uint(nx_fs_get_filesize(fd));
-  nx_display_string("/");
-  nx_display_uint(DATA_SIZE);
   nx_display_string("B written.\n");
   nx_fs_close(fd);

nxos/systems/tag-route/usb.c

@@ -10 +10 @@
 #include "base/display.h"
 #include "base/util.h"
+#include "base/drivers/systick.h"
 #include "base/drivers/usb.h"
+#include "base/lib/fs/fs.h"
 #include "base/lib/rcmd/rcmd.h"
 
 #include "main.h"
 
-static void usb_readline(char *buf) {
-  int i=0;
+static void usb_readline(U8 *buf) {
+  size_t len;
+  int i = 0;
 
-  do {
-    nx_usb_read((U8 *)(buf+i), 1);
-  } while (buf[i] != '\0' || buf[i] != '\n');
+  nx_usb_read(buf, RCMD_BUF_LEN*sizeof(char));
+  for (i=0; i<10 && !nx_usb_data_read(); i++) {
+    nx_systick_wait_ms(200);
+  }
+
+  if (i >= 10) {
+    return;
+  }
+
+  len = nx_usb_data_read();
+  if (len+1 < RCMD_BUF_LEN) {
+    buf[len+1] = '\0';
+  } else {
+    buf[RCMD_BUF_LEN-1] = '\0';
+  }
 }
 
 void usb_recv(void) {
-  char buf[RCMD_BUF_LEN];
+  U8 buf[RCMD_BUF_LEN];
 
   nx_display_clear();
-  nx_display_string("Waiting...\n");
+  nx_display_string("<< ");
 
   do {
     memset(buf, 0, RCMD_BUF_LEN);
     usb_readline(buf);
-    nx_display_string(buf);
-  } while (!streq(buf, "end"));
 
+    if (!*buf) {
+      continue;
+    }
+
+    nx_display_string((char *)buf);
+    nx_display_end_line();
+
+    nx_rcmd_do((char *)buf);
+    nx_systick_wait_ms(50);
+    nx_display_string("<< ");
+  } while (!streq((char *)buf, "end"));
+}
+
+void usb_recv_to(fs_fd_t fd) {
+  U8 buf[RCMD_BUF_LEN];
+  size_t i;
+
+  do {
+    memset(buf, 0, RCMD_BUF_LEN);
+    usb_readline(buf);
+
+    if (!*buf) {
+      continue;
+    }
+
+    for (i=0; i<strlen((char *)buf); i++) {
+      nx_fs_write(fd, buf[i]);
+    }
+    nx_fs_write(fd, (U8)'\n');
+
+    nx_rcmd_do((char *)buf);
+    nx_systick_wait_ms(50);
+  } while (!streq((char *)buf, "end"));
 }