Merge remote-tracking branch 'upstream/master' into afsk

2015-07-03 23:54:34 -06:00
parent 8ebeabe496 1257cb0b4b
commit c708b3703a
2 changed files with 122 additions and 25 deletions
--- a/HamShield.h
+++ b/HamShield.h
@@ -530,7 +530,7 @@ class HamShield {
        static void isr_ptt();
        static void isr_reset();
 	void morseOut(char buffer[HAMSHIELD_MORSE_BUFFER_SIZE]);
-	char morseLookup(char letter);
+	uint8_t morseLookup(char letter);
        bool waitForChannel(long timeout, long breakwindow, int setRSSI);
        void SSTVVISCode(int code);
        void SSTVTestPattern(int code);