From: R. Steve McKown <rsmckown@gmail.com>
Date: Tue, 6 Dec 2011 18:43:40 +0000 (-0700)
Subject: Run at 2 MHz
X-Git-Tag: 1.0~53
X-Git-Url: https://oss.titaniummirror.com/gitweb?p=rgblamp.git;a=commitdiff_plain;h=2c4f2499bc815bd573dc0ebc4733b64329ac824b

Run at 2 MHz

* PWM at 1.95 kHz
* 25 ms max loop processing time, out of a desired 32 ms.
---

diff --git a/picinit.c b/picinit.c
index 4274e2a..882aaaa 100644
--- a/picinit.c
+++ b/picinit.c
@@ -13,7 +13,7 @@ __CONFIG(LVP_OFF);
 void pic_init()
 {
     /* Setting below must match _XTAL_FREQ in picinit.h */
-    OSCCON = 0b01101000;
+    OSCCON = 0b01100000;
 
     /* OSCSTAT.HFIOFL is set when oscillator is locked (accurate within 2%) */
     while (!HFIOFL);
diff --git a/picinit.h b/picinit.h
index e2a50cf..1925003 100644
--- a/picinit.h
+++ b/picinit.h
@@ -7,7 +7,7 @@
 #ifndef _PICINIT_H
 #define _PICINIT_H
 
-#define _XTAL_FREQ 4000000
+#define _XTAL_FREQ 2000000
 
 void pic_init();
 
diff --git a/rgb.c b/rgb.c
index 43fec9e..13c36da 100644
--- a/rgb.c
+++ b/rgb.c
@@ -13,10 +13,10 @@ void rgb_init()
 {
     /* Initialize rgb
      * CCP1 on RB3, CCP2 on RA7, CCP3 on RA3, CCP4 on RA4
-     * - Fosc =     8 MHz,    4 MHz
-     * - Prescale = 4,        4
+     * - Fosc =     8 MHz,    4 MHz,    2 MHz
+     * - Prescale = 4,        4,        1
      * - PRx value = 0xff
-     * = f(rgb) =   1.95 kHz, 0.98 kHz
+     * = f(rgb) =   1.95 kHz, 0.98 kHz, 1.95 kHz
      */
 
     /* Set rgb Rxn pins as outputs. */
@@ -47,7 +47,7 @@ void rgb_init()
     TMR2IF = 0;
     PR2 = 0xff;
 
-    T2CON = 0b00000001;
+    T2CON = 0b00000000;
 }
 
 void rgb_off()