[ADC] Use sdcc's adc library, try to reduce program-size.

diff --git a/adc_int.c b/adc_int.c
index d2d7422..326a0a1 100644 (file)
--- a/adc_int.c
+++ b/adc_int.c
@@ -24,9 +24,8 @@
  *  This exception does not however invalidate any other reasons why
  *  the executable file might be covered by the GNU General Public License.
  */
-
+#include "adc.h"
 #include "adc_int.h"
-
 void intadc_init(void)
 {
 #if defined(pic18f23k22) || defined(pic18f24k22) || defined(pic18f25k22) || defined(pic18f26k22)
@@ -47,6 +46,8 @@ void intadc_init(void)
     IPR1bits.ADIP = 1; // High
 }
 
+
+#if 0
 void startadc(unsigned char ch)
 {
     unsigned char a;
@@ -110,15 +111,28 @@ void stopadc(void)
     PIR1bits.ADIF = 0;
     PIE1bits.ADIE = 0;
 }
+#else // Using sdcc's library.
+
+unsigned int polladc(void)
+{
+    unsigned int a;
+    if(ADCON0bits.DONE == 1){ // converting or not enable.
+        PIE1bits.ADIE = 1;
+        PIR1bits.ADIF = 0;
+        return 0xffff;
+    } else { // Done, Clear interrupt
+        a = ((ADRESH << 8)  + ADRESL) & 0x03ff;
+     PIE1bits.ADIE = 0;
+     PIR1bits.ADIF = 0;
+     ADCON0bits.GO_NOT_DONE = 0;
+     return a;
+    }
+}
+
+#endif
 
 unsigned int adc_rawtobatt(unsigned int b, unsigned int reflevel)
 {
-    unsigned int i;
     // raw = (reflevel[0.01V] * b) / 1024 * divide :divide = 4
-    // Fullscale = 0.5 (1.625V, raw = 6.5V)
-    // raw = b * 0.5 * 4 = b * 2 (b = 1024 6.500V)
-    i = b / 8; // div = 1/8
-    // Fullscale = 13.2v =
-    i = (i * reflevel) / 32;
-    return i;
+    return ((b >>2) * reflevel) >> 6;
 }
\ No newline at end of file

diff --git a/adc_int.h b/adc_int.h
index e3c2719..899c338 100644 (file)
--- a/adc_int.h
+++ b/adc_int.h
@@ -30,7 +30,7 @@
 
 #include <sdcc-lib.h>
 #include <pic18fregs.h> /* ONLY FOR PIC18x */
-#include <signal.h>
+#include <adc.h>
 
 #include "iodef.h"
 #include "idle.h"
@@ -41,11 +41,35 @@
 extern "C" {
 #endif
 extern void intadc_init(void);
-extern void startadc(unsigned char ch);
 extern unsigned int polladc(void);
-extern void stopadc(void);
-extern unsigned int adc_rawtobatt(unsigned int b, unsigned int reflevel);
+#if 0
+extern void startadc(unsigned char ch);
 extern unsigned int polladc2(void);
+#else
+#define polladc2(a) { \
+    while(adc_busy()); \
+    a = adc_read(); \
+    }
+
+#define stopadc() { \
+    ADCON0bits.GO_NOT_DONE = 0; \
+    PIR1bits.ADIF = 0; \
+    PIE1bits.ADIE = 0; \
+    }
+/*
+ *    ADCON1bits.VCFG1 = 0;
+ *    ADCON1bits.VCFG0 = 0;
+ *    ADCON2 = 0b10110110;
+ */
+#define startadc(c) { \
+    adc_open(c, ADC_FOSC_64, 0, ADC_FRM_RJUST | ADC_INT_OFF | ADC_VCFG_VDD_VSS | ADC_NVCFG_VSS | ADC_PVCFG_VDD); \
+    adc_setchannel(c); \
+    adc_conv(); \
+    }
+#endif
+
+
+extern unsigned int adc_rawtobatt(unsigned int b, unsigned int reflevel);
 
 
 

diff --git a/main.c b/main.c
index 79ffcce..a9aba8c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -399,16 +399,17 @@ void update_status(void)
 #if 1
         tuneflag = akc6955_tune();
         cnrlevel = akc6955_get_cnr();
-        batlevel_6955 = akc6955_get_battery();
+//        batlevel_6955 = akc6955_get_battery();
         akc6955_get_fmbandwidth(fmbandwidth);
 #else
         batlevel_6955 = 330;
 #endif
-    startadc(0);
+    batlevel_6955 = 330;
+    startadc(7);
     idle_time_ms(1);
-    adc = polladc2();
+    polladc2(adc);
     battlevel = adc_rawtobatt(adc, batlevel_6955);
