[tuxdroid-svn] r733 - firmware/tuxcore/trunk
Status: Beta
Brought to you by:
ks156
From: Paul_R <c2m...@c2...> - 2007-11-27 10:18:42
|
Author: Paul_R Date: 2007-11-27 11:18:44 +0100 (Tue, 27 Nov 2007) New Revision: 733 Modified: firmware/tuxcore/trunk/global.h firmware/tuxcore/trunk/main.c firmware/tuxcore/trunk/parser.c Log: * Changed the names of the audio statuses's received from tuxaudio to send them to the PC. Modified: firmware/tuxcore/trunk/global.h =================================================================== --- firmware/tuxcore/trunk/global.h 2007-11-27 09:53:50 UTC (rev 732) +++ firmware/tuxcore/trunk/global.h 2007-11-27 10:18:44 UTC (rev 733) @@ -165,6 +165,8 @@ uint8_t ir; /* IR RC5 code received from tux's remote */ uint8_t pos; /* Poitionning */ uint8_t mot; + uint8_t audio_play; + uint8_t audio_status; } GSTATUS; Modified: firmware/tuxcore/trunk/main.c =================================================================== --- firmware/tuxcore/trunk/main.c 2007-11-27 09:53:50 UTC (rev 732) +++ firmware/tuxcore/trunk/main.c 2007-11-27 10:18:44 UTC (rev 733) @@ -271,8 +271,8 @@ statusFifoFlag = 1; FifoPut(statusFifo, STATUS_SENSORS1_CMD); FifoPut(statusFifo, gStatus.sw); - FifoPut(statusFifo, gStatus.mic); - FifoPut(statusFifo, gStatus.bat); + FifoPut(statusFifo, gStatus.audio_play); + FifoPut(statusFifo, gStatus.audio_status); FifoPut(statusFifo, STATUS_PORTS_CMD); FifoPut(statusFifo, PINB); FifoPut(statusFifo, PINC); Modified: firmware/tuxcore/trunk/parser.c =================================================================== --- firmware/tuxcore/trunk/parser.c 2007-11-27 09:53:50 UTC (rev 732) +++ firmware/tuxcore/trunk/parser.c 2007-11-27 10:18:44 UTC (rev 733) @@ -62,8 +62,8 @@ if (!(command[1] & STATUS_RF_MK) && (gStatus.sw & GSTATUS_RF_MK)) cond_flags.rf_disconn = 1; gStatus.sw = command[1]; - gStatus.mic = command[2]; - gStatus.bat = command[3]; + gStatus.audio_play = command[2]; + gStatus.audio_status = command[3]; return; } |