LED et pot fonctionnels

AudioConsole.X/Source/AudioConsole.c

@@ -1,14 +1,18 @@
 #include "define.h"
 #include "AudioConsole.h"
 #include "timer.h"
-#include "BoardCfg.h"
+
 #include "ProtocolDefs.h"
 #include "NetworkProtocol.h"
+#include "VUMeter.h"
+#include "PushBtnMgr.h"
+#include "AudioConsoleLedMgr.h"
 
-AVReceiverStatus_t mMAinZoneStatus, mZone2Status;
+AVReceiverStatus_t mMainZoneStatus, mZone2Status;
 bool mMasterInterfaceConnected;
 
 int mAudioConsoleState;
+int mAudioConsoleStatusRetryCount;
 
 int AudioConsoleInit()
 {
@@ -16,18 +20,22 @@ int AudioConsoleInit()
     mMasterInterfaceConnected = false;
     mAudioConsoleState = AUDIO_CONSOLE_INIT_STATE;
     TimerStart(CONSOLE_IF_CONNECT_TIMER,AUDIO_CONSOLE_WAIT_FOR_WIFI_TIMEOUT);
-    
+    mAudioConsoleStatusRetryCount = 0;
+    mZone2Status.MainVolume = 0;
+    mMainZoneStatus.MainVolume = 0;
 }
 
 int AudioConsoleSetReceiverStatus(AVReceiverStatus_t *MainZone, AVReceiverStatus_t *Zone2)
 {
-    mMAinZoneStatus.MainPwrStatus = MainZone ->MainPwrStatus;
+    mAudioConsoleStatusRetryCount = 0;
-    mMAinZoneStatus.MainSleepStatus = MainZone->MainSleepStatus;
+    
-    mMAinZoneStatus.IsMute = MainZone->IsMute;
+    mMainZoneStatus.MainPwrStatus = MainZone ->MainPwrStatus;
-    mMAinZoneStatus.DataValid = MainZone->DataValid;
+    mMainZoneStatus.MainSleepStatus = MainZone->MainSleepStatus;
-    mMAinZoneStatus.ReceiverOnline = MainZone->ReceiverOnline;
+    mMainZoneStatus.IsMute = MainZone->IsMute;
-    mMAinZoneStatus.SyncZones = MainZone->SyncZones;
+    mMainZoneStatus.DataValid = MainZone->DataValid;
-    mMAinZoneStatus.MainVolume = MainZone->MainVolume;
+    mMainZoneStatus.ReceiverOnline = MainZone->ReceiverOnline;
+    mMainZoneStatus.SyncZones = MainZone->SyncZones;
+    mMainZoneStatus.MainVolume = MainZone->MainVolume;
     
     mZone2Status.MainPwrStatus = Zone2 ->MainPwrStatus;
     mZone2Status.MainSleepStatus = Zone2->MainSleepStatus;
@@ -37,6 +45,10 @@ int AudioConsoleSetReceiverStatus(AVReceiverStatus_t *MainZone, AVReceiverStatus
     mZone2Status.SyncZones = Zone2->SyncZones;
     mZone2Status.MainVolume = Zone2->MainVolume;
     
+    VUMeterSetVolume(mMainZoneStatus.MainVolume,mZone2Status.MainVolume);
+    
+   
+    UpdatePushButtonLEDs(&mMainZoneStatus,&mZone2Status);
     return RET_OK;
 }
 
@@ -68,10 +80,28 @@ int AudioConsoleSM(int Event)
             {
                 case AUDIO_CONSOLE_SM_TICK_EVENT:
                 {
+                    if(IsWiFiConnected() == true)
+                    {
+                        if(ConnectAudioInterface() == RET_ERROR)
+                        {
+                            //Socket don't work anymore... not shure what to do.
+                            int toto = 1;
+                            toto ++;
+                        }
+                        mAudioConsoleState = AUDIO_CONSOLE_CONNECTING_STATE;
+                        TimerStart(CONSOLE_IF_CONNECT_TIMER,AUDIO_CONSOLE_WAIT_FOR_CONNECT_TIMEOUT);
+                    }
+                    else
+                    {
+                        TimerStart(CONSOLE_IF_CONNECT_TIMER,AUDIO_CONSOLE_WAIT_FOR_WIFI_TIMEOUT);
+                    }
                     break;
                 }
                 case AUDIO_CONSOLE_SM_CONNECTED_EVENT:
                 {
+                    TimerStart(CONSOLE_IF_CONNECT_TIMER,AUDIO_CONSOLE_STATUS_REQUEST_TIMEOUT);
+                    RequestStatus();
+                    mAudioConsoleState = AUDIO_CONSOLE_RUN_STATE;
                     break;
                 }
                 case AUDIO_CONSOLE_SM_DISCONNECTED_EVENT:
@@ -87,12 +117,13 @@ int AudioConsoleSM(int Event)
             {
                 case AUDIO_CONSOLE_SM_TICK_EVENT:
                 {
-                    if(IsAudioInterfaceConnected() == false)
+                    if(IsWiFiConnected() == false)
                     {
-                        //TODO reset console display
+                        AudioConsoleDisconnected();                        
-                        mAudioConsoleState = AUDIO_CONSOLE_INIT_STATE;
+                    }
-                        TimerStop(CONSOLE_IF_CONNECT_TIMER);
+                    else if(IsTimerExpired(CONSOLE_IF_CONNECT_TIMER))
-                        
+                    {
+                        AudioConsoleDisconnected(); //Retry to connect...
                     }
                     break;
                 }
@@ -101,12 +132,12 @@ int AudioConsoleSM(int Event)
                     TimerStart(CONSOLE_IF_CONNECT_TIMER,AUDIO_CONSOLE_STATUS_REQUEST_TIMEOUT);
                     RequestStatus();
                     mAudioConsoleState = AUDIO_CONSOLE_RUN_STATE;
+                    LedMgrShowOfflineMode(false);
                     break;
                 }
                 case AUDIO_CONSOLE_SM_DISCONNECTED_EVENT:
                 {
-                    //Connection timed out.... trying again.
+                    AudioConsoleDisconnected();
-                    ConnectAudioInterface();
                     break;
                 }
             }
@@ -118,17 +149,22 @@ int AudioConsoleSM(int Event)
             {
                 case AUDIO_CONSOLE_SM_TICK_EVENT:
                 {
-                    if(IsAudioInterfaceConnected() == false)
+                    if(IsAudioInterfaceConnected() == false  || IsWiFiConnected() == false)
                     {
-                        //TODO reset console display
-                        mAudioConsoleState = AUDIO_CONSOLE_INIT_STATE;
-                        TimerStop(CONSOLE_IF_CONNECT_TIMER);
                         
+                        AudioConsoleDisconnected();
                     }
-                    if(IsTimerExpired(CONSOLE_IF_CONNECT_TIMER))
+                    else if(IsTimerExpired(CONSOLE_IF_CONNECT_TIMER))
                     {
-                        RequestStatus();
+                        if(RequestStatus() == RET_OK)
-                        TimerStart(CONSOLE_IF_CONNECT_TIMER,AUDIO_CONSOLE_STATUS_REQUEST_TIMEOUT);
+                        {
+                            TimerStart(CONSOLE_IF_CONNECT_TIMER,AUDIO_CONSOLE_STATUS_REQUEST_TIMEOUT);
+                        }
+                        else
+                        {
+                            AudioConsoleDisconnected();
+                        }
+                        
                     }
                     break;
                 }
@@ -139,8 +175,8 @@ int AudioConsoleSM(int Event)
                 }
                 case AUDIO_CONSOLE_SM_DISCONNECTED_EVENT:
                 {
-                    mAudioConsoleState = AUDIO_CONSOLE_INIT_STATE;
+                    AudioConsoleDisconnected();
-                    TimerStop(CONSOLE_IF_CONNECT_TIMER);
+                    
                     break;
                 }
             }
@@ -168,7 +204,241 @@ int AudioConsoleSetIFConnectionStatus(bool Connected)
     }
 }
 