-
+//    battlevel = adc;
 }
 
 void print_freq(unsigned char y)

diff --git a/nbproject/Makefile-default.mk b/nbproject/Makefile-default.mk
index 093ec9f..a77a2a3 100644 (file)
--- a/nbproject/Makefile-default.mk
+++ b/nbproject/Makefile-default.mk
@@ -74,113 +74,113 @@ ifeq ($(TYPE_IMAGE), DEBUG_RUN)
 ${OBJECTDIR}/ui.o: ui.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/ui.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 ui.c  -o${OBJECTDIR}/ui.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 ui.c  -o${OBJECTDIR}/ui.o
        
 ${OBJECTDIR}/i2c_io.o: i2c_io.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/i2c_io.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 i2c_io.c  -o${OBJECTDIR}/i2c_io.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 i2c_io.c  -o${OBJECTDIR}/i2c_io.o
        
 ${OBJECTDIR}/main.o: main.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/main.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 main.c  -o${OBJECTDIR}/main.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 main.c  -o${OBJECTDIR}/main.o
        
 ${OBJECTDIR}/idle.o: idle.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/idle.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 idle.c  -o${OBJECTDIR}/idle.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 idle.c  -o${OBJECTDIR}/idle.o
        
 ${OBJECTDIR}/lcd_acm1602.o: lcd_acm1602.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/lcd_acm1602.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 lcd_acm1602.c  -o${OBJECTDIR}/lcd_acm1602.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 lcd_acm1602.c  -o${OBJECTDIR}/lcd_acm1602.o
        
 ${OBJECTDIR}/akc6955.o: akc6955.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/akc6955.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 akc6955.c  -o${OBJECTDIR}/akc6955.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 akc6955.c  -o${OBJECTDIR}/akc6955.o
        
 ${OBJECTDIR}/eeprom.o: eeprom.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/eeprom.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 eeprom.c  -o${OBJECTDIR}/eeprom.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 eeprom.c  -o${OBJECTDIR}/eeprom.o
        
 ${OBJECTDIR}/ioports.o: ioports.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/ioports.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 ioports.c  -o${OBJECTDIR}/ioports.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 ioports.c  -o${OBJECTDIR}/ioports.o
        
 ${OBJECTDIR}/menu.o: menu.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/menu.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 menu.c  -o${OBJECTDIR}/menu.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 menu.c  -o${OBJECTDIR}/menu.o
        
 ${OBJECTDIR}/power.o: power.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/power.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 power.c  -o${OBJECTDIR}/power.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 power.c  -o${OBJECTDIR}/power.o
        
 ${OBJECTDIR}/adc_int.o: adc_int.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/adc_int.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 adc_int.c  -o${OBJECTDIR}/adc_int.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 adc_int.c  -o${OBJECTDIR}/adc_int.o
        
 else
 ${OBJECTDIR}/ui.o: ui.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/ui.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 ui.c  -o${OBJECTDIR}/ui.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 ui.c  -o${OBJECTDIR}/ui.o
        
 ${OBJECTDIR}/i2c_io.o: i2c_io.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/i2c_io.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 i2c_io.c  -o${OBJECTDIR}/i2c_io.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 i2c_io.c  -o${OBJECTDIR}/i2c_io.o
        
 ${OBJECTDIR}/main.o: main.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/main.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 main.c  -o${OBJECTDIR}/main.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 main.c  -o${OBJECTDIR}/main.o
        
 ${OBJECTDIR}/idle.o: idle.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/idle.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 idle.c  -o${OBJECTDIR}/idle.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 idle.c  -o${OBJECTDIR}/idle.o
        
 ${OBJECTDIR}/lcd_acm1602.o: lcd_acm1602.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/lcd_acm1602.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 lcd_acm1602.c  -o${OBJECTDIR}/lcd_acm1602.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 lcd_acm1602.c  -o${OBJECTDIR}/lcd_acm1602.o
        
 ${OBJECTDIR}/akc6955.o: akc6955.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/akc6955.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 akc6955.c  -o${OBJECTDIR}/akc6955.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 akc6955.c  -o${OBJECTDIR}/akc6955.o
        
 ${OBJECTDIR}/eeprom.o: eeprom.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/eeprom.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 eeprom.c  -o${OBJECTDIR}/eeprom.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 eeprom.c  -o${OBJECTDIR}/eeprom.o
        
 ${OBJECTDIR}/ioports.o: ioports.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/ioports.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 ioports.c  -o${OBJECTDIR}/ioports.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 ioports.c  -o${OBJECTDIR}/ioports.o
        
 ${OBJECTDIR}/menu.o: menu.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/menu.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 menu.c  -o${OBJECTDIR}/menu.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 menu.c  -o${OBJECTDIR}/menu.o
        
 ${OBJECTDIR}/power.o: power.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/power.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 power.c  -o${OBJECTDIR}/power.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 power.c  -o${OBJECTDIR}/power.o
        
 ${OBJECTDIR}/adc_int.o: adc_int.c  nbproject/Makefile-${CND_CONF}.mk
        ${MKDIR} ${OBJECTDIR} 
        ${RM} ${OBJECTDIR}/adc_int.o 
