Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -rf47b6fe27cb642b8db7c62fdc6407846afe9efe4 -r8cf0fafa78ce14b5dbdf95510e957846660ac2b9 --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision f47b6fe27cb642b8db7c62fdc6407846afe9efe4) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 8cf0fafa78ce14b5dbdf95510e957846660ac2b9) @@ -7,8 +7,8 @@ * * @file AlarmMgmt.c * -* @author (last) Vinayakam Mani -* @date (last) 05-Jan-2024 +* @author (last) Dara Navaei +* @date (last) 06-May-2024 * * @author (original) Sean Nash * @date (original) 07-Nov-2019 @@ -377,7 +377,8 @@ // if the block timer is 0 OR we have an unblockable alarm if ( ( ALARM_NOT_BLOCKED == alarmsBlockedTimer ) || ( ALARM_ID_HD_AC_POWER_LOST == alarm ) - || ( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT == alarm ) ) + || ( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT == alarm ) + || ( ALARM_ID_HD_DG_RESTARTED_FAULT == alarm ) ) { // do not re-trigger alarm if blocked by property if ( ( FALSE == alarmNoRetrigger ) || ( ( ALARM_TABLE[ alarm ].alarmNoRetrigOnRB != TRUE ) && ( ALARM_TABLE[ alarm ].alarmNoRetrigOnEndTx != TRUE ) ) ) @@ -407,7 +408,12 @@ // Send information for UI to log to treatment log if ( ( TRUE == ALARM_TABLE[ alarm ].alarmTreatmentLog ) && ( MODE_TREA == getCurrentOperationMode() ) ) { - sendTreatmentLogAlarmEventData( alarm, alarmData1, alarmData2 ); + F32 data1; + F32 data2; + + memcpy( &data1, &alarmData1.data, sizeof( F32 ) ); + memcpy( &data2, &alarmData2.data, sizeof( F32 ) ); + sendTreatmentLogAlarmEventData( alarm, data1, data2 ); } } activateAlarm( alarm ); @@ -864,7 +870,6 @@ if ( ( volumeLevel > 0 ) && ( volumeLevel <= MAX_ALARM_VOLUME_LEVEL ) ) { - sendTreatmentLogEventData( ALARM_AUDIO_VOLUME_CHANGED_EVENT, (F32)volumeLevel, (F32)getAlarmAudioVolume() ); // Convert volume level to attenuation level alarmAudioVolumeLevel.data = MAX_ALARM_VOLUME_LEVEL - volumeLevel; accepted = TRUE;