-void RequestStatus()
+int RequestStatus()
 {
+    if(mAudioConsoleStatusRetryCount >= AUDIO_CONSOLE_MAX_STATUS_RETRY)
+    {
+        return RET_ERROR;
+    }
+    
+    mAudioConsoleStatusRetryCount++;
     AudioConsoleSendCommand(AV_RECEIVER_INTERFACE_GENERAL_STATUS_REQUEST,0,0);
+    return RET_OK;
+}
+
+
+int SendMainVolumeToMaster()
+{
+    char Volume = mMainZoneStatus.MainVolume;
+    AudioConsoleSendCommand(AV_RECEIVER_INTERFACE_SET_MAIN_VOLUME_REQUEST,&Volume,1);
+    return RET_OK;
+}
+int SendZone2VolumeToMaster()
+{
+    char Volume = mZone2Status.MainVolume;
+    AudioConsoleSendCommand(AV_RECEIVER_INTERFACE_SET_ZONE2_VOLUME_REQUEST,&Volume,1);
+    return RET_OK;
+}
+int SendIncrementMainVolume(bool Increment)
+{
+    char data;
+    if(Increment == true)
+    {
+        data = 1;
+    }
+    else
+    {
+        data = 0;
+    }
+    AudioConsoleSendCommand(AV_RECEIVER_INTERFACE_INCREMENT_MAIN_VOLUME_REQUEST,&data,1);
+    return RET_OK;
+}
+int SendIncrementZ2Volume(bool Increment)
+{
+    char data;
+    if(Increment == true)
+    {
+        data = 1;
+    }
+    else
+    {
+        data = 0;
+    }
+    AudioConsoleSendCommand(AV_RECEIVER_INTERFACE_INCREMENT_Z2_VOLUME_REQUEST,&data,1);
+    return RET_OK;
+}
+
+int AudioConsoleDisconnected()
+{
+    //TODO reset console display
+    ONBOARD_LED1_PIN = LED_OFF;
+    mAudioConsoleStatusRetryCount = 0;
+    DisconnectAudioInterface();
+    mAudioConsoleState = AUDIO_CONSOLE_DISCONNECTED_STATE;
+    TimerStop(CONSOLE_IF_CONNECT_TIMER);
+    LedMgrShowOfflineMode(true);
+}
+
+int AudioConsoleVolumeUp(int Zone)
+{
+    switch(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;
+        }
+    }
+    RequestStatus();
+    return RET_OK;
+}
+int AudioConsoleVolumeDown(int Zone)
+{
+    switch(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;
+        }
+       
+    }
+     RequestStatus();
+    return RET_OK;
+}
+
+int LinkZ2BtnPressed()
+{
+    if(mMainZoneStatus.SyncZones == true)
+    {
+        SendLinkZ2VolumeToMaster(false);
+    }
+    else
+    {
+        SendLinkZ2VolumeToMaster(true);
+    }
+    RequestStatus();
+    return RET_OK;
+}
+int MainZonePwrBtnPressed()
+{
+    if(mMainZoneStatus.MainPwrStatus == true)
+    {
+        SendMainZonePwrToMaster(false);
+    }
+    else
+    {
+        SendMainZonePwrToMaster(true);
+    }
+    RequestStatus();
+    return RET_OK;
+}
+int Zone2PwrBtnPressed()
+{
+    if(mZone2Status.MainPwrStatus == true)
+    {
+        SendZone2PwrToMaster(false);
+    }
+    else
+    {
+        SendZone2PwrToMaster(true);
+    }
+    RequestStatus();
+    return RET_OK;
+}
+
+int SendLinkZ2VolumeToMaster(bool link)
+{
+    char data;
+    if(link == true)
+    {
+        data = 1;
+    }
+    else
+    {
+        data = 0;
+    }
+    AudioConsoleSendCommand(AV_RECEIVER_INTERFACE_SET_SYNC_Z2_WITH_Z1_REQUEST,&data,1);
+    return RET_OK;
+}
+
+
+int SendMainZonePwrToMaster(bool ON)
+{
+    char data;
+    if(ON == true)
+    {
+        data = 1;
+    }
+    else
+    {
+        data = 0;
+    }
+    AudioConsoleSendCommand(AV_RECEIVER_INTERFACE_SET_MAIN_POWER_REQUEST,&data,1);
+    return RET_OK;
+}
+int SendZone2PwrToMaster(bool ON)
+{
+        char data;
+    if(ON == true)
+    {
+        data = 1;
+    }
+    else
+    {
+        data = 0;
+    }
+    AudioConsoleSendCommand(AV_RECEIVER_INTERFACE_SET_ZONE2_REQUEST,&data,1);
+    return RET_OK;
 }

AudioConsole.X/Source/AudioConsole.h

@@ -11,15 +11,24 @@
 #include "define.h"
 #include "AudioConsoleInterface.h"
 #include "WiFiCtrl.h"
+#include "BoardCfg.h"
 
 
 #define AUDIO_CONSOLE_WAIT_FOR_WIFI_TIMEOUT 1000
-#define AUDIO_CONSOLE_WAIT_FOR_CONNECT_TIMEOUT 5000
+#define AUDIO_CONSOLE_WAIT_FOR_CONNECT_TIMEOUT 10000
 #define AUDIO_CONSOLE_STATUS_REQUEST_TIMEOUT 1000
+#define AUDIO_CONSOLE_MAX_STATUS_RETRY 5
+#define AUDIO_CONSOLE_VOLUME_INCREMENT 1
+
+
+
+enum eAudioConsoleZone
+{
+    AUDIO_CONSOLE_SALON_ZONE,
+    AUDIO_CONSOLE_CUISINE_ZONE
+};
 
 
-#define AUDIO_CONSOLE_MIN_VOLUME 0
-#define AUDIO_CONSOLE_MAX_VOLUME 194
 
 typedef struct eAVReceiverStatus
 {
@@ -56,9 +65,20 @@ void AudioConsoleTick();
 int AudioConsoleSetIFConnectionStatus(bool Connected);
 int AudioConsoleSetReceiverStatus(AVReceiverStatus_t *MainZone, AVReceiverStatus_t *Zone2);
 int AudioConsoleSM(int Event);
+int AudioConsoleDisconnected();
 
+int RequestStatus();
+int SendMainVolumeToMaster();
+int SendZone2VolumeToMaster();
+int SendLinkZ2VolumeToMaster(bool link);
+int SendMainZonePwrToMaster(bool ON);
+int SendZone2PwrToMaster(bool ON);
+int AudioConsoleVolumeUp(int Zone);
+int AudioConsoleVolumeDown(int Zone);
+int LinkZ2BtnPressed();
+int MainZonePwrBtnPressed();
+int Zone2PwrBtnPressed();
 
-void RequestStatus();
 
 #endif	/* AUDIOCONSOLE_H */
 

AudioConsole.X/Source/AudioConsoleInterface.c

@@ -47,49 +47,26 @@ void AudioConsoleIFExecuteMasterCommand(unsigned char SenderID, unsigned char Co
             MainZone.MainPwrStatus = Data[0];
             MainZone.MainSleepStatus = Data[1];
             
-            MainZone.MainVolume = Data[5];
+            MainZone.MainVolume = Data[2];
-            MainZone.MainVolume <<= 8;
-            MainZone.MainVolume += Data[4];
-            MainZone.MainVolume <<= 8;
-            MainZone.MainVolume += Data[3];
-            MainZone.MainVolume <<= 8;
-            MainZone.MainVolume += Data[2];
-          //  memcpy(&(MainZone.MainVolume),&IntToFloat,4);
             
-            MainZone.IsMute = Data[6];
+            MainZone.IsMute = Data[3];
-            MainZone.DataValid = Data[7];
+            MainZone.DataValid = Data[4];
-            MainZone.ReceiverOnline = Data[8];
+            MainZone.ReceiverOnline = Data[5];
-            MainZone.SyncZones = Data[9];
+            MainZone.SyncZones = Data[6];
             
             
             //Zone 2 status
             IntToFloat = 0;
             
-            Zone2.MainPwrStatus = Data[0];
+            Zone2.MainPwrStatus = Data[7];
-            Zone2.MainSleepStatus = Data[1];
+            Zone2.MainSleepStatus = Data[8];
             
+            Zone2.MainVolume = Data[9];
             
-            Zone2.MainVolume = Data[2];
+            Zone2.IsMute = Data[10];
-            Zone2.MainVolume <<= 8;
+            Zone2.DataValid = Data[11];
-            Zone2.MainVolume += Data[3];
+            Zone2.ReceiverOnline = Data[12];
-            Zone2.MainVolume <<= 8;
+            Zone2.SyncZones = Data[13];
-            Zone2.MainVolume += Data[4];
-            Zone2.MainVolume <<= 8;
-            Zone2.MainVolume += Data[5];
-            
-//            IntToFloat = Data[2];
-//            IntToFloat <<= 8;
-//            IntToFloat += Data[3];
-//            IntToFloat <<= 8;
-//            IntToFloat += Data[4];
-//            IntToFloat <<= 8;
-//            IntToFloat += Data[5];
-//            memcpy(&(Zone2.MainVolume),&IntToFloat,4);
-            
-            Zone2.IsMute = Data[6];
-            Zone2.DataValid = Data[7];
-            Zone2.ReceiverOnline = Data[8];
-            Zone2.SyncZones = Data[9];
             
             
             
@@ -158,6 +135,14 @@ void AudioConsoleIFExecuteMasterCommand(unsigned char SenderID, unsigned char Co
         {
             break;
         }
+        case AV_RECEIVER_INTERFACE_INCREMENT_MAIN_VOLUME_RESPONSE:
+        {
+            break;
+        }
+        AV_RECEIVER_INTERFACE_INCREMENT_Z2_VOLUME_RESPONSE:
+        {
+            break;
+        }
         case AV_RECEIVER_INTERFACE_GENERAL_STATUS_REQUEST:
         case AV_RECEIVER_INTERFACE_SET_MAIN_POWER_REQUEST:
         case AV_RECEIVER_INTERFACE_SET_ZONE2_REQUEST:
@@ -169,6 +154,9 @@ void AudioConsoleIFExecuteMasterCommand(unsigned char SenderID, unsigned char Co
         case AV_RECEIVER_INTERFACE_SET_ZONE2_VOLUME_REQUEST:
         case AV_RECEIVER_INTERFACE_SET_ZONE2_INPUT_REQUEST:
         case AV_RECEIVER_INTERFACE_SET_SYNC_Z2_WITH_Z1_REQUEST:
+        case AV_RECEIVER_INTERFACE_INCREMENT_MAIN_VOLUME_REQUEST:
+        case AV_RECEIVER_INTERFACE_INCREMENT_Z2_VOLUME_REQUEST:
+            
             
         default:
         {

AudioConsole.X/Source/AudioConsoleLedMgr.c

@@ -0,0 +1,291 @@
+#include "AudioConsoleLedMgr.h"
+#include "timer.h"
+//BtnLedDimmer_t mLinkZ2LEDDimmer;
+//int DimmerSlope = 5;
+
+BtnLedDimmer_t mLedDimmerList[AUDIO_CONSOLE_NB_LED];
+BtnLedDimmer_t mLinkZ2LEDDimmer;
+int DimmerSlope = 5;
+
+void AudioConsoleLedMgrInit()
+{
+    mLinkZ2LEDDimmer.IsON = false;
+    mLinkZ2LEDDimmer.TotalPeriod = 200;
+    mLinkZ2LEDDimmer.ONPeriod = 200;
+    mLinkZ2LEDDimmer.Counter = 0;
+    mLinkZ2LEDDimmer.BreathEffect = true;
+    
+    int i;
+    for(i = 0; i < AUDIO_CONSOLE_NB_LED; i++)
+    {
+        mLedDimmerList[i].IsON = false;
+        mLedDimmerList[i].TotalPeriod = 200;
+        mLedDimmerList[i].ONPeriod = 200;
+        mLedDimmerList[i].Counter = 0;
+        mLedDimmerList[i].BreathEffect = false;
+        mLedDimmerList[i].DimmerSlope = 5;
+    }
+    
+    TimerStart(LED_EFFECT_TIMER,LED_EFFECT_TIMEOUT);
+}
+
+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++)
+        {
+            if(mLedDimmerList[i].BreathEffect == true && mLedDimmerList[i].IsON == true)
+            {
+                mLedDimmerList[i].ONPeriod += mLedDimmerList[i].DimmerSlope;
+                if(mLedDimmerList[i].ONPeriod >= mLedDimmerList[i].TotalPeriod)
+                {
+                    mLedDimmerList[i].DimmerSlope = -5;
+                    mLedDimmerList[i].ONPeriod = mLedDimmerList[i].TotalPeriod - 5;
+                }
+                else if(mLedDimmerList[i].ONPeriod <= 5)
+                {
+                    mLedDimmerList[i].DimmerSlope = 5;
+                }
+            }
+        }
+        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++)
+    {
+        if(mLedDimmerList[i].IsON)
+        {
+            if(mLedDimmerList[i].Counter++ >= mLedDimmerList[i].ONPeriod)
+            {
+                TurnOFF(i);
+                if(mLedDimmerList[i].Counter >= mLedDimmerList[i].TotalPeriod)
+                {
+                    TurnON(i);
+                    mLedDimmerList[i].Counter = 0;
+                }
+            }
+        }
+    }
+    
+    
+}
+
+int UpdatePushButtonLEDs(AVReceiverStatus_t *MainZoneStatus, AVReceiverStatus_t* Z2Status)
+{
+    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;
+    }
+    else
+    {
+        LedMgrSetLED(AUDIO_CONSOLE_SYNC_Z2_LED,false,100,false);
+        
+        //          AUDIO_CONSOLE_LINK_Z2_STATUS_LED = LED_OFF;
+        //          mLinkZ2LEDDimmer.IsON = false;
+    }
+    
+    return RET_OK;
+}
+
+int LedMgrSetLED(int LedID, bool ON, int Percent, bool breathe)
+{
+    if(LedID >= AUDIO_CONSOLE_NB_LED)
+        return RET_ERROR;
+    if(Percent > 100)
+        return RET_ERROR;
+    
+    if(ON == true)
+    {
+        TurnON(LedID);
+    }
+    else
+    {
+        TurnOFF(LedID);
+    }
+    
+    
+    if(ON != mLedDimmerList[LedID].IsON || breathe == false)
+    {
+        mLedDimmerList[LedID].ONPeriod = (((float)Percent/100)*mLedDimmerList[LedID].TotalPeriod);
+        mLedDimmerList[LedID].Counter = 0;
+    }
+    mLedDimmerList[LedID].IsON = ON;
+    mLedDimmerList[LedID].BreathEffect = breathe;
+    
+    
+    
+    
+    return RET_OK;
+}
+
+int TurnON(int LedID)
+{
+    switch(LedID)
+    {
+        case AUDIO_CONSOLE_SYNC_Z2_LED:
+        {
+            AUDIO_CONSOLE_LINK_Z2_STATUS_LED = LED_ON;
+            break;
+        }
+        case AUDIO_CONSOLE_MAIN_PWR_LED:
+        {
+            AUDIO_CONSOLE_MAIN_PWR_STATUS_LED = LED_ON;
+            break;
+        }
+        case AUDIO_CONSOLE_Z2_PWR_LED:
+        {
+            AUDIO_CONSOLE_ZONE2_PWR_STATUS_LED = LED_ON;
+            break;
+        }
+        case AUDIO_CONSOLE_PUSHBTN_2_LED:
+        {
+            PUSH_BUTTON_LED2_PIN = LED_ON;
+            break;
+        }
+        case AUDIO_CONSOLE_PUSHBTN_3_LED:
+        {
+            PUSH_BUTTON_LED3_PIN = LED_ON;
+            break;
+        }
+        case AUDIO_CONSOLE_PUSHBTN_4_LED:
+        {
+            PUSH_BUTTON_LED4_PIN = LED_ON;
+            break;
+        }
+        case AUDIO_CONSOLE_PUSHBTN_5_LED:
+        {
+            PUSH_BUTTON_LED5_PIN = LED_ON;
+            break;
+        }
+        case AUDIO_CONSOLE_PUSHBTN_6_LED:
+        {
+            PUSH_BUTTON_LED6_PIN = LED_ON;
+            break;
+        }
+        case AUDIO_CONSOLE_PUSHBTN_7_LED:
+        {
+            PUSH_BUTTON_LED7_PIN = LED_ON;
+            break;
+        }
+    }
+    return RET_OK;
+}
+int TurnOFF(int LedID)
+{
+    switch(LedID)
+    {
+        case AUDIO_CONSOLE_SYNC_Z2_LED:
+        {
+            AUDIO_CONSOLE_LINK_Z2_STATUS_LED = LED_OFF;
+            break;
+        }
+        case AUDIO_CONSOLE_MAIN_PWR_LED:
+        {
+            AUDIO_CONSOLE_MAIN_PWR_STATUS_LED = LED_OFF;
+            break;
+        }
+        case AUDIO_CONSOLE_Z2_PWR_LED:
+        {
+            AUDIO_CONSOLE_ZONE2_PWR_STATUS_LED = LED_OFF;
+            break;
+        }
+        case AUDIO_CONSOLE_PUSHBTN_2_LED:
+        {
+            PUSH_BUTTON_LED2_PIN = LED_OFF;
+            break;
+        }
+        case AUDIO_CONSOLE_PUSHBTN_3_LED:
+        {
+            PUSH_BUTTON_LED3_PIN = LED_OFF;
+            break;
+        }
+        case AUDIO_CONSOLE_PUSHBTN_4_LED:
+        {
+            PUSH_BUTTON_LED4_PIN = LED_OFF;
+            break;
+        }
+        case AUDIO_CONSOLE_PUSHBTN_5_LED:
+        {
+            PUSH_BUTTON_LED5_PIN = LED_OFF;
+            break;
+        }
+        case AUDIO_CONSOLE_PUSHBTN_6_LED:
+        {
+            PUSH_BUTTON_LED6_PIN = LED_OFF;
+            break;
+        }
+        case AUDIO_CONSOLE_PUSHBTN_7_LED:
+        {
+            PUSH_BUTTON_LED7_PIN = LED_OFF;
+            break;
+        }
+    }
+    return RET_OK;
+}
+
+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);
+    }
+    
+}

