From: K.Ohta <whatisthis.sowhat@gmail.com>
Date: Wed, 19 Jun 2013 09:29:55 +0000 (+0900)
Subject: [UI]Re-discard printf().
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c03f3bca37936873fa8e37e58d26996d75cc050b;p=openi2cradio%2FOpenI2CRadio.git

[UI]Re-discard printf().
[Idle] Set prescaler to 1:256, 7182tick/sec@8MHz.
---

diff --git a/idle.c b/idle.c
index 5bc9709..312ff1b 100644
--- a/idle.c
+++ b/idle.c
@@ -61,8 +61,9 @@ void idle(unsigned int initial)
    
    /* Set TMR0 for interrupt*/
    /* Pre-scaler: 1/16, PSA=0(ON), TOSE=0, T0CS=0(INTERNAL), T08BIT=0(16bit), TMR0ON=1(START) */
-   contword = _T0PS0 | _T0PS1 |  _TMR0ON; // _T0PS2
-//   TMR0H = initial >> 8;
+   contword = _T0PS0 | _T0PS1 | _T0PS2 | _TMR0ON; // Prescaler = 1:256.
+   //contword =  _T0PS2 | _TMR0ON; // Pre-scakler is 1:32.
+   //TMR0H = initial >> 8;
    TMR0L = initial & 0xff;
    TMR0H = initial >> 8; // Write order : L->H
    T0CON = contword;
diff --git a/lcd_acm1602.c b/lcd_acm1602.c
index f63336e..06e2de6 100644
--- a/lcd_acm1602.c
+++ b/lcd_acm1602.c
@@ -527,22 +527,6 @@ void acm1602_home(unsigned char addr)
     _ACM1602_LONG_LONG_WAIT(); // Wait 5ms
 }
 
-void acm1602_printf(unsigned char addr, const char *fmt, ...)
-{
-    char strbuf[32]; // Max 32 bytes.
-    va_list args;
-    int i;
-    int l;
-
-    strbuf[0] = '\0';
-    va_start(args, fmt );
-    sprintf(strbuf, args);
-    l = strlen(strbuf);
-    if((l >= 32) || (l <= 0))return;
-    for(i = 0; i < l; i++) {
-        acm1602_putchar(addr, strbuf[i]);
-    }
-}
 
 void acm1602_cursordir(unsigned char addr, unsigned char right)
 {
diff --git a/lcd_acm1602.h b/lcd_acm1602.h
index e5e876e..5a06219 100644
--- a/lcd_acm1602.h
+++ b/lcd_acm1602.h
@@ -60,7 +60,6 @@ extern void acm1602_putchar(unsigned char addr, unsigned char c);
 extern void acm1602_locate_16x2(unsigned char addr, char x, char y);
 extern void acm1602_locate_8x2(unsigned char addr, char x, char y);
 extern void acm1602_home(unsigned char addr);
-extern void acm1602_printf(unsigned char addr, const char *fmt, ...);
 extern void acm1602_cursordir(unsigned char addr, unsigned char right);
 extern void acm1602_init(unsigned char addr, unsigned char cls);
 extern unsigned char acm1602_getchar(unsigned char addr);
diff --git a/main.c b/main.c
index a846e19..0dde53b 100644
--- a/main.c
+++ b/main.c
@@ -879,7 +879,7 @@ int main(void)
 #ifdef _LCD_DEBUG
     unsigned char power_flag;
 #endif
-//    OSCCON =  _IDLEN & 0b11111100;
+    OSCCON =  (_IDLEN & 0b11111100) | 0b00111000;
 
     keyin_init();
     keyin_ioinit();
@@ -907,7 +907,7 @@ int main(void)
 #if 1
     i = 10001;
     do {
-        idle(0x8000);
+        idle(65535-7812);
         ClrWdt();
         _LOCATE(0,1);
         print_numeric_nosupress(i, 5);
diff --git a/nbproject/Makefile-genesis.properties b/nbproject/Makefile-genesis.properties
index 447b7c3..214af49 100644
--- a/nbproject/Makefile-genesis.properties
+++ b/nbproject/Makefile-genesis.properties
@@ -1,5 +1,5 @@
 #
-#Wed Jun 19 16:18:05 JST 2013
+#Wed Jun 19 18:10:23 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