-       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 adc_int.c  -o${OBJECTDIR}/adc_int.o
+       ${MP_CC} --debug-ralloc --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -c -mpic16 -p18f45k20 adc_int.c  -o${OBJECTDIR}/adc_int.o
        
 endif
 
@@ -189,11 +189,11 @@ endif
 ifeq ($(TYPE_IMAGE), DEBUG_RUN)
 dist/${CND_CONF}/${IMAGE_TYPE}/OPENI2CRADIO_6955.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES}  nbproject/Makefile-${CND_CONF}.mk  /usr/local/share/sdcc/lib/pic16/libc18f.lib  
        ${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE} 
-       ${MP_CC}  --debug-ralloc -Wl-c -Wl-m --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -mpic16 -p18f45k20 ${OBJECTFILES}  -odist/${CND_CONF}/${IMAGE_TYPE}/OPENI2CRADIO_6955.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} 
+       ${MP_CC}  --debug-ralloc -Wl-c -Wl-m --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -mpic16 -p18f45k20 ${OBJECTFILES}  -odist/${CND_CONF}/${IMAGE_TYPE}/OPENI2CRADIO_6955.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} 
 else
 dist/${CND_CONF}/${IMAGE_TYPE}/OPENI2CRADIO_6955.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES}  nbproject/Makefile-${CND_CONF}.mk  /usr/local/share/sdcc/lib/pic16/libc18f.lib 
        ${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE} 
-       ${MP_CC}  --debug-ralloc -Wl-c -Wl-m --use-non-free -V --pstack-model=small --pno-banksel --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -mpic16 -p18f45k20 ${OBJECTFILES}  -odist/${CND_CONF}/${IMAGE_TYPE}/OPENI2CRADIO_6955.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} 
+       ${MP_CC}  --debug-ralloc -Wl-c -Wl-m --use-non-free -V --pstack-model=small --obanksel=2 --optimize-cmp --optimize-df --opt-code-size    libc18f.lib libio18f45k20.lib -mpic16 -p18f45k20 ${OBJECTFILES}  -odist/${CND_CONF}/${IMAGE_TYPE}/OPENI2CRADIO_6955.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} 
 endif
 
 

diff --git a/nbproject/Makefile-genesis.properties b/nbproject/Makefile-genesis.properties
index 649d0a4..592d2c3 100644 (file)
--- a/nbproject/Makefile-genesis.properties
+++ b/nbproject/Makefile-genesis.properties
@@ -1,5 +1,5 @@
 #
-#Thu Jun 27 23:40:33 JST 2013
+#Fri Jun 28 12:34:44 JST 2013
 default.languagetoolchain.dir=/usr/local/bin
 default.br-unifei-rmaalmeida-toolchainSDCC-SDCCtoolchain.md5=b67cce1ad75b450308d7806e430931b3
 com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=8fe1589514540343a5279c082104bce0

diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index 01fba18..1829bd9 100644 (file)
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -150,7 +150,7 @@
         <property key="optimize-cmp" value="true"/>
         <property key="optimize-df" value="true"/>
         <property key="pcode-verbose" value="false"/>
-        <property key="pno-banksel" value="true"/>
+        <property key="pno-banksel" value="false"/>
         <property key="pstack-model" value="small"/>
         <property key="use-non-free" value="true"/>
         <property key="verbose" value="false"/>

diff --git a/nbproject/private/configurations.xml b/nbproject/private/configurations.xml
index 1b84c05..dc1db5a 100644 (file)
--- a/nbproject/private/configurations.xml
+++ b/nbproject/private/configurations.xml
@@ -4,7 +4,7 @@
   <defaultConf>0</defaultConf>
   <confs>
     <conf name="default" type="2">
-      <platformToolSN></platformToolSN>
+      <platformToolSN>:=MPLABCommUSB:=04D8:=900A:=0002:=Microchip Technology Inc.:=PICkit 3:=DEFAULT_PK3 :=x:=en</platformToolSN>
       <languageToolchainDir>/usr/local/bin</languageToolchainDir>
       <mdbdebugger version="1">
         <placeholder1>place holder 1</placeholder1>