AudioConsole.X/Source/AudioConsoleLedMgr.h

@@ -0,0 +1,57 @@
+/* 
+ * File:   AudioConsoleLedMgr.h
+ * Author: JF
+ *
+ * Created on February 23, 2025, 3:26 PM
+ */
+
+#ifndef AUDIOCONSOLELEDMGR_H
+#define	AUDIOCONSOLELEDMGR_H
+
+#include "define.h"
+#include "BoardCfg.h"
+#include "AudioConsole.h"
+
+#define LED_EFFECT_TIMEOUT 50 //millisecs
+
+#define AUDIO_CONSOLE_MAIN_PWR_STATUS_LED VU1_BACKLIGHT_PIN
+#define AUDIO_CONSOLE_ZONE2_PWR_STATUS_LED VU2_BACKLIGHT_PIN
+#define AUDIO_CONSOLE_LINK_Z2_STATUS_LED PUSH_BUTTON_LED1_PIN
+
+enum eAudioConsoleLED
+{
+    AUDIO_CONSOLE_SYNC_Z2_LED,
+    AUDIO_CONSOLE_MAIN_PWR_LED,     //VU1 backlight
+    AUDIO_CONSOLE_Z2_PWR_LED,       //VU2 backlight
+    AUDIO_CONSOLE_PUSHBTN_2_LED,
+    AUDIO_CONSOLE_PUSHBTN_3_LED,
+    AUDIO_CONSOLE_PUSHBTN_4_LED,
+    AUDIO_CONSOLE_PUSHBTN_5_LED,
+    AUDIO_CONSOLE_PUSHBTN_6_LED,
+    AUDIO_CONSOLE_PUSHBTN_7_LED,
+    
+    AUDIO_CONSOLE_NB_LED
+            
+};
+
+
+typedef struct BtnLEDDimmer
+{
+    int Counter;
+    int ONPeriod;
+    int TotalPeriod;    
+    bool IsON;
+    bool BreathEffect;
+    int DimmerSlope;
+}BtnLedDimmer_t;
+
+void AudioConsoleLedMgrInit();
+void AudioConsoleLedMgrTick();
+int UpdatePushButtonLEDs(AVReceiverStatus_t *MainZoneStatus, AVReceiverStatus_t* Z2Status);
+int LedMgrShowOfflineMode(bool Offline);
+int LedMgrSetLED(int LedID, bool ON, int Percent, bool breathe);
+int TurnON(int LedID);
+int TurnOFF(int LedID);
+
+#endif	/* AUDIOCONSOLELEDMGR_H */
+

AudioConsole.X/Source/DACInterface.h

@@ -8,6 +8,8 @@
 #ifndef DACINTERFACE_H
 #define	DACINTERFACE_H
 
