fix merge errors

DeviationTX · Mar 4, 2019 · c5304b2 · c5304b2
1 parent d44686b
commit c5304b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main.c b/src/main.c
@@ -233,7 +233,7 @@ void EventLoop()
     	if(Transmitter.music_shutdown) {
 #if HAS_EXTENDED_AUDIO
             MUSIC_Play(MUSIC_SHUTDOWN);
-            while (CLOCK_getms()<audio_queue_time); {
+            while (CLOCK_getms() < audio_queue_time) {
                 // Wait for voice to finished
                 CLOCK_ResetWatchdog();
             }

diff --git a/src/telemetry.c b/src/telemetry.c
@@ -384,7 +384,7 @@ void TELEMETRY_Alarm()
         unsigned telem_prec = 0;
         switch (TELEMETRY_Type()) {
             case TELEM_DEVO:
-                switch (alarm->src]) {
+                switch (alarm->src) {
                     case TELEM_DEVO_VOLT1:
                     case TELEM_DEVO_VOLT2:
                     case TELEM_DEVO_VOLT3: telem_unit = VOICE_UNIT_VOLT; telem_prec = 1; break;