apps= $(moreapps) apps/monitor/monitor.o apps/spi/spi.o apps/jtag/jtag.o apps/jtag/jtag430.o apps/jtag/jtag430x2.o apps/avr/avr.o apps/jtag/ejtag.o apps/jtag/jtagxscale.o
#apps/chipcon/chipconasm.o removed
-libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o
+libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o lib/dco_calib.o
app= goodfet
--- /dev/null
+// CALDCO_16MHZ, CALBC1_16MHZ
+#define dco_calibrations_count 18
+const char dco_calibrations[ 2*dco_calibrations_count ];
void msp430_init_uart();
//! Initialize the DCO Clock
void msp430_init_dco();
+//! Called by monitor() when the DCO is correct and communication established.
+void msp430_init_dco_done();
//LED on P1.0
#define PLEDOUT P1OUT
--- /dev/null
+#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
+ 0x6c, 0x8f, // 2618-003.txt
+ 0xdc, 0x8e, // 2274-000.txt
+ 0x7e, 0x8f, // 2274-006.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
+ 0x8a, 0x8f, // 2274-007.txt
+ 0x95, 0x8f, // 2618-004.txt
+ 0x74, 0x8f, // 2618-000.txt
+ 0x97, 0x8f, // 2618-002.txt
+ 0xb2, 0x8f, // 2418-001.txt
+ 0x87, 0x8f, // 2274-005.txt
+ 0xc3, 0x8e, // 2274-009.txt
+};
#include "platform.h"
+#include "dco_calib.h"
+
#include <signal.h>
#include <io.h>
#include <iomacros.h>
//IE2 |= UCA0RXIE;
}
-/* Info Flash Values
-CALDCO_16MHZ 0xdc CALBC1_16MHZ 0x8e 2274-000.txt
-CALDCO_16MHZ 0x74 CALBC1_16MHZ 0x8f 2618-000.txt
-CALDCO_16MHZ 0x6c CALBC1_16MHZ 0x8f 2618-001.txt
-CALDCO_16MHZ 0x97 CALBC1_16MHZ 0x8f 2618-002.txt
-CALDCO_16MHZ 0x6c CALBC1_16MHZ 0x8f 2618-003.txt
-CALDCO_16MHZ 0x95 CALBC1_16MHZ 0x8f 2618-004.txt
-CALDCO_16MHZ 0xcc CALBC1_16MHZ 0x8e 2618-005.txt
-CALDCO_16MHZ 0x87 CALBC1_16MHZ 0x8f 2618-006.txt
-CALDCO_16MHZ 0x96 CALBC1_16MHZ 0x8f 2619-001.txt
-*/
//! Initialization is correct.
void msp430_init_dco_done(){
/*
Info is missing, guess at a good value.
- For now, the choice doesn't jump backward after a successful
- connection. For that reason, keep this list as small as possible.
- Future revisions will subtract one from choice[0] after a successful
- connection, keeping choice[1] as the target.
+ A list of correct calibrations in included as dco_calib.c,
+ generated by script.
*/
-
- #define CHOICES 4
DCOCTL = 0x00; //clear DCO
- switch(choice[0]++%CHOICES){
- default:
- case 0:
- BCSCTL1 = 0x8f; //CALBC1_16MHZ at 0x10f9
- DCOCTL = 0x83; //CALDCO_16MHZ at 0x10f8
- break;
- case 1:
- BCSCTL1 = 0x8f;
- DCOCTL = 0x95;
- break;
- case 2:
- BCSCTL1 = 0x8f;
- DCOCTL = 0x6c;
- break;
- case 3:
- BCSCTL1 = 0x8e;
- DCOCTL = 0xdc;
- break;
- }
+
+ BCSCTL1 = dco_calibrations[2*choice[0]+1];
+ DCOCTL = dco_calibrations[2*choice[0]];
+ choice[0]++;
+ choice[0]%=dco_calibrations_count;
}
//Minor delay.