+#define DAC_MAX_VALUE 1023
+
 enum eDACInterfaceChannel
 {
     BUREAU_DAC_CHANNEL,

AudioConsole.X/Source/ProtocolDefs.h

@@ -265,6 +265,10 @@ enum AV_RECEIVER_INTERFACE_CMDS
     AV_RECEIVER_INTERFACE_SET_ZONE2_INPUT_RESPONSE,
     AV_RECEIVER_INTERFACE_SET_SYNC_Z2_WITH_Z1_REQUEST,
     AV_RECEIVER_INTERFACE_SET_SYNC_Z2_WITH_Z1_RESPONSE,
+    AV_RECEIVER_INTERFACE_INCREMENT_MAIN_VOLUME_REQUEST,
+    AV_RECEIVER_INTERFACE_INCREMENT_MAIN_VOLUME_RESPONSE,
+    AV_RECEIVER_INTERFACE_INCREMENT_Z2_VOLUME_REQUEST,
+    AV_RECEIVER_INTERFACE_INCREMENT_Z2_VOLUME_RESPONSE,
 
 
     MAX_AV_RECEIVER_INTERFACE_CMD

AudioConsole.X/Source/PushBtnMgr.c

@@ -0,0 +1,108 @@
+#include "PushBtnMgr.h"
+#include "timer.h"
+#include "Syslog.h"
+
+BtnState_t mLinkZ2BtnState, mMainZonePwrBtn, mZ2PwrBtn;
+
+
+
+
+void PushBtnMgrInit()
+{
+    mLinkZ2BtnState.Debouncing = false;
+    mMainZonePwrBtn.Debouncing = false;
+    mZ2PwrBtn.Debouncing = false;
+    
+    mLinkZ2BtnState.BtnState = AUDIO_CONSOLE_LINK_Z2_BTN;
+    mMainZonePwrBtn.BtnState = AUDIO_CONSOLE_MAIN_PWR_BTN;
+    mZ2PwrBtn.BtnState = AUDIO_CONSOLE_Z2_PWR_BTN;
+    
+ 
+    
+    TimerStart(PUSHBTN_DEBOUNCE_TIMER,PUSHBTN_DEBOUNCE_TIMEOUT);
+}
+
+
+void PushButtonMgrTick()
+{
+    if(IsTimerExpired(PUSHBTN_DEBOUNCE_TIMER) == true)
+    {
+        //Check link Z2 volume with main zone btn
+        if(mLinkZ2BtnState.BtnState != AUDIO_CONSOLE_LINK_Z2_BTN)
+        {
+            mLinkZ2BtnState.BtnState = AUDIO_CONSOLE_LINK_Z2_BTN;
+            mLinkZ2BtnState.Debouncing = true;
+        }
+        else if(mLinkZ2BtnState.Debouncing == true)
+        {
+            //signal is debounced
+            mLinkZ2BtnState.Debouncing = false;
+            if(AUDIO_CONSOLE_LINK_Z2_BTN == 0)
+            {
+                LinkZ2BtnPressed();
+                ONBOARD_LED7_PIN = LED_ON;
+                SyslogNewString("Link Z2 Btn ON\n");
+            }
+            else
+            {
+                ONBOARD_LED7_PIN = LED_OFF;
+                SyslogNewString("Link Z2 Btn OFF\n");
+            }
+        }
+        
+        //Check Main zone power toggle btn
+        if(mMainZonePwrBtn.BtnState != AUDIO_CONSOLE_MAIN_PWR_BTN)
+        {
+            mMainZonePwrBtn.BtnState = AUDIO_CONSOLE_MAIN_PWR_BTN;
+            mMainZonePwrBtn.Debouncing = true;
+        }
+        else if(mMainZonePwrBtn.Debouncing == true)
+        {
+            //signal is debounced
+            mMainZonePwrBtn.Debouncing = false;
+            if(AUDIO_CONSOLE_MAIN_PWR_BTN == 0)
+            {
+                MainZonePwrBtnPressed();
+                ONBOARD_LED7_PIN = LED_ON;
+                SyslogNewString("Main Zone Pwr ON\n");
+            }
+            else
+            {
+                ONBOARD_LED7_PIN = LED_OFF;
+                SyslogNewString("Main Zone Pwr OFF\n");
+            }
+        }
+        
+        //Check Main zone power toggle btn
+        if(mZ2PwrBtn.BtnState != AUDIO_CONSOLE_Z2_PWR_BTN)
+        {
+            mZ2PwrBtn.BtnState = AUDIO_CONSOLE_Z2_PWR_BTN;
+            mZ2PwrBtn.Debouncing = true;
+        }
+        else if(mZ2PwrBtn.Debouncing == true)
+        {
+            //signal is debounced
+            mZ2PwrBtn.Debouncing = false;
+            if(AUDIO_CONSOLE_Z2_PWR_BTN == 0)
+            {
+                Zone2PwrBtnPressed();
+                ONBOARD_LED7_PIN = LED_ON;
+                SyslogNewString("Zone 2 Pwr ON\n");
+            }
+            else
+            {
+                ONBOARD_LED7_PIN = LED_OFF;
+                SyslogNewString("Zone 2 Pwr OFF\n");
+            }
+        }
+        
+        
+        TimerStart(PUSHBTN_DEBOUNCE_TIMER,PUSHBTN_DEBOUNCE_TIMEOUT);
+    }
+    
+    
+
+    
+    
+    
+}

AudioConsole.X/Source/PushBtnMgr.h

@@ -0,0 +1,35 @@
+/* 
+ * File:   PushBtnMgr.h
+ * Author: JF
+ *
+ * Created on February 23, 2025, 12:33 PM
+ */
+
+#ifndef PUSHBTNMGR_H
+#define	PUSHBTNMGR_H
+#include "BoardCfg.h"
+#include "define.h"
+#include "AudioConsole.h"
+
+#define PUSHBTN_DEBOUNCE_TIMEOUT 50 //millisecs
+
+
+#define AUDIO_CONSOLE_LINK_Z2_BTN PUSH_BUTTON_INPUT1_PIN
+#define AUDIO_CONSOLE_MAIN_PWR_BTN PUSH_BUTTON_INPUT2_PIN
+#define AUDIO_CONSOLE_Z2_PWR_BTN PUSH_BUTTON_INPUT3_PIN
+
+typedef struct BtnState
+{
+    int BtnState;
+    bool Debouncing;
+}BtnState_t;
+
+
+
+void PushButtonMgrTick();
+void PushButtonMgrInit();
+
+
+
+#endif	/* PUSHBTNMGR_H */
+

AudioConsole.X/Source/VUMeter.c

@@ -0,0 +1,25 @@
+#include "VUMeter.h"
+#include "DACInterface.h"
+
+float mVolumeScaling;
+
+void VUMeterInit()
+{
+    mVolumeScaling = DAC_MAX_VALUE/AUDIO_CONSOLE_VOLUME_STEPS;
+}
+
+
+void VUMeterSetVolume(int MainVUVolume, int Zone2VUVolume)
+{
+    int Output = 0;
+    if(MainVUVolume <= AUDIO_CONSOLE_MAX_VOLUME && MainVUVolume >= 0)
+    {
+        Output = (int)((float)MainVUVolume*mVolumeScaling);
+        DACSetValue(BUREAU_DAC_CHANNEL,Output);
+    }
+    if(Zone2VUVolume <= AUDIO_CONSOLE_MAX_VOLUME && Zone2VUVolume >= 0)
+    {
+        Output = (int)((float)Zone2VUVolume*mVolumeScaling);
+        DACSetValue(CUISINE_DAC_CHANNEL,Output);    
+    }
+}

AudioConsole.X/Source/VUMeter.h

@@ -0,0 +1,19 @@
+/* 
+ * File:   VUMeter.h
+ * Author: JF
+ *
+ * Created on February 20, 2025, 9:46 PM
+ */
+
+#ifndef VUMETER_H
+#define	VUMETER_H
+
+#define AUDIO_CONSOLE_MIN_VOLUME 0
+#define AUDIO_CONSOLE_MAX_VOLUME 194
+#define AUDIO_CONSOLE_VOLUME_STEPS 194
+
+void VUMeterInit();
+void VUMeterSetVolume(int MainVUVolume, int Zone2VUVolume);
+
+#endif	/* VUMETER_H */
+

AudioConsole.X/Source/VolumeTransducer.c

@@ -4,6 +4,7 @@
 #include "timer.h"
 #include <stdio.h>
 #include "Syslog.h"
+#include "AudioConsole.h"
 
 int mDebouncingBureau = false;
 int mDebouncingCuisine = false;
@@ -62,6 +63,7 @@ int VolumeTransducerTick()
             TimerStop(BUREAU_VOLUME_TRANSDUCER_TIMER);
             if(BUREAU_VOL_POT_CCW_PIN == BUREAU_VOL_POT_CW_PIN)
             {
+                AudioConsoleVolumeDown(AUDIO_CONSOLE_SALON_ZONE);
                 mBureauVolume += (-1 * VOLUME_TRANSDUCER_INCREMENT);
              //   mBureauChange = 0;
                 
@@ -71,6 +73,7 @@ int VolumeTransducerTick()
             }
             else
             {
+                AudioConsoleVolumeUp(AUDIO_CONSOLE_SALON_ZONE);
                 mBureauVolume += (VOLUME_TRANSDUCER_INCREMENT);
             //    mBureauChange = 0;
                 
@@ -100,6 +103,7 @@ int VolumeTransducerTick()
             TimerStop(CUISINE_VOLUME_TRANSDUCER_TIMER);
             if(CUISINE_VOL_POT_CCW_PIN == CUISINE_VOL_POT_CW_PIN)
             {
+                AudioConsoleVolumeDown(AUDIO_CONSOLE_CUISINE_ZONE);
                 mCuisineVolume += (-1 * VOLUME_TRANSDUCER_INCREMENT);
              //   mBureauChange = 0;
                 
@@ -109,6 +113,7 @@ int VolumeTransducerTick()
             }
             else
             {
+                AudioConsoleVolumeUp(AUDIO_CONSOLE_CUISINE_ZONE);
                 mCuisineVolume += (VOLUME_TRANSDUCER_INCREMENT);
             //    mBureauChange = 0;
                 

AudioConsole.X/Source/WiFiCtrl.c

@@ -266,7 +266,7 @@ static void socket_cb(SOCKET sock, uint8 u8Msg, void *pvMsg)
 				{
 					if(sock == TerminalSocket)
 					{
-						close(TerminalSocket);
+						shutdown(TerminalSocket);
 						TerminalSocket = -1;
 						//                        SendSyslogData("Terminal client disconnected\n",strlen("Terminal client disconnected\n"));
 						printf("Terminal client disconnected\n");
@@ -274,26 +274,26 @@ static void socket_cb(SOCKET sock, uint8 u8Msg, void *pvMsg)
 					}
 					else if(sock == SyslogSocket)
 					{
-						close(SyslogSocket);
+						shutdown(SyslogSocket);
 						SyslogSocket = -1;
 						m2m_periph_gpio_set_val(M2M_PERIPH_GPIO4,0);
 					}
 					else if(sock == NetworkSocket)
 					{
-						close(NetworkSocket);
+						shutdown(NetworkSocket);
 						NetworkSocket = -1;
 						printf("Network client disconnected\n");
 					}
 					else if(sock == BootloaderSocket)
 					{
-						close(BootloaderSocket);
+						shutdown(BootloaderSocket);
 						BootloaderSocket = -1;
 						printf("Bootloader client disconnected\n");
 						BootloaderDeactivateBootloader();
 					}
                     else if(sock == AudioConsoleIFSocket)
                     {
-                        close(AudioConsoleIFSocket);
+                        shutdown(AudioConsoleIFSocket);
                         AudioConsoleIFSocket = -1;
                         printf("Audio Console Interface with Master Ctrl disconnected\n");
                     }
@@ -635,30 +635,30 @@ int TurnOFFWiFi()
 int CloseSockets()
 {
     gbTcpConnection = false;
-    close(TerminalServerSocket);
+    shutdown(TerminalServerSocket);
     if(TerminalSocket != -1)
     {
-        close(TerminalSocket);
+        shutdown(TerminalSocket);
     }
     
-    close(NetworkServerSocket);
+    shutdown(NetworkServerSocket);
     if(NetworkSocket != -1)
     {
-        close(NetworkSocket);
+        shutdown(NetworkSocket);
     }
     
 #ifdef USE_SYSLOG
-    close(SyslogServerSocket);
+    shutdown(SyslogServerSocket);
     if(SyslogSocket != -1)
     {
-        close(SyslogSocket);
+        shutdown(SyslogSocket);
     }
 #endif
 	
-	close(BootloaderServerSocket);
+	shutdown(BootloaderServerSocket);
 	if(BootloaderSocket != -1)
 	{
-		close(BootloaderSocket);
+		shutdown(BootloaderSocket);
 	}
 }
 
@@ -865,11 +865,11 @@ int OpenBootloaderServer()
 }
 int CloseBootloaderServer()
 {
-	close(BootloaderServerSocket);
+	shutdown(BootloaderServerSocket);
 	BootloaderServerSocket = -1;
 	if(BootloaderSocket != -1)
 	{
-		close(BootloaderSocket);
+		shutdown(BootloaderSocket);
 		BootloaderSocket = -1;
 	}
 }
@@ -928,7 +928,7 @@ int ConnectAudioInterface()
 }
 int DisconnectAudioInterface()
 {
-    close(AudioConsoleIFSocket);
+    shutdown(AudioConsoleIFSocket);
 	AudioConsoleIFSocket = -1;
     
     return 1;

AudioConsole.X/Source/main.c

@@ -49,6 +49,9 @@
 #include "VolumeTransducer.h"
 #include "DACInterface.h"
 #include "AudioConsole.h"
+#include "VUMeter.h"
+#include "PushBtnMgr.h"
+#include "AudioConsoleLedMgr.h"
 
 #include "hd44780.h"
 
@@ -121,6 +124,10 @@ int main(void)
     VolumeTransducerInit();
     DACInit();
     AudioConsoleInit();
+    VUMeterInit();
+    PushBtnMgrInit();
+    AudioConsoleLedMgrInit();
+    
     
 #ifdef USE_SYSLOG
 	InitSyslog();
@@ -205,8 +212,6 @@ int main(void)
     
     int DACTest = 0;
     int Increment = 10;
-    VU1_BACKLIGHT_PIN = LED_ON;
-    VU2_BACKLIGHT_PIN = LED_ON;
 	
 	while(mRetCode == 1)
 	{
@@ -226,6 +231,8 @@ int main(void)
         
         VolumeTransducerTick();
         AudioConsoleTick();
+        PushButtonMgrTick();
+        AudioConsoleLedMgrTick();
         //		TickLoraWatchdog();
         //		TickLCDCtrl();
         //        TickLTEModule();
@@ -234,26 +241,15 @@ int main(void)
         if(IsTimerExpired(HEARTBEAT_LED_TMR))
         {
             HEARTBEAT_LED_2_PIN = ~HEARTBEAT_LED_2_PIN;
-//            
-//            ONBOARD_LED2_PIN = ~HEARTBEAT_LED_2_PIN;
-//            ONBOARD_LED3_PIN = ~HEARTBEAT_LED_2_PIN;
-//            ONBOARD_LED7_PIN = ~HEARTBEAT_LED_2_PIN;
-            PUSH_BUTTON_LED1_PIN = !PUSH_BUTTON_INPUT1_PIN;
-            PUSH_BUTTON_LED2_PIN = !PUSH_BUTTON_INPUT2_PIN;
-            PUSH_BUTTON_LED3_PIN = !PUSH_BUTTON_INPUT3_PIN;
-            PUSH_BUTTON_LED4_PIN = !PUSH_BUTTON_INPUT4_PIN;
-            PUSH_BUTTON_LED5_PIN = !PUSH_BUTTON_INPUT5_PIN;
-            PUSH_BUTTON_LED6_PIN = !PUSH_BUTTON_INPUT6_PIN;
-            PUSH_BUTTON_LED7_PIN = !PUSH_BUTTON_INPUT7_PIN;
 
             
-            DACSetValue(BUREAU_DAC_CHANNEL,DACTest);
+//            DACSetValue(BUREAU_DAC_CHANNEL,DACTest);
-            DACSetValue(CUISINE_DAC_CHANNEL,DACTest);
+//            DACSetValue(CUISINE_DAC_CHANNEL,DACTest);
-            DACTest += Increment;
+//            DACTest += Increment;
-            if(DACTest > 1013)
+//            if(DACTest > 1013)
-                Increment = -10;
+//                Increment = -10;
-            if(DACTest <= 10)
+//            if(DACTest <= 10)
-                Increment = 10;
+//                Increment = 10;
 
             
             

AudioConsole.X/Source/timer.h

@@ -48,6 +48,8 @@ typedef enum
     BUREAU_VOLUME_TRANSDUCER_TIMER,
     CUISINE_VOLUME_TRANSDUCER_TIMER,
     CONSOLE_IF_CONNECT_TIMER,
+    PUSHBTN_DEBOUNCE_TIMER,
+    LED_EFFECT_TIMER,
 	TIMER_MAX_ID
 }eTimerID;
 

AudioConsole.X/build/ChaletDuinoV2_795F512H_/production/Source/VolumeTransducer.o.d

@@ -1,7 +1,16 @@
 build/ChaletDuinoV2_795F512H_/production/Source/VolumeTransducer.o: \
  Source/VolumeTransducer.c Source/VolumeTransducer.h Source/define.h \
  Source/BoardCfg.h Source/BoardCfg_ChaletduinoV2.h Source/timer.h \
- Source/Syslog.h
+ Source/Syslog.h Source/AudioConsole.h Source/AudioConsoleInterface.h \
+ Source/WiFiCtrl.h Source/winc3400_142/driver/include/m2m_wifi.h \
+ Source/winc3400_142/common/include/nm_common.h Source/define.h \
+ Source/winc3400_142/bsp/include/nm_bsp.h \
+ Source/winc3400_142/common/include/nm_debug.h \
+ Source/winc3400_142/driver/include/m2m_types.h \
+ Source/winc3400_142/driver/include/nmdrv.h \
+ Source/winc3400_142/socket/include/socket.h \
+ Source/winc3400_142/driver/include/m2m_types.h \
+ Source/winc3400_142/socket/include/netinet_in.h
 
 Source/VolumeTransducer.h:
 
@@ -14,3 +23,29 @@ Source/BoardCfg_ChaletduinoV2.h:
 Source/timer.h:
 
 Source/Syslog.h:
+
+Source/AudioConsole.h:
+
+Source/AudioConsoleInterface.h:
+
+Source/WiFiCtrl.h:
+
+Source/winc3400_142/driver/include/m2m_wifi.h:
+
+Source/winc3400_142/common/include/nm_common.h:
+
+Source/define.h:
+
+Source/winc3400_142/bsp/include/nm_bsp.h:
+
+Source/winc3400_142/common/include/nm_debug.h:
+
+Source/winc3400_142/driver/include/m2m_types.h:
+
+Source/winc3400_142/driver/include/nmdrv.h:
+
+Source/winc3400_142/socket/include/socket.h:
+
+Source/winc3400_142/driver/include/m2m_types.h:
+
+Source/winc3400_142/socket/include/netinet_in.h:

AudioConsole.X/nbproject/Makefile-ChaletDuinoV2_795F512H_.mk

@@ -51,17 +51,17 @@ OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE}
 DISTDIR=dist/${CND_CONF}/${IMAGE_TYPE}
 
 # Source Files Quoted if spaced
-SOURCEFILES_QUOTED_IF_SPACED=Source/ChaletduinoV2Board.c Source/winc3400_142/common/source/nm_common.c Source/winc3400_142/driver/source/m2m_flash.c Source/winc3400_142/driver/source/m2m_hif.c Source/winc3400_142/driver/source/m2m_ota.c Source/winc3400_142/driver/source/m2m_periph.c Source/winc3400_142/driver/source/m2m_ssl.c Source/winc3400_142/driver/source/m2m_wifi.c Source/winc3400_142/driver/source/nmasic.c Source/winc3400_142/driver/source/nmbus.c Source/winc3400_142/driver/source/nmdrv.c Source/winc3400_142/driver/source/nmspi.c Source/winc3400_142/socket/source/inet_addr.c Source/winc3400_142/socket/source/inet_ntop.c Source/winc3400_142/socket/source/socket.c Source/winc3400_142/spi_flash/source/spi_flash.c Source/DigitalIO.c Source/NetworkProtocol.c Source/Terminal.c Source/Util.c Source/exceptions.c Source/interrupts.c Source/main.c Source/system.c Source/template.c Source/timer.c Source/WiFiCtrl.c Source/SPI.c Source/SPI_Flash.c Source/Syslog.c Source/Watchdog.c Source/BootloaderInterface.c Source/BootloaderProtocol.c Source/crc32.c Source/VolumeTransducer.c Source/DACInterface.c Source/AudioConsoleInterface.c Source/AudioConsole.c
+SOURCEFILES_QUOTED_IF_SPACED=Source/ChaletduinoV2Board.c Source/winc3400_142/common/source/nm_common.c Source/winc3400_142/driver/source/m2m_flash.c Source/winc3400_142/driver/source/m2m_hif.c Source/winc3400_142/driver/source/m2m_ota.c Source/winc3400_142/driver/source/m2m_periph.c Source/winc3400_142/driver/source/m2m_ssl.c Source/winc3400_142/driver/source/m2m_wifi.c Source/winc3400_142/driver/source/nmasic.c Source/winc3400_142/driver/source/nmbus.c Source/winc3400_142/driver/source/nmdrv.c Source/winc3400_142/driver/source/nmspi.c Source/winc3400_142/socket/source/inet_addr.c Source/winc3400_142/socket/source/inet_ntop.c Source/winc3400_142/socket/source/socket.c Source/winc3400_142/spi_flash/source/spi_flash.c Source/DigitalIO.c Source/NetworkProtocol.c Source/Terminal.c Source/Util.c Source/exceptions.c Source/interrupts.c Source/main.c Source/system.c Source/template.c Source/timer.c Source/WiFiCtrl.c Source/SPI.c Source/SPI_Flash.c Source/Syslog.c Source/Watchdog.c Source/BootloaderInterface.c Source/BootloaderProtocol.c Source/crc32.c Source/VolumeTransducer.c Source/DACInterface.c Source/AudioConsoleInterface.c Source/AudioConsole.c Source/VUMeter.c Source/PushBtnMgr.c Source/AudioConsoleLedMgr.c
 
 # Object Files Quoted if spaced
-OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/Source/ChaletduinoV2Board.o ${OBJECTDIR}/Source/winc3400_142/common/source/nm_common.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_flash.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_hif.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ota.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_periph.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ssl.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_wifi.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmasic.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmbus.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmdrv.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmspi.o ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_addr.o ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_ntop.o ${OBJECTDIR}/Source/winc3400_142/socket/source/socket.o ${OBJECTDIR}/Source/winc3400_142/spi_flash/source/spi_flash.o ${OBJECTDIR}/Source/DigitalIO.o ${OBJECTDIR}/Source/NetworkProtocol.o ${OBJECTDIR}/Source/Terminal.o ${OBJECTDIR}/Source/Util.o ${OBJECTDIR}/Source/exceptions.o ${OBJECTDIR}/Source/interrupts.o ${OBJECTDIR}/Source/main.o ${OBJECTDIR}/Source/system.o ${OBJECTDIR}/Source/template.o ${OBJECTDIR}/Source/timer.o ${OBJECTDIR}/Source/WiFiCtrl.o ${OBJECTDIR}/Source/SPI.o ${OBJECTDIR}/Source/SPI_Flash.o ${OBJECTDIR}/Source/Syslog.o ${OBJECTDIR}/Source/Watchdog.o ${OBJECTDIR}/Source/BootloaderInterface.o ${OBJECTDIR}/Source/BootloaderProtocol.o ${OBJECTDIR}/Source/crc32.o ${OBJECTDIR}/Source/VolumeTransducer.o ${OBJECTDIR}/Source/DACInterface.o ${OBJECTDIR}/Source/AudioConsoleInterface.o ${OBJECTDIR}/Source/AudioConsole.o
+OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/Source/ChaletduinoV2Board.o ${OBJECTDIR}/Source/winc3400_142/common/source/nm_common.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_flash.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_hif.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ota.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_periph.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ssl.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_wifi.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmasic.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmbus.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmdrv.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmspi.o ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_addr.o ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_ntop.o ${OBJECTDIR}/Source/winc3400_142/socket/source/socket.o ${OBJECTDIR}/Source/winc3400_142/spi_flash/source/spi_flash.o ${OBJECTDIR}/Source/DigitalIO.o ${OBJECTDIR}/Source/NetworkProtocol.o ${OBJECTDIR}/Source/Terminal.o ${OBJECTDIR}/Source/Util.o ${OBJECTDIR}/Source/exceptions.o ${OBJECTDIR}/Source/interrupts.o ${OBJECTDIR}/Source/main.o ${OBJECTDIR}/Source/system.o ${OBJECTDIR}/Source/template.o ${OBJECTDIR}/Source/timer.o ${OBJECTDIR}/Source/WiFiCtrl.o ${OBJECTDIR}/Source/SPI.o ${OBJECTDIR}/Source/SPI_Flash.o ${OBJECTDIR}/Source/Syslog.o ${OBJECTDIR}/Source/Watchdog.o ${OBJECTDIR}/Source/BootloaderInterface.o ${OBJECTDIR}/Source/BootloaderProtocol.o ${OBJECTDIR}/Source/crc32.o ${OBJECTDIR}/Source/VolumeTransducer.o ${OBJECTDIR}/Source/DACInterface.o ${OBJECTDIR}/Source/AudioConsoleInterface.o ${OBJECTDIR}/Source/AudioConsole.o ${OBJECTDIR}/Source/VUMeter.o ${OBJECTDIR}/Source/PushBtnMgr.o ${OBJECTDIR}/Source/AudioConsoleLedMgr.o
-POSSIBLE_DEPFILES=${OBJECTDIR}/Source/ChaletduinoV2Board.o.d ${OBJECTDIR}/Source/winc3400_142/common/source/nm_common.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_flash.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_hif.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ota.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_periph.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ssl.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_wifi.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/nmasic.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/nmbus.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/nmdrv.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/nmspi.o.d ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_addr.o.d ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_ntop.o.d ${OBJECTDIR}/Source/winc3400_142/socket/source/socket.o.d ${OBJECTDIR}/Source/winc3400_142/spi_flash/source/spi_flash.o.d ${OBJECTDIR}/Source/DigitalIO.o.d ${OBJECTDIR}/Source/NetworkProtocol.o.d ${OBJECTDIR}/Source/Terminal.o.d ${OBJECTDIR}/Source/Util.o.d ${OBJECTDIR}/Source/exceptions.o.d ${OBJECTDIR}/Source/interrupts.o.d ${OBJECTDIR}/Source/main.o.d ${OBJECTDIR}/Source/system.o.d ${OBJECTDIR}/Source/template.o.d ${OBJECTDIR}/Source/timer.o.d ${OBJECTDIR}/Source/WiFiCtrl.o.d ${OBJECTDIR}/Source/SPI.o.d ${OBJECTDIR}/Source/SPI_Flash.o.d ${OBJECTDIR}/Source/Syslog.o.d ${OBJECTDIR}/Source/Watchdog.o.d ${OBJECTDIR}/Source/BootloaderInterface.o.d ${OBJECTDIR}/Source/BootloaderProtocol.o.d ${OBJECTDIR}/Source/crc32.o.d ${OBJECTDIR}/Source/VolumeTransducer.o.d ${OBJECTDIR}/Source/DACInterface.o.d ${OBJECTDIR}/Source/AudioConsoleInterface.o.d ${OBJECTDIR}/Source/AudioConsole.o.d
+POSSIBLE_DEPFILES=${OBJECTDIR}/Source/ChaletduinoV2Board.o.d ${OBJECTDIR}/Source/winc3400_142/common/source/nm_common.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_flash.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_hif.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ota.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_periph.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ssl.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_wifi.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/nmasic.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/nmbus.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/nmdrv.o.d ${OBJECTDIR}/Source/winc3400_142/driver/source/nmspi.o.d ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_addr.o.d ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_ntop.o.d ${OBJECTDIR}/Source/winc3400_142/socket/source/socket.o.d ${OBJECTDIR}/Source/winc3400_142/spi_flash/source/spi_flash.o.d ${OBJECTDIR}/Source/DigitalIO.o.d ${OBJECTDIR}/Source/NetworkProtocol.o.d ${OBJECTDIR}/Source/Terminal.o.d ${OBJECTDIR}/Source/Util.o.d ${OBJECTDIR}/Source/exceptions.o.d ${OBJECTDIR}/Source/interrupts.o.d ${OBJECTDIR}/Source/main.o.d ${OBJECTDIR}/Source/system.o.d ${OBJECTDIR}/Source/template.o.d ${OBJECTDIR}/Source/timer.o.d ${OBJECTDIR}/Source/WiFiCtrl.o.d ${OBJECTDIR}/Source/SPI.o.d ${OBJECTDIR}/Source/SPI_Flash.o.d ${OBJECTDIR}/Source/Syslog.o.d ${OBJECTDIR}/Source/Watchdog.o.d ${OBJECTDIR}/Source/BootloaderInterface.o.d ${OBJECTDIR}/Source/BootloaderProtocol.o.d ${OBJECTDIR}/Source/crc32.o.d ${OBJECTDIR}/Source/VolumeTransducer.o.d ${OBJECTDIR}/Source/DACInterface.o.d ${OBJECTDIR}/Source/AudioConsoleInterface.o.d ${OBJECTDIR}/Source/AudioConsole.o.d ${OBJECTDIR}/Source/VUMeter.o.d ${OBJECTDIR}/Source/PushBtnMgr.o.d ${OBJECTDIR}/Source/AudioConsoleLedMgr.o.d
 
 # Object Files
-OBJECTFILES=${OBJECTDIR}/Source/ChaletduinoV2Board.o ${OBJECTDIR}/Source/winc3400_142/common/source/nm_common.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_flash.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_hif.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ota.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_periph.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ssl.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_wifi.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmasic.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmbus.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmdrv.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmspi.o ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_addr.o ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_ntop.o ${OBJECTDIR}/Source/winc3400_142/socket/source/socket.o ${OBJECTDIR}/Source/winc3400_142/spi_flash/source/spi_flash.o ${OBJECTDIR}/Source/DigitalIO.o ${OBJECTDIR}/Source/NetworkProtocol.o ${OBJECTDIR}/Source/Terminal.o ${OBJECTDIR}/Source/Util.o ${OBJECTDIR}/Source/exceptions.o ${OBJECTDIR}/Source/interrupts.o ${OBJECTDIR}/Source/main.o ${OBJECTDIR}/Source/system.o ${OBJECTDIR}/Source/template.o ${OBJECTDIR}/Source/timer.o ${OBJECTDIR}/Source/WiFiCtrl.o ${OBJECTDIR}/Source/SPI.o ${OBJECTDIR}/Source/SPI_Flash.o ${OBJECTDIR}/Source/Syslog.o ${OBJECTDIR}/Source/Watchdog.o ${OBJECTDIR}/Source/BootloaderInterface.o ${OBJECTDIR}/Source/BootloaderProtocol.o ${OBJECTDIR}/Source/crc32.o ${OBJECTDIR}/Source/VolumeTransducer.o ${OBJECTDIR}/Source/DACInterface.o ${OBJECTDIR}/Source/AudioConsoleInterface.o ${OBJECTDIR}/Source/AudioConsole.o
+OBJECTFILES=${OBJECTDIR}/Source/ChaletduinoV2Board.o ${OBJECTDIR}/Source/winc3400_142/common/source/nm_common.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_flash.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_hif.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ota.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_periph.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_ssl.o ${OBJECTDIR}/Source/winc3400_142/driver/source/m2m_wifi.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmasic.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmbus.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmdrv.o ${OBJECTDIR}/Source/winc3400_142/driver/source/nmspi.o ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_addr.o ${OBJECTDIR}/Source/winc3400_142/socket/source/inet_ntop.o ${OBJECTDIR}/Source/winc3400_142/socket/source/socket.o ${OBJECTDIR}/Source/winc3400_142/spi_flash/source/spi_flash.o ${OBJECTDIR}/Source/DigitalIO.o ${OBJECTDIR}/Source/NetworkProtocol.o ${OBJECTDIR}/Source/Terminal.o ${OBJECTDIR}/Source/Util.o ${OBJECTDIR}/Source/exceptions.o ${OBJECTDIR}/Source/interrupts.o ${OBJECTDIR}/Source/main.o ${OBJECTDIR}/Source/system.o ${OBJECTDIR}/Source/template.o ${OBJECTDIR}/Source/timer.o ${OBJECTDIR}/Source/WiFiCtrl.o ${OBJECTDIR}/Source/SPI.o ${OBJECTDIR}/Source/SPI_Flash.o ${OBJECTDIR}/Source/Syslog.o ${OBJECTDIR}/Source/Watchdog.o ${OBJECTDIR}/Source/BootloaderInterface.o ${OBJECTDIR}/Source/BootloaderProtocol.o ${OBJECTDIR}/Source/crc32.o ${OBJECTDIR}/Source/VolumeTransducer.o ${OBJECTDIR}/Source/DACInterface.o ${OBJECTDIR}/Source/AudioConsoleInterface.o ${OBJECTDIR}/Source/AudioConsole.o ${OBJECTDIR}/Source/VUMeter.o ${OBJECTDIR}/Source/PushBtnMgr.o ${OBJECTDIR}/Source/AudioConsoleLedMgr.o
 
 # Source Files
-SOURCEFILES=Source/ChaletduinoV2Board.c Source/winc3400_142/common/source/nm_common.c Source/winc3400_142/driver/source/m2m_flash.c Source/winc3400_142/driver/source/m2m_hif.c Source/winc3400_142/driver/source/m2m_ota.c Source/winc3400_142/driver/source/m2m_periph.c Source/winc3400_142/driver/source/m2m_ssl.c Source/winc3400_142/driver/source/m2m_wifi.c Source/winc3400_142/driver/source/nmasic.c Source/winc3400_142/driver/source/nmbus.c Source/winc3400_142/driver/source/nmdrv.c Source/winc3400_142/driver/source/nmspi.c Source/winc3400_142/socket/source/inet_addr.c Source/winc3400_142/socket/source/inet_ntop.c Source/winc3400_142/socket/source/socket.c Source/winc3400_142/spi_flash/source/spi_flash.c Source/DigitalIO.c Source/NetworkProtocol.c Source/Terminal.c Source/Util.c Source/exceptions.c Source/interrupts.c Source/main.c Source/system.c Source/template.c Source/timer.c Source/WiFiCtrl.c Source/SPI.c Source/SPI_Flash.c Source/Syslog.c Source/Watchdog.c Source/BootloaderInterface.c Source/BootloaderProtocol.c Source/crc32.c Source/VolumeTransducer.c Source/DACInterface.c Source/AudioConsoleInterface.c Source/AudioConsole.c
+SOURCEFILES=Source/ChaletduinoV2Board.c Source/winc3400_142/common/source/nm_common.c Source/winc3400_142/driver/source/m2m_flash.c Source/winc3400_142/driver/source/m2m_hif.c Source/winc3400_142/driver/source/m2m_ota.c Source/winc3400_142/driver/source/m2m_periph.c Source/winc3400_142/driver/source/m2m_ssl.c Source/winc3400_142/driver/source/m2m_wifi.c Source/winc3400_142/driver/source/nmasic.c Source/winc3400_142/driver/source/nmbus.c Source/winc3400_142/driver/source/nmdrv.c Source/winc3400_142/driver/source/nmspi.c Source/winc3400_142/socket/source/inet_addr.c Source/winc3400_142/socket/source/inet_ntop.c Source/winc3400_142/socket/source/socket.c Source/winc3400_142/spi_flash/source/spi_flash.c Source/DigitalIO.c Source/NetworkProtocol.c Source/Terminal.c Source/Util.c Source/exceptions.c Source/interrupts.c Source/main.c Source/system.c Source/template.c Source/timer.c Source/WiFiCtrl.c Source/SPI.c Source/SPI_Flash.c Source/Syslog.c Source/Watchdog.c Source/BootloaderInterface.c Source/BootloaderProtocol.c Source/crc32.c Source/VolumeTransducer.c Source/DACInterface.c Source/AudioConsoleInterface.c Source/AudioConsole.c Source/VUMeter.c Source/PushBtnMgr.c Source/AudioConsoleLedMgr.c
 
 
 
@@ -329,6 +329,24 @@ ${OBJECTDIR}/Source/AudioConsole.o: Source/AudioConsole.c  .generated_files/flag
 	@${RM} ${OBJECTDIR}/Source/AudioConsole.o 
 	${MP_CC}  $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1  -fframe-base-loclist  -x c -c -mprocessor=$(MP_PROCESSOR_OPTION)  -I"Source" -I"Source/winc3400_142" -I"Source/winc3400_142/bsp/include" -I"Source/winc3400_142/common/include" -I"Source/winc3400_142/driver/include" -I"Source/winc3400_142/socket/include" -I"Source/winc3400_142/spi_flash/include" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MP -MMD -MF "${OBJECTDIR}/Source/AudioConsole.o.d" -o ${OBJECTDIR}/Source/AudioConsole.o Source/AudioConsole.c    -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF)    $(COMPARISON_BUILD)    
 	
+${OBJECTDIR}/Source/VUMeter.o: Source/VUMeter.c  .generated_files/flags/ChaletDuinoV2_795F512H_/ae45fbc352f4a523163ffe940306f2f6c1889457 .generated_files/flags/ChaletDuinoV2_795F512H_/da39a3ee5e6b4b0d3255bfef95601890afd80709
+	@${MKDIR} "${OBJECTDIR}/Source" 
+	@${RM} ${OBJECTDIR}/Source/VUMeter.o.d 
+	@${RM} ${OBJECTDIR}/Source/VUMeter.o 
+	${MP_CC}  $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1  -fframe-base-loclist  -x c -c -mprocessor=$(MP_PROCESSOR_OPTION)  -I"Source" -I"Source/winc3400_142" -I"Source/winc3400_142/bsp/include" -I"Source/winc3400_142/common/include" -I"Source/winc3400_142/driver/include" -I"Source/winc3400_142/socket/include" -I"Source/winc3400_142/spi_flash/include" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MP -MMD -MF "${OBJECTDIR}/Source/VUMeter.o.d" -o ${OBJECTDIR}/Source/VUMeter.o Source/VUMeter.c    -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF)    $(COMPARISON_BUILD)    
+	
+${OBJECTDIR}/Source/PushBtnMgr.o: Source/PushBtnMgr.c  .generated_files/flags/ChaletDuinoV2_795F512H_/3417c0d7b139cee766090bb98b571141e376837f .generated_files/flags/ChaletDuinoV2_795F512H_/da39a3ee5e6b4b0d3255bfef95601890afd80709
+	@${MKDIR} "${OBJECTDIR}/Source" 
+	@${RM} ${OBJECTDIR}/Source/PushBtnMgr.o.d 
+	@${RM} ${OBJECTDIR}/Source/PushBtnMgr.o 
+	${MP_CC}  $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1  -fframe-base-loclist  -x c -c -mprocessor=$(MP_PROCESSOR_OPTION)  -I"Source" -I"Source/winc3400_142" -I"Source/winc3400_142/bsp/include" -I"Source/winc3400_142/common/include" -I"Source/winc3400_142/driver/include" -I"Source/winc3400_142/socket/include" -I"Source/winc3400_142/spi_flash/include" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MP -MMD -MF "${OBJECTDIR}/Source/PushBtnMgr.o.d" -o ${OBJECTDIR}/Source/PushBtnMgr.o Source/PushBtnMgr.c    -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF)    $(COMPARISON_BUILD)    
+	
+${OBJECTDIR}/Source/AudioConsoleLedMgr.o: Source/AudioConsoleLedMgr.c  .generated_files/flags/ChaletDuinoV2_795F512H_/cb0297502596b12b95484182b1f4df73ddb1df17 .generated_files/flags/ChaletDuinoV2_795F512H_/da39a3ee5e6b4b0d3255bfef95601890afd80709
+	@${MKDIR} "${OBJECTDIR}/Source" 
+	@${RM} ${OBJECTDIR}/Source/AudioConsoleLedMgr.o.d 
+	@${RM} ${OBJECTDIR}/Source/AudioConsoleLedMgr.o 
+	${MP_CC}  $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1  -fframe-base-loclist  -x c -c -mprocessor=$(MP_PROCESSOR_OPTION)  -I"Source" -I"Source/winc3400_142" -I"Source/winc3400_142/bsp/include" -I"Source/winc3400_142/common/include" -I"Source/winc3400_142/driver/include" -I"Source/winc3400_142/socket/include" -I"Source/winc3400_142/spi_flash/include" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MP -MMD -MF "${OBJECTDIR}/Source/AudioConsoleLedMgr.o.d" -o ${OBJECTDIR}/Source/AudioConsoleLedMgr.o Source/AudioConsoleLedMgr.c    -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF)    $(COMPARISON_BUILD)    
+	
 else
 ${OBJECTDIR}/Source/ChaletduinoV2Board.o: Source/ChaletduinoV2Board.c  .generated_files/flags/ChaletDuinoV2_795F512H_/155eb6acafee7b16d4a84f7fa101fd44ca9797a8 .generated_files/flags/ChaletDuinoV2_795F512H_/da39a3ee5e6b4b0d3255bfef95601890afd80709
 	@${MKDIR} "${OBJECTDIR}/Source" 
