X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=firmware%2Fgoodfet.c;h=1e9b0157e10d3890195d08d0fd9bdbacc863daca;hb=d27d75e4cedfab56742717f3ac990be059f8e168;hp=2702fdd54477d5cede1cc3535999fb421efa5ffc;hpb=b197a5b786af9a49508435b9da27459b8f85ba18;p=goodfet

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index 2702fdd..1e9b015 100644
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -13,11 +13,9 @@
 #include "glitch.h"
 
 
-//LED on P1.0
-//IO on P5
-
 //! Initialize registers and all that jazz.
 void init(){
+  int i;
   WDTCTL = WDTPW + WDTHOLD;                 // Stop watchdog timer
   
   //LED out and on.
@@ -30,7 +28,11 @@ void init(){
   
   //DAC should be at full voltage if it exists.
   #ifdef DAC12IR
-  glitchvoltages(0xfff,0xfff);
+  //glitchvoltages(0xfff,0xfff);
+  ADC12CTL0 = REF2_5V + REFON;                  // Internal 2.5V ref on
+  for(i=0;i!=0xFFFF;i++) asm("nop");
+  DAC12_0CTL = DAC12IR + DAC12AMP_5 + DAC12ENC; // Int ref gain 1
+  DAC12_0DAT = 0xFFF; //Max voltage
   #endif
   
   //Enable Interrupts.
@@ -66,6 +68,9 @@ void handle(unsigned char app,
   case JTAG:
     jtaghandle(app,verb,len);
     break;
+  case EJTAG:
+    ejtaghandle(app,verb,len);
+    break;
   case JTAG430: //Also JTAG430X, JTAG430X2
     jtag430x2handle(app,verb,len);
     break;
@@ -74,9 +79,9 @@ void handle(unsigned char app,
       pluginhandle(app,verb,len);
     }else{
       debugstr("Plugin missing.");
+      debughex(app);
       txdata(app,NOK,0);
     }
-      
     break;
   }
 }
@@ -87,6 +92,9 @@ int main(void)
   volatile unsigned int i;
   unsigned char app, verb;
   unsigned long len;
+  // MSP reboot count for reset input & reboot function located at 0xFFFE
+  volatile unsigned int reset_count = 0;
+  void (*reboot_function)(void) = (void *) 0xFFFE;
   
   init();
 
@@ -97,6 +105,25 @@ int main(void)
   while(1){
     //Magic 3
     app=serial_rx();
+
+	// If the app is the reset byte (0x80) increment and loop
+	if (app == 0x80) {
+		reset_count++;
+
+		if (reset_count > 4) {
+			// We could trigger the WDT with either:
+			// WDTCTL = 0;
+			// or
+			// WDTCTL = WDTPW + WDTCNTCL + WDTSSEL + 0x00;
+			// but instead we'll jump to our reboot function pointer
+			(*reboot_function)();
+		}
+
+		continue;
+	} else {
+		reset_count = 0;
+	}
+
     verb=serial_rx();
     //len=serial_rx();
     len=rxword();