--- gforth/engine/io-nxt.c	2007/04/22 20:06:26	1.2
+++ gforth/engine/io-nxt.c	2007/04/22 22:48:43	1.4
@@ -25,26 +25,67 @@
 #include "forth.h"
 #include "../arch/arm/nxt/AT91SAM7.h"
 #include "../arch/arm/nxt/bt.h"
+#include "../arch/arm/nxt/display.h"
+#include "../arch/arm/nxt/aic.h"
+#include "../arch/arm/nxt/systick.h"
+#include "../arch/arm/nxt/sound.h"
+#include "../arch/arm/nxt/interrupts.h"
+#include "../arch/arm/nxt/nxt_avr.h"
+#include "../arch/arm/nxt/nxt_motors.h"
+#include "../arch/arm/nxt/i2c.h"
 
-long key_avail ()
+int terminal_prepped = 0;
+int needs_update = 0;
+int bt_mode = 0;
+
+void
+show_splash(U32 milliseconds)
 {
-  return bt_avail();
+  display_clear(0);
+  display_goto_xy(6, 6);
+  display_string("Gforth");
+  display_update();
+
+  systick_wait_ms(milliseconds);
 }
 
-Cell getkey()
+const static bt_lens[0x3C] = { 10, 3, 10, 3,  10, 30, 10, 3,  4, 4, 26, 4,  3, 0, 0, 0,
+			       0, 0, 0, 0,    0, 0, 0, 0,     0, 0, 0, 0,   4, 4, 0, 0,
+			       0, 19, 0, 4,   0, 3, 0, 3,     0, 3, 3, 3,   0, 0, 0, 3,
+			       0, 0, 0, 3, 5, 0, 3, 4, 0,     3, 0, 3, 0 };
+
+void bt_send_cmd(char * cmd)
 {
-  return bt_getkey();
-}
+  int len = bt_lens[cmd[1]];
+  int i, sum=0;
 
-int terminal_prepped = 0;
+  cmd[0] = len;
+  for(i=1; i<len-2; i++)
+    sum += cmd[i];
+  cmd[i++] = (char)(sum>>8);
+  cmd[i++] = (char)(sum & 0xff);
+
+  bt_send(cmd, len);
+}
 
 void prep_terminal ()
 {
+  char cmd[30];
+
   aic_initialise();
   interrupts_enable();
   systick_init();
+  sound_init();
+  nxt_avr_init();
   display_init();
+  nxt_motor_init();
+  i2c_init();
   bt_init();
+  cmd[1] = 3;
+  bt_send_cmd(cmd); // open port query
+
+  display_goto_xy(0,0);
+  display_clear(1);
 
   terminal_prepped = 1;
 }
@@ -54,16 +95,78 @@ void deprep_terminal ()
   terminal_prepped = 0;
 }
 
+void do_bluetooth ()
+{
+  if(!bt_mode) {
+    char cmd[30];
+
+    bt_receive(cmd);
+    
+    switch(cmd[1]) {
+    case 0x16: // request connection
+      cmd[1] = 9; // accept connection
+      cmd[2] = 1; // yes, we do
+      bt_send_cmd(cmd);
+      break;
+    case 0x13: // connect result
+      if(cmd[2]) {
+	int handle=cmd[3];
+	cmd[1] = 0xB; // open stream
+	cmd[2] = handle;
+	bt_send_cmd(cmd);
+	bt_mode = 1;
+      }
+      break;
+  default:
+    break;
+    }
+  }
+}
+
+long key_avail ()
+{
+  if(!terminal_prepped) prep_terminal();
+
+  if(bt_mode) {
+    return bt_avail();
+  } else {
+    if(bt_avail())
+      do_bluetooth();
+    return 0;
+  }
+}
+
+Cell getkey()
+{
+  int key;
+
+  if(!terminal_prepped) prep_terminal();
+
+  if(needs_update) {
+    display_update();
+    needs_update = 0;
+  }
+
+  while(!key_avail());
+
+  return bt_getkey();
+}
+
 void emit_char(char x)
 {
-  bt_send(&x, 1);
+  if(!terminal_prepped) prep_terminal();
   display_char(x);
+  if(x == '\n') {
+    display_update();
+    needs_update = 0;
+  } else
+    needs_update = 1;
+  bt_send(&x, 1);
 }
 
 void type_chars(char *addr, unsigned int l)
 {
   int i;
-  bt_send(addr, l);
   for(i=0; i<l; i++)
-    display_char(addr[i]);
+    emit_char(addr[i]);
 }