X-Git-Url: http://www.average.org/gitweb/?p=pulsecounter.git;a=blobdiff_plain;f=Hal%2FHal.c;h=bb05cd4e1113913c4231649cabc5d6548dd4bbaf;hp=91f635fc6610a7b808b61528e7f41d570a8b8187;hb=ca5bd37eed3f758a3ecbf24f482c403b69a0141f;hpb=a210dfa3087cdca2393e7a4f3611e654f4724b53

diff --git a/Hal/Hal.c b/Hal/Hal.c
index 91f635f..bb05cd4 100644
--- a/Hal/Hal.c
+++ b/Hal/Hal.c
@@ -10,15 +10,17 @@
 
 /* -------- INTERNAL FEATURES -------- */
 
-#define LED_CONFIG()                (P1DIR |= BIT6)
-#define LED_ON()                    (P1OUT |= BIT6)
-#define LED_OFF()                   (P1OUT &= ~BIT6)
-#define LED_READ()                  (P1OUT & BIT6)
-#define LED_TOGGLE()                (P1OUT ^= BIT6)
-
-#define CONNECTED_LED_CONFIG()      (P1DIR |= BIT0)
-#define CONNECTED_LED_ON()          (P1OUT |= BIT0)
-#define CONNECTED_LED_OFF()         (P1OUT &= ~BIT0)
+#define GREEN_LED_CONFIG()                (P1DIR |= BIT6)
+#define GREEN_LED_ON()                    (P1OUT |= BIT6)
+#define GREEN_LED_OFF()                   (P1OUT &= ~BIT6)
+#define GREEN_LED_READ()                  (P1OUT & BIT6)
+#define GREEN_LED_TOGGLE()                (P1OUT ^= BIT6)
+
+#define RED_LED_CONFIG()                  (P1DIR |= BIT0)
+#define RED_LED_ON()                      (P1OUT |= BIT0)
+#define RED_LED_OFF()                     (P1OUT &= ~BIT0)
+#define RED_LED_READ()                    (P1OUT & BIT0)
+#define RED_LED_TOGGLE()                  (P1OUT ^= BIT0)
 
 #define BUTTON_CONFIG()             (P1DIR &= ~BIT3, P1REN |= BIT3, P1OUT |= BIT3, P1IES |= BIT3);
 #define BUTTON_ENABLE()             (P1IFG &= ~BIT3, P1IE |= BIT3)
@@ -88,6 +90,8 @@
 #define TICK_HANDLER_ID        1
 #define DISPATCH_HANDLER_ID    2
 
+int32_t buttonCnt = 0;
+
 static void buttonHandler(void);
 static void postEvent(uint8_t handlerId);
 
@@ -108,7 +112,6 @@ void Hal_buttonEnable(Hal_Handler handler) {
 }
 
 void Hal_connected(void) {
-    CONNECTED_LED_ON();
 }
 
 void Hal_debugOn(uint8_t line) {
@@ -150,7 +153,6 @@ void Hal_delay(uint16_t msecs) {
 }
 
 void Hal_disconnected(void) {
-    CONNECTED_LED_OFF();
 }
 
 void Hal_init(void) {
@@ -169,10 +171,10 @@ void Hal_init(void) {
 
     /* setup LEDs */
 
-    LED_CONFIG();
-    LED_OFF();
-    CONNECTED_LED_CONFIG();
-    CONNECTED_LED_OFF();
+    GREEN_LED_CONFIG();
+    GREEN_LED_OFF();
+    RED_LED_CONFIG();
+    RED_LED_OFF();
 
     /* setup debug pins */
 
@@ -234,20 +236,36 @@ void Hal_idleLoop(void) {
     }
 }
 
-void Hal_ledOn(void) {
-    LED_ON();
+void Hal_greenLedOn(void) {
+    GREEN_LED_ON();
+}
+
+void Hal_greenLedOff(void) {
+    GREEN_LED_OFF();
+}
+
+bool Hal_greenLedRead(void) {
+    return GREEN_LED_READ();
+}
+
+void Hal_greenLedToggle(void) {
+    GREEN_LED_TOGGLE();
+}
+
+void Hal_redLedOn(void) {
+    RED_LED_ON();
 }
 
-void Hal_ledOff(void) {
-    LED_OFF();
+void Hal_redLedOff(void) {
+    RED_LED_OFF();
 }
 
-bool Hal_ledRead(void) {
-    return LED_READ();
+bool Hal_redLedRead(void) {
+    return RED_LED_READ();
 }
 
-void Hal_ledToggle(void) {
-    LED_TOGGLE();
+void Hal_redLedToggle(void) {
+    RED_LED_TOGGLE();
 }
 
 void Hal_tickStart(uint16_t msecs, Hal_Handler handler) {
@@ -325,6 +343,7 @@ static void postEvent(uint8_t handlerId) {
     #pragma vector=PORT1_VECTOR
 #endif
 INTERRUPT void buttonIsr(void) {
+    buttonCnt++;
     postEvent(BUTTON_HANDLER_ID);
     BUTTON_ENABLE();
     WAKEUP();