Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r34ed52c598042fdcfa5526e3b1d46fa09b040199 -ra8bb1da29825b5d666333629fda871652d16229a
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 34ed52c598042fdcfa5526e3b1d46fa09b040199)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision a8bb1da29825b5d666333629fda871652d16229a)
@@ -561,7 +561,7 @@
 {
     HEATERS_SELF_TEST_STATES_T state = HEATERS_SELF_TEST_SMALL_PRIMARY_AND_TRIMMER_HEATERS;
 
-    if ( didTimeout( selfTestElapsedTime, HEATERS_POST_HEAT_UP_TIME_SECONDS ) )
+    if ( TRUE == didTimeout( selfTestElapsedTime, HEATERS_POST_HEAT_UP_TIME_SECONDS ) )
     {
         setSmallPrimaryHeaterPWM( 0 );
         setTrimmerHeaterPWM( 0 );
@@ -600,7 +600,7 @@
 {
     HEATERS_SELF_TEST_STATES_T state = HEATERS_SELF_TEST_MAIN_PRIMARY_HEATER;
 
-    if ( didTimeout( selfTestElapsedTime, HEATERS_POST_HEAT_UP_TIME_SECONDS ) )
+    if ( TRUE == didTimeout( selfTestElapsedTime, HEATERS_POST_HEAT_UP_TIME_SECONDS ) )
     {
         setMainPrimaryHeaterPWM( 0 );
 
@@ -635,7 +635,7 @@
 {
     PRIMARY_HEATERS_EXEC_STATES_T state = PRIMARY_HEATERS_EXEC_STATE_OFF;
 
-    if ( hasStartPrimaryHeaterRequested )
+    if ( TRUE == hasStartPrimaryHeaterRequested )
     {
         resetHeaterState( PRIMARY_HEATER );
         setMainPrimaryHeaterPWM( mainPrimaryHeaterDutyCycle );
@@ -730,7 +730,7 @@
 {
     TRIMMER_HEATER_EXEC_STATES_T state = TRIMMER_HEATER_EXEC_STATE_OFF;
 
-    if ( hasStartTrimmerHeaterRequested )
+    if ( TRUE == hasStartTrimmerHeaterRequested )
     {
         resetHeaterState( TRIMMER_HEATER );
         isTrimmerHeaterOn = TRUE;
@@ -783,7 +783,7 @@
         trimmerHeaterTimerCounter = 0;
     }
 
-    if ( ! isTrimmerHeaterOn )
+    if ( isTrimmerHeaterOn != TRUE )
     {
         // Set the duty cycle to 0 and switch to off state
         trimmerHeaterDutyCycle = HEATERS_MIN_DUTY_CYCLE;
@@ -916,7 +916,7 @@
 {
     BOOL result = FALSE;
 
-    if ( isTestingActivated() )
+    if ( TRUE == isTestingActivated() )
     {
         U32 interval = value / TASK_PRIORITY_INTERVAL;
 
@@ -940,7 +940,7 @@
 {
     BOOL result = FALSE;
 
-    if ( isTestingActivated() )
+    if ( TRUE == isTestingActivated() )
     {
         result = TRUE;
         heatersDataPublishInterval.override = OVERRIDE_RESET;