Clean-up

AudioConsole.X/Source/AudioConsole.c

@@ -275,32 +275,11 @@ int AudioConsoleVolumeUp(int Zone)
     {
         case AUDIO_CONSOLE_SALON_ZONE:
         {
-//            if(mMainZoneStatus.MainVolume == AUDIO_CONSOLE_MAX_VOLUME)
-//                return RET_OK;
-//            
-//            mMainZoneStatus.MainVolume += AUDIO_CONSOLE_VOLUME_INCREMENT;
-//            if(mMainZoneStatus.MainVolume > AUDIO_CONSOLE_MAX_VOLUME)
-//            {
-//                mMainZoneStatus.MainVolume =AUDIO_CONSOLE_MAX_VOLUME;
-//            }
-           // SendMainVolumeToMaster();
             SendIncrementMainVolume(true);
             break;
         }
         case AUDIO_CONSOLE_CUISINE_ZONE:
         {
-//            if(mZone2Status.MainVolume == AUDIO_CONSOLE_MAX_VOLUME)
-//            {
-//                return RET_OK;
-//            }
-//            
-//            mZone2Status.MainVolume += AUDIO_CONSOLE_VOLUME_INCREMENT;
-//            if(mZone2Status.MainVolume > AUDIO_CONSOLE_MAX_VOLUME)
-//            {
-//                mZone2Status.MainVolume = AUDIO_CONSOLE_MAX_VOLUME;
-//            }
-            
-           // SendZone2VolumeToMaster();
             SendIncrementZ2Volume(true);
             break;
         }
@@ -316,39 +295,11 @@ int AudioConsoleVolumeDown(int Zone)
         
         case AUDIO_CONSOLE_SALON_ZONE:
         {
-//            if(mMainZoneStatus.MainVolume == 0)
-//            {
-//                return RET_OK;
-//            }
-//            
-//            if(mMainZoneStatus.MainVolume <= AUDIO_CONSOLE_VOLUME_INCREMENT)
-//            {
-//                mMainZoneStatus.MainVolume = 0;
-//            }
-//            else
-//            {
-//                mMainZoneStatus.MainVolume -= AUDIO_CONSOLE_VOLUME_INCREMENT;
-//            }
-//            SendMainVolumeToMaster();
             SendIncrementMainVolume(false);
             break;
         }
         case AUDIO_CONSOLE_CUISINE_ZONE:
         {
-//            if(mZone2Status.MainVolume == 0)
-//            {
-//                return RET_OK;
-//            }
-//            
-//            if(mZone2Status.MainVolume <= AUDIO_CONSOLE_VOLUME_INCREMENT)
-//            {
-//                mZone2Status.MainVolume = 0;
-//            }
-//            else
-//            {
-//                mZone2Status.MainVolume -= AUDIO_CONSOLE_VOLUME_INCREMENT;
-//            }
-////            SendZone2VolumeToMaster();
             SendIncrementZ2Volume(false);
             break;
         }

AudioConsole.X/Source/AudioConsoleLedMgr.c

@@ -33,18 +33,6 @@ void AudioConsoleLedMgrTick()
 {
     if(IsTimerExpired(LED_EFFECT_TIMER) == true)  //Reuse pushbutton timer :)
     {
-        //        if(mLinkZ2LEDDimmer.BreathEffect == true && mLinkZ2LEDDimmer.IsON == true)
-        //        {
-        //            mLinkZ2LEDDimmer.ONPeriod += DimmerSlope;
-        //            if(mLinkZ2LEDDimmer.ONPeriod >= mLinkZ2LEDDimmer.TotalPeriod)
-        //            {
-        //                DimmerSlope = -5;
-        //                mLinkZ2LEDDimmer.ONPeriod = mLinkZ2LEDDimmer.TotalPeriod - 5;
-        //            }
-        //            else if(mLinkZ2LEDDimmer.ONPeriod <= 5)
-        //                mLinkZ2LEDDimmer.ONPeriod = DimmerSlope = 5;
-        //        }
-        
         int i;
         for(i = 0; i < AUDIO_CONSOLE_NB_LED; i++)
         {
@@ -65,18 +53,6 @@ void AudioConsoleLedMgrTick()
         TimerStart(LED_EFFECT_TIMER,LED_EFFECT_TIMEOUT);
     }
     
-    //    if(mLinkZ2LEDDimmer.IsON)
-    //    {
-    //        if(mLinkZ2LEDDimmer.Counter++ >= mLinkZ2LEDDimmer.ONPeriod)
-    //        {
-    //            AUDIO_CONSOLE_LINK_Z2_STATUS_LED = LED_OFF;
-    //            if(mLinkZ2LEDDimmer.Counter >= mLinkZ2LEDDimmer.TotalPeriod)
-    //            {
-    //                AUDIO_CONSOLE_LINK_Z2_STATUS_LED = LED_ON;
-    //                mLinkZ2LEDDimmer.Counter = 0;
-    //            }
-    //        }
-    //    }
     int i;
     for(i = 0; i < AUDIO_CONSOLE_NB_LED; i++)
     {
@@ -102,38 +78,28 @@ int UpdatePushButtonLEDs(AVReceiverStatus_t *MainZoneStatus, AVReceiverStatus_t*
     if(MainZoneStatus->MainPwrStatus == true)
     {
         LedMgrSetLED(AUDIO_CONSOLE_MAIN_PWR_LED,true,100,false);
-        //        AUDIO_CONSOLE_MAIN_PWR_STATUS_LED = LED_ON;
     }
     else
     {
         LedMgrSetLED(AUDIO_CONSOLE_MAIN_PWR_LED,false,100,false);
-        //        AUDIO_CONSOLE_MAIN_PWR_STATUS_LED = LED_OFF;
     }
     
     if(Z2Status->MainPwrStatus == true)
     {
         LedMgrSetLED(AUDIO_CONSOLE_Z2_PWR_LED,true,100,false);
-        //        AUDIO_CONSOLE_ZONE2_PWR_STATUS_LED = LED_ON;
     }
     else
     {
         LedMgrSetLED(AUDIO_CONSOLE_Z2_PWR_LED,false,100,false);
-        //        AUDIO_CONSOLE_ZONE2_PWR_STATUS_LED = LED_OFF;
     }
     
     if(MainZoneStatus->SyncZones == true)
     {
-        LedMgrSetLED(AUDIO_CONSOLE_SYNC_Z2_LED,true,100,true);
-        //                AUDIO_CONSOLE_LINK_Z2_STATUS_LED = LED_ON;
-        //                mLinkZ2LEDDimmer.IsON = true;
-        //                mLinkZ2LEDDimmer.Counter = 0;
+        LedMgrSetLED(AUDIO_CONSOLE_SYNC_Z2_LED,true,100,false);
     }
     else
     {
         LedMgrSetLED(AUDIO_CONSOLE_SYNC_Z2_LED,false,100,false);
-        
-        //          AUDIO_CONSOLE_LINK_Z2_STATUS_LED = LED_OFF;
-        //          mLinkZ2LEDDimmer.IsON = false;
     }
     
     return RET_OK;
@@ -278,14 +244,10 @@ int TurnOFF(int LedID)
 int LedMgrShowOfflineMode(bool Offline)
 {
     int i = 0;
-    bool ON = true;
-    if(Offline == true)
-    {
-        ON = false;
-    }
+
     for(i = 0; i < AUDIO_CONSOLE_NB_LED; i++)
     {
-        LedMgrSetLED(i,ON,100,true);
+        LedMgrSetLED(i,Offline,100,true);
     }
     
 }