From 07275234720f13569f192c7f42886dfaf6d430bf Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Wed, 22 Aug 2012 10:38:54 +0000
Subject: [PATCH] Issue 87 fixed

---
 src/gruvin9x/somo14d.h |  2 +-
 src/pulses_avr.cpp     | 12 +++++++-----
 src/sdcard.h           |  3 +++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/gruvin9x/somo14d.h b/src/gruvin9x/somo14d.h
index e8575379d..a8c148b9c 100644
--- a/src/gruvin9x/somo14d.h
+++ b/src/gruvin9x/somo14d.h
@@ -34,7 +34,7 @@
 #define PROMPT_SYSTEM_BASE      230
 #define PROMPT_CUSTOM_BASE      256
 
-#define pushCustomPrompt(p) pushPrompt(PROMPT_CUSTOM_BASE+p)
+#define pushCustomPrompt(p) pushPrompt(PROMPT_CUSTOM_BASE+(p))
 extern void pushPrompt(uint16_t prompt);
 extern bool isPlaying();
 
diff --git a/src/pulses_avr.cpp b/src/pulses_avr.cpp
index e66be1f73..44142b4eb 100644
--- a/src/pulses_avr.cpp
+++ b/src/pulses_avr.cpp
@@ -173,7 +173,7 @@ ISR(TIMER1_COMPA_vect) //2MHz pulse generation
 
       if (!IS_PXX_PROTOCOL(s_current_protocol) && !IS_DSM2_PROTOCOL(s_current_protocol)) {
 
-        // cli is not needed because for these 2 protocols interrupts are not enabled when entering here
+        // cli is not needed because for PPM protocols, interrupts are not enabled when entering here
 
 #if defined(PCBV4)
         TIMSK1 |= (1<<OCIE1A);
@@ -206,8 +206,10 @@ void setupPulsesPPM(uint8_t proto)
     uint32_t rest = 22500u*2 - q; // Minimum Framelen=22.5ms
     
 #if defined(PCBV4)
-    OCR5A = (uint16_t)0x7d * (45+g_model.ppmFrameLength-g_timeMainLast-2/*1ms*/);
-    TCNT5 = 0;
+    if (proto == PROTO_PPM) {
+      OCR5A = (uint16_t)0x7d * (45+g_model.ppmFrameLength-g_timeMainLast-2/*1ms*/);
+      TCNT5 = 0;
+    }
 #endif
 
     rest += (int32_t(g_model.ppmFrameLength))*1000;
@@ -782,7 +784,7 @@ void setupPulses()
         TIMSK1 &= ~0x3C; // All interrupts off
         TIMSK1 &= ~(1<<OCIE1C) ;            // COMPC1 off
         TIFR1 = 0x2F;
-        TIMSK1 |= 0x10; // Enable COMPA
+        TIMSK1 |= (1<<OCIE1A);  // Enable COMPA
 #else
         TIMSK &= ~0x3C ;    // All interrupts off
         ETIMSK &= ~(1<<OCIE1C) ;            // COMPC1 off
@@ -826,7 +828,7 @@ void setupPulses()
 #if defined(PCBV4)
         TIMSK1 &= ~0x3C; // All interrupts off
         TIFR1 = 0x2F;
-        TIMSK1 |= 0x10; // Enable COMPA
+        TIMSK1 |= (1<<OCIE1A); // Enable COMPA
 #else
         TIMSK &= ~0x3C; // All interrupts off
         TIFR = 0x3C;
diff --git a/src/sdcard.h b/src/sdcard.h
index c40748888..5c6e7ea83 100644
--- a/src/sdcard.h
+++ b/src/sdcard.h
@@ -68,6 +68,9 @@ inline const pm_char *SDCARD_ERROR(FRESULT result)
     return STR_SDCARD_ERROR;
 }
 
+// TODO move the ARM function definition here (when cpp)
+extern void sdPoll10mS();
+
 #if defined(PCBARM) && !(defined(SIMU))
 extern "C" {
 extern uint32_t sd_card_ready();