Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -r439894cb0508e69af3ece09ae57a62feac09e3f2 --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision a7bf3ca23ea37a61000379facae628a31b3ecc59) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 439894cb0508e69af3ece09ae57a62feac09e3f2) @@ -127,12 +127,14 @@ } activateAlarm( alarm ); #ifdef DEBUG_ENABLED -#ifdef ALARMS_DEBUG +#ifdef ALARMS_DEBUG + if ( FALSE == alarmIsActive[ alarm ].data ) { // TODO - temporary debug code - remove later char debugStr[ 256 ]; - sprintf( debugStr, "ALARM triggered:%5d \n", alarm ); + sprintf( debugStr, "ALARM trig:%5d \n", alarm ); sendDebugData( (U08*)debugStr, strlen(debugStr) ); + sendDebugDataToUI( (U08*)debugStr ); } #endif #endif @@ -159,12 +161,14 @@ } activateAlarm( alarm ); #ifdef DEBUG_ENABLED -#ifdef ALARMS_DEBUG +#ifdef ALARMS_DEBUG + if ( FALSE == alarmIsActive[ alarm ].data ) { // TODO - temporary debug code - remove later char debugStr[ 256 ]; - sprintf( debugStr, "ALARM triggered:%5d %8X \n", alarm, alarmData.data.uInt.data ); + sprintf( debugStr, "ALARM trig:%5d %8X \n", alarm, alarmData.data.uInt.data ); sendDebugData( (U08*)debugStr, strlen(debugStr) ); + sendDebugDataToUI( (U08*)debugStr ); } #endif #endif @@ -193,11 +197,13 @@ activateAlarm( alarm ); #ifdef DEBUG_ENABLED #ifdef ALARMS_DEBUG + if ( FALSE == alarmIsActive[ alarm ].data ) { // TODO - temporary debug code - remove later char debugStr[ 256 ]; - sprintf( debugStr, "ALARM triggered:%5d %8X %8X \n", alarm, alarmData1.data.uInt.data, alarmData2.data.uInt.data ); + sprintf( debugStr, "ALARM trig:%5d %8X %8X \n", alarm, alarmData1.data.uInt.data, alarmData2.data.uInt.data ); sendDebugData( (U08*)debugStr, strlen(debugStr) ); + sendDebugDataToUI( (U08*)debugStr ); } #endif #endif @@ -225,11 +231,13 @@ alarmIsActive[ alarm ].data = FALSE; #ifdef DEBUG_ENABLED #ifdef ALARMS_DEBUG + if ( FALSE == alarmIsActive[ alarm ].data ) { // TODO - temporary debug code - remove later char debugStr[ 256 ]; sprintf( debugStr, "ALARM cleared:%5d \n", alarm ); sendDebugData( (U08*)debugStr, strlen(debugStr) ); + sendDebugDataToUI( (U08*)debugStr ); } #endif #endif