Removed deprecated MSP430 flash test.

[goodfet] / firmware / goodfet.c

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index 8cd782e..c310c0c 100644 (file)
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -1,13 +1,16 @@
-//GOODFET Main File\r
-//Includes several applications.\r
+/*! \file goodfet.c\r
+  \author Travis Goodspeed\r
+  \brief Main module.\r
+  \r
+  This is the main module of the GoodFET, which calls the initialization\r
+  routines and delegates commands to the various applications.\r
+*/\r
+\r
 \r
 #include "platform.h"\r
 #include "command.h"\r
 #include "apps.h"\r
 \r
-#include <signal.h>\r
-#include <io.h>\r
-#include <iomacros.h>\r
 \r
 \r
 //LED on P1.0\r
@@ -17,15 +20,14 @@
 void init(){\r
   WDTCTL = WDTPW + WDTHOLD;                 // Stop watchdog timer\r
   \r
-  //LED and TX OUT\r
+  //LED out and on.\r
   PLEDDIR |= PLEDPIN;\r
+  PLEDOUT |= PLEDPIN;\r
   \r
+  //Setup clocks, unique to each '430.\r
   msp430_init_dco();\r
   msp430_init_uart();\r
   \r
-  \r
-  \r
-  \r
   //Enable Interrupts.\r
   //eint();\r
 }\r
@@ -34,6 +36,7 @@ void init(){
 void handle(unsigned char app,\r
            unsigned char verb,\r
            unsigned char len){\r
+  //debugstr("GoodFET");\r
   switch(app){\r
   case MONITOR:\r
     monitorhandle(app,verb,len);\r
@@ -41,7 +44,7 @@ void handle(unsigned char app,
   case SPI:\r
     spihandle(app,verb,len);\r
     break;\r
-  case I2C:\r
+  case I2CAPP:\r
     i2chandle(app,verb,len);\r
     break;\r
   case CHIPCON:\r
@@ -50,11 +53,15 @@ void handle(unsigned char app,
   case JTAG:\r
     jtaghandle(app,verb,len);\r
     break;\r
-  case JTAG430:\r
-    jtag430handle(app,verb,len);\r
+  case JTAG430: //Also JTAG430X, JTAG430X2\r
+    jtag430x2handle(app,verb,len);\r
     break;\r
   default:\r
+    #ifdef HANDLEOTHER\r
+    HANDLEOTHER(app,verb,len);\r
+    #else\r
     txdata(app,NOK,0);\r
+    #endif\r
     break;\r
   }\r
 }\r
@@ -67,17 +74,6 @@ int main(void)
   \r
   init();\r
   \r
-  \r
-  //Ready\r
-  //txdata(MONITOR,OK,0);\r
-  //while (1){\r
-  //  txdata(0xFF,0xff,0x0);\r
-  //  delay(1000);\r
-  //}\r
-  //delay(0xffff);\r
-  //while(*((int*)0x1001));\r
-  //while(1)\r
-  //  txdata(0xFF,0xFF,0);\r
   txstring(MONITOR,OK,"http://goodfet.sf.net/");\r
   \r
   //Command loop.  There's no end!\r