From 86e371097237b30f14847f842687ac2a3b0c97bd Mon Sep 17 00:00:00 2001
From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Sat, 13 Feb 2010 07:48:49 +0000
Subject: [PATCH] Fixed GoodFET22.  GSEL must be high or DAC0 must be high and
 DAC1 low.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@312 12e2690d-a6be-4b82-a7b7-67c4a43b65c8
---
 firmware/apps/avr/avr.c         |  2 +-
 firmware/apps/chipcon/chipcon.c |  1 -
 firmware/goodfet.c              | 22 +++++++++++++++++++---
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/firmware/apps/avr/avr.c b/firmware/apps/avr/avr.c
index 5b5fcae..4b346c0 100644
--- a/firmware/apps/avr/avr.c
+++ b/firmware/apps/avr/avr.c
@@ -133,7 +133,7 @@ void avrhandle(unsigned char app,
 	       unsigned long len){
   unsigned long i;
   unsigned int at;
-  static u8 connected=0;
+  //static u8 connected=0;
   
   /*
   if(!avr_isready() && connected)
diff --git a/firmware/apps/chipcon/chipcon.c b/firmware/apps/chipcon/chipcon.c
index c45effc..b8cf041 100644
--- a/firmware/apps/chipcon/chipcon.c
+++ b/firmware/apps/chipcon/chipcon.c
@@ -319,7 +319,6 @@ unsigned char cc_read_status(){
 
 //! Read the CHIP ID bytes.
 unsigned short cc_get_chip_id(){
-  unsigned short toret;
   cmddata[0]=CCCMD_GET_CHIP_ID; //0x68
   cccmd(1);
   ccread(2);
diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index 1e9b015..69436a1 100644
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -27,13 +27,29 @@ void init(){
   msp430_init_uart();
   
   //DAC should be at full voltage if it exists.
-  #ifdef DAC12IR
+#ifdef DAC12IR
   //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
+  DAC12_0DAT = 0xFFF; //Max voltage 0xfff
+  DAC12_1CTL = DAC12IR + DAC12AMP_5 + DAC12ENC; // Int ref gain 1
+  DAC12_1DAT = 0x000; //Min voltage 0x000
+#endif
+  
+  /** FIXME
+      
+      This part is really ugly.  GSEL (P5.7) must be high to select
+      normal voltage, but a lot of applications light to swing it low
+      to be a nuissance.  To get around this, we assume that anyone
+      with a glitching FET will also have a DAC, then we set that DAC
+      to a high voltage.
+      
+      At some point, each target must be sanitized to show that it
+      doesn't clear P5OUT or P5DIR.
+  */
+  P5DIR|=BIT7; P5OUT=BIT7; //Normal Supply
+  P5DIR&=~BIT7; //Glitch Supply
   
   //Enable Interrupts.
   //eint();
-- 
2.20.1