@@ -558,6 +576,24 @@ ${OBJECTDIR}/Source/AudioConsole.o: Source/AudioConsole.c  .generated_files/flag
 	@${RM} ${OBJECTDIR}/Source/AudioConsole.o 
 	${MP_CC}  $(MP_EXTRA_CC_PRE)  -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION)  -I"Source" -I"Source/winc3400_142" -I"Source/winc3400_142/bsp/include" -I"Source/winc3400_142/common/include" -I"Source/winc3400_142/driver/include" -I"Source/winc3400_142/socket/include" -I"Source/winc3400_142/spi_flash/include" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MP -MMD -MF "${OBJECTDIR}/Source/AudioConsole.o.d" -o ${OBJECTDIR}/Source/AudioConsole.o Source/AudioConsole.c    -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF)    $(COMPARISON_BUILD)    
 	
+${OBJECTDIR}/Source/VUMeter.o: Source/VUMeter.c  .generated_files/flags/ChaletDuinoV2_795F512H_/46c34f2940aee3e5f76f893cc536b4dfa86e3fc6 .generated_files/flags/ChaletDuinoV2_795F512H_/da39a3ee5e6b4b0d3255bfef95601890afd80709
+	@${MKDIR} "${OBJECTDIR}/Source" 
+	@${RM} ${OBJECTDIR}/Source/VUMeter.o.d 
+	@${RM} ${OBJECTDIR}/Source/VUMeter.o 
+	${MP_CC}  $(MP_EXTRA_CC_PRE)  -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION)  -I"Source" -I"Source/winc3400_142" -I"Source/winc3400_142/bsp/include" -I"Source/winc3400_142/common/include" -I"Source/winc3400_142/driver/include" -I"Source/winc3400_142/socket/include" -I"Source/winc3400_142/spi_flash/include" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MP -MMD -MF "${OBJECTDIR}/Source/VUMeter.o.d" -o ${OBJECTDIR}/Source/VUMeter.o Source/VUMeter.c    -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF)    $(COMPARISON_BUILD)    
+	
+${OBJECTDIR}/Source/PushBtnMgr.o: Source/PushBtnMgr.c  .generated_files/flags/ChaletDuinoV2_795F512H_/2d1545d080ffb89f19b452b07b0795945cf8f16 .generated_files/flags/ChaletDuinoV2_795F512H_/da39a3ee5e6b4b0d3255bfef95601890afd80709
+	@${MKDIR} "${OBJECTDIR}/Source" 
+	@${RM} ${OBJECTDIR}/Source/PushBtnMgr.o.d 
+	@${RM} ${OBJECTDIR}/Source/PushBtnMgr.o 
+	${MP_CC}  $(MP_EXTRA_CC_PRE)  -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION)  -I"Source" -I"Source/winc3400_142" -I"Source/winc3400_142/bsp/include" -I"Source/winc3400_142/common/include" -I"Source/winc3400_142/driver/include" -I"Source/winc3400_142/socket/include" -I"Source/winc3400_142/spi_flash/include" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MP -MMD -MF "${OBJECTDIR}/Source/PushBtnMgr.o.d" -o ${OBJECTDIR}/Source/PushBtnMgr.o Source/PushBtnMgr.c    -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF)    $(COMPARISON_BUILD)    
+	
+${OBJECTDIR}/Source/AudioConsoleLedMgr.o: Source/AudioConsoleLedMgr.c  .generated_files/flags/ChaletDuinoV2_795F512H_/f372180a695e3155c0497dafd9c80c78b889843d .generated_files/flags/ChaletDuinoV2_795F512H_/da39a3ee5e6b4b0d3255bfef95601890afd80709
+	@${MKDIR} "${OBJECTDIR}/Source" 
+	@${RM} ${OBJECTDIR}/Source/AudioConsoleLedMgr.o.d 
+	@${RM} ${OBJECTDIR}/Source/AudioConsoleLedMgr.o 
+	${MP_CC}  $(MP_EXTRA_CC_PRE)  -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION)  -I"Source" -I"Source/winc3400_142" -I"Source/winc3400_142/bsp/include" -I"Source/winc3400_142/common/include" -I"Source/winc3400_142/driver/include" -I"Source/winc3400_142/socket/include" -I"Source/winc3400_142/spi_flash/include" -DCHALETDUINO_V2_BRD -D_SUPPRESS_PLIB_WARNING -MP -MMD -MF "${OBJECTDIR}/Source/AudioConsoleLedMgr.o.d" -o ${OBJECTDIR}/Source/AudioConsoleLedMgr.o Source/AudioConsoleLedMgr.c    -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF)    $(COMPARISON_BUILD)    
+	
 endif
 
 # ------------------------------------------------------------------------------------

