From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Sat, 5 Jun 2010 21:39:57 +0000 (+0000)
Subject: More DCO calibrations, working on MSP430 testing framework.
X-Git-Url: http://git.rot13.org/?p=goodfet;a=commitdiff_plain;h=87c8139ff30306e8269e009d7fbd309dacf6d24e

More DCO calibrations, working on MSP430 testing framework.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@597 12e2690d-a6be-4b82-a7b7-67c4a43b65c8
---

diff --git a/firmware/apps/jtag/jtag430.c b/firmware/apps/jtag/jtag430.c
index fa86dca..a35a40b 100644
--- a/firmware/apps/jtag/jtag430.c
+++ b/firmware/apps/jtag/jtag430.c
@@ -133,6 +133,7 @@ void jtag430_writeflash(unsigned int adr, unsigned int data){
   jtag430_writemem(0x012A, 0xA540);
   //FCTL3=0xA500, should be 0xA540 for Info Seg A on 2xx chips.
   jtag430_writemem(0x012C, 0xA500); //all but info flash.
+  //if(jtag430_readmem(0x012C));
   
   //Write the word itself.
   jtag430_writeflashword(adr,data);
diff --git a/firmware/apps/radios/nrf.c b/firmware/apps/radios/nrf.c
index bb1ed23..9254f93 100644
--- a/firmware/apps/radios/nrf.c
+++ b/firmware/apps/radios/nrf.c
@@ -131,7 +131,6 @@ void nrfhandle(unsigned char app,
     break;
   case NRF_RX:
     RADIOPASSIVE;
-    
     //Get the packet.
     P5OUT&=~SS;
     nrftrans8(NRF_R_RX_PAYLOAD);
diff --git a/firmware/include/dco_calib.h b/firmware/include/dco_calib.h
index 1aea159..333f50a 100644
--- a/firmware/include/dco_calib.h
+++ b/firmware/include/dco_calib.h
@@ -1,3 +1,3 @@
 // CALDCO_16MHZ, CALBC1_16MHZ
-#define    dco_calibrations_count 18
-const char dco_calibrations[ 2*dco_calibrations_count ];
+#define    dco_calibrations_count 30
+const char dco_calibrations[ 60 ];
diff --git a/firmware/lib/dco_calib.c b/firmware/lib/dco_calib.c
index 8bd0acc..a539052 100644
--- a/firmware/lib/dco_calib.c
+++ b/firmware/lib/dco_calib.c
@@ -1,23 +1,33 @@
-#include "dco_calib.h"
-
 // CALDCO_16MHZ, CALBC1_16MHZ
 const char dco_calibrations[]={
-  0x7d, 0x8f,  // 2418-003.txt
-  0x9e, 0x8f,  // 2418-000.txt
-  0x89, 0x8f,  // 2274-008.txt
+  0x60, 0x8f,  // 2274-003.txt
+  0x68, 0x8f,  // 2618-001.txt
   0x6c, 0x8f,  // 2618-003.txt
-  0xdc, 0x8e,  // 2274-000.txt
+  0x74, 0x8f,  // 2618-000.txt
+  0x7d, 0x8f,  // 2418-003.txt
   0x7e, 0x8f,  // 2274-006.txt
+  0x80, 0x8f,  // 2274-002.txt
   0x81, 0x8f,  // 2619-000.txt
-  0x9f, 0x8f,  // 2418-002.txt
-  0xab, 0x8f,  // 2618-007.txt
   0x84, 0x8f,  // 2274-001.txt
-  0xcc, 0x8e,  // 2618-005.txt
+  0x84, 0x8f,  // 2274-010.txt
+  0x85, 0x8f,  // 2274-004.txt
+  0x87, 0x8f,  // 2618-006.txt
+  0x89, 0x8f,  // 2274-008.txt
   0x8a, 0x8f,  // 2274-007.txt
   0x95, 0x8f,  // 2618-004.txt
-  0x74, 0x8f,  // 2618-000.txt
+  0x96, 0x8f,  // 2619-001.txt
   0x97, 0x8f,  // 2618-002.txt
+  0x9e, 0x8f,  // 2418-000.txt
+  0x9e, 0x8f,  // 2617-001.txt
+  0x9f, 0x8f,  // 2418-002.txt
+  0xa1, 0x8f,  // 2618-010.txt
+  0xa9, 0x8f,  // 2618-009.txt
+  0xab, 0x8f,  // 2618-007.txt
   0xb2, 0x8f,  // 2418-001.txt
-  0x87, 0x8f,  // 2274-005.txt
+  0xb5, 0x8f,  // 2618-008.txt
   0xc3, 0x8e,  // 2274-009.txt
+  0xcc, 0x8e,  // 2618-005.txt
+  0xd9, 0x8e,  // 2272-000.txt
+  0xdc, 0x8e,  // 2274-000.txt
+  0xe8, 0x8e,  // 2274-005.txt
 };