X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=firmware%2Fapps%2Fchipcon%2Fchipcon.c;h=d2f70ac9cb1d920b6d9ca7950e86f2a2a0c9fc42;hb=5db7fdd798116263aa78ca8634fe9a28c1b4a918;hp=73ccd2f9ec23e15353c420378b922288ad60dc59;hpb=986a2cbf10bdbe19688b9eb1b365ac3b328919ed;p=goodfet

diff --git a/firmware/apps/chipcon/chipcon.c b/firmware/apps/chipcon/chipcon.c
index 73ccd2f..d2f70ac 100644
--- a/firmware/apps/chipcon/chipcon.c
+++ b/firmware/apps/chipcon/chipcon.c
@@ -344,6 +344,7 @@ unsigned short cc_get_chip_id(){
   //Find the flash word size.
   switch(cmddata[0]){
   case 0x01://CC1110
+  case 0x11://CC1111
   case 0x81://CC2510
   case 0x91://CC2511
     //debugstr("2 bytes/flash word");
@@ -351,7 +352,7 @@ unsigned short cc_get_chip_id(){
     break;
   default:
     //debugstr("Warning: Guessing flash word size.");
-    flash_word_size=0;
+    //flash_word_size=0;
     break;
   case 0x85://CC2430
   case 0x89://CC2431
@@ -457,8 +458,9 @@ void cc_write_flash_page(u32 adr){
     return;
   }
   
-  if(flash_word_size==0){
-    debugstr("Flash word size is wrong.");
+  if(flash_word_size!=2 && flash_word_size!=4){
+    debugstr("Flash word size is wrong, aborting write to");
+    debughex(adr);
     while(1);
   }
   
@@ -477,8 +479,7 @@ void cc_write_flash_page(u32 adr){
 		  flash_word_size);
   
   //debugstr("Wrote flash routine.");
-  
-  
+    
   //MOV MEMCTR, (bank * 16) + 1;
   cmddata[0]=0x75;
   cmddata[1]=0xc7;
@@ -493,13 +494,13 @@ void cc_write_flash_page(u32 adr){
   
   
   while(!(cc_read_status()&CC_STATUS_CPUHALTED)){
-    P1OUT^=1;//blink LED while flashing
+    PLEDOUT^=PLEDPIN;//blink LED while flashing    
   }
   
   
   //debugstr("Done flashing.");
   
-  P1OUT&=~1;//clear LED
+  PLEDOUT&=~PLEDPIN;//clear LED
 }
 
 //! Read the PC