AudioConsole.X/nbproject/Makefile-genesis.properties

@@ -1,5 +1,5 @@
 #
-#Thu Feb 20 14:31:12 EST 2025
+#Sun Feb 23 15:26:50 EST 2025
 ChaletDuinoV2_795F512H_.languagetoolchain.dir=C\:\\Program Files\\Microchip\\xc32\\v1.33\\bin
 default.languagetoolchain.dir=C\:\\Program Files\\Microchip\\xc32\\v1.33\\bin
 proj.dir=D\:\\Main\\PicDev\\Projets\\AudioConsole\\AudioConsole.X
@@ -7,7 +7,7 @@ com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=bcd6e5453a11ce86a
 ChaletDuinoV2_795F512H_.com-microchip-mplab-mdbcore-ICD3Tool-ICD3DbgToolManager.md5=b8062f7a3afd14c7a6d50c4bb4696d24
 default.com-microchip-mplab-nbide-toolchain-xc32-XC32LanguageToolchain.md5=de2d3bc95a22a3f432c2e39f49efafbc
 default.com-microchip-mplab-mdbcore-ICD3Tool-ICD3DbgToolManager.md5=b8062f7a3afd14c7a6d50c4bb4696d24
-configurations-xml=58bdd0b3cfc03fcca4bffa03d58afb56
+configurations-xml=01a2537787b2a3a40ef1a4f0ec5e82f1
 ChaletDuino_775F512H_.com-microchip-mplab-nbide-toolchain-xc32-XC32LanguageToolchain.md5=de2d3bc95a22a3f432c2e39f49efafbc
 host.platform=windows
 ChaletDuinoV2_795F512H_.com-microchip-mplab-nbide-toolchain-xc32-XC32LanguageToolchain.md5=de2d3bc95a22a3f432c2e39f49efafbc

AudioConsole.X/nbproject/configurations.xml

@@ -91,6 +91,9 @@
       <itemPath>Source/DACInterface.h</itemPath>
       <itemPath>Source/AudioConsoleInterface.h</itemPath>
       <itemPath>Source/AudioConsole.h</itemPath>
+      <itemPath>Source/VUMeter.h</itemPath>
+      <itemPath>Source/PushBtnMgr.h</itemPath>
+      <itemPath>Source/AudioConsoleLedMgr.h</itemPath>
     </logicalFolder>
     <logicalFolder name="LinkerScript"
                    displayName="Linker Files"
@@ -180,6 +183,9 @@
       <itemPath>Source/DACInterface.c</itemPath>
       <itemPath>Source/AudioConsoleInterface.c</itemPath>
       <itemPath>Source/AudioConsole.c</itemPath>
+      <itemPath>Source/VUMeter.c</itemPath>
+      <itemPath>Source/PushBtnMgr.c</itemPath>
+      <itemPath>Source/AudioConsoleLedMgr.c</itemPath>
     </logicalFolder>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"

AudioConsole.X/nbproject/private/private.xml

@@ -49,14 +49,18 @@
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
             <file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/WiFiCtrl.c</file>
+            <file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/VolumeTransducer.h</file>
+            <file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/VUMeter.h</file>
+            <file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/AudioConsoleInterface.c</file>
+            <file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/VolumeTransducer.c</file>
+            <file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/ProtocolDefs.h</file>
+            <file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/WiFiCtrl.h</file>
             <file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/AudioConsole.c</file>
             <file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/AudioConsoleInterface.h</file>
             <file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/main.c</file>
             <file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/AudioConsole.h</file>
             <file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/NetworkProtocol.c</file>
-            <file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/AudioConsoleInterface.c</file>
+            <file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/VUMeter.c</file>
-            <file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/winc3400_142/driver/source/nmspi.c</file>
-            <file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/WiFiCtrl.h</file>
         </group>
     </open-files>
 </project-private>