Procházet zdrojové kódy

Changé l'allumage des secteurs

master
jfmartel před 1 měsícem
rodič
revize
74f798fa4c
12 změnil soubory, kde provedl 4478 přidání a 9214 odebrání
  1. +2
    -0
      AudioConsole.X/Source/AudioConsole.c
  2. +31
    -25
      AudioConsole.X/Source/AudioConsoleLedMgr.c
  3. +8
    -8
      AudioConsole.X/Source/AudioConsoleLedMgr.h
  4. +5
    -5
      AudioConsole.X/Source/ChaletduinoV2Board.c
  5. binární
      AudioConsole.X/build/ChaletDuinoV2_795F512H_/production/Source/ChaletduinoV2Board.o
  6. binární
      AudioConsole.X/dist/ChaletDuinoV2_795F512H_/debug/AudioConsole.X.debug.elf
  7. +0
    -4734
      AudioConsole.X/dist/ChaletDuinoV2_795F512H_/debug/AudioConsole.X.debug.map
  8. binární
      AudioConsole.X/dist/ChaletDuinoV2_795F512H_/production/AudioConsole.X.production.elf
  9. +3676
    -3685
      AudioConsole.X/dist/ChaletDuinoV2_795F512H_/production/AudioConsole.X.production.hex
  10. +740
    -740
      AudioConsole.X/dist/ChaletDuinoV2_795F512H_/production/AudioConsole.X.production.map
  11. +1
    -1
      AudioConsole.X/nbproject/Makefile-genesis.properties
  12. +15
    -16
      AudioConsole.X/nbproject/private/private.xml

+ 2
- 0
AudioConsole.X/Source/AudioConsole.c Zobrazit soubor

@@ -23,6 +23,7 @@ int AudioConsoleInit()
mAudioConsoleStatusRetryCount = 0;
mZone2Status.MainVolume = 0;
mMainZoneStatus.MainVolume = 0;
}

int AudioConsoleSetReceiverStatus(AVReceiverStatus_t *MainZone, AVReceiverStatus_t *Zone2)
@@ -70,6 +71,7 @@ int AudioConsoleSM(int Event)
else
{
TimerStart(CONSOLE_IF_CONNECT_TIMER,AUDIO_CONSOLE_WAIT_FOR_WIFI_TIMEOUT);
LedMgrShowOfflineMode(true);
}
}
break;


+ 31
- 25
AudioConsole.X/Source/AudioConsoleLedMgr.c Zobrazit soubor

@@ -102,22 +102,22 @@ int UpdatePushButtonLEDs(AVReceiverStatus_t *MainZoneStatus, AVReceiverStatus_t*
LedMgrSetLED(AUDIO_CONSOLE_SYNC_Z2_LED,false,100,false);
}
if(MainZoneStatus->IsMute == true)
{
LedMgrSetLED(AUDIO_CONSOLE_MAIN_MUTE_LED,true,100,true);
}
else
{
LedMgrSetLED(AUDIO_CONSOLE_MAIN_MUTE_LED,false,100,false);
}
if(Z2Status->IsMute == true)
{
LedMgrSetLED(AUDIO_CONSOLE_Z2_MUTE_LED,true,100,true);
}
else
{
LedMgrSetLED(AUDIO_CONSOLE_Z2_MUTE_LED,false,100,false);
}
// if(MainZoneStatus->IsMute == true)
// {
// LedMgrSetLED(AUDIO_CONSOLE_MAIN_MUTE_LED,true,100,true);
// }
// else
// {
// LedMgrSetLED(AUDIO_CONSOLE_MAIN_MUTE_LED,false,100,false);
// }
// if(Z2Status->IsMute == true)
// {
// LedMgrSetLED(AUDIO_CONSOLE_Z2_MUTE_LED,true,100,true);
// }
// else
// {
// LedMgrSetLED(AUDIO_CONSOLE_Z2_MUTE_LED,false,100,false);
// }
return RET_OK;
}
@@ -165,21 +165,21 @@ int TurnON(int LedID)
case AUDIO_CONSOLE_MAIN_PWR_LED:
{
AUDIO_CONSOLE_MAIN_PWR_STATUS_LED = LED_ON;
break;
break;
}
case AUDIO_CONSOLE_Z2_PWR_LED:
{
AUDIO_CONSOLE_ZONE2_PWR_STATUS_LED = LED_ON;
break;
}
case AUDIO_CONSOLE_MAIN_MUTE_LED:
case AUDIO_CONSOLE_MAIN_VU_BACKLIGHT_LED:
{
AUDIO_CONSOLE_MAIN_MUTE_STATUS_LED = LED_ON;
VU1_BACKLIGHT_PIN = LED_ON;
break;
}
case AUDIO_CONSOLE_Z2_MUTE_LED:
case AUDIO_CONSOLE_Z2_VU_BACKLIGHT_LED:
{
AUDIO_CONSOLE_Z2_MUTE_STATUS_LED = LED_ON;
VU2_BACKLIGHT_PIN = LED_ON;
break;
}
case AUDIO_CONSOLE_PUSHBTN_4_LED:
@@ -224,14 +224,14 @@ int TurnOFF(int LedID)
AUDIO_CONSOLE_ZONE2_PWR_STATUS_LED = LED_OFF;
break;
}
case AUDIO_CONSOLE_MAIN_MUTE_LED:
case AUDIO_CONSOLE_MAIN_VU_BACKLIGHT_LED:
{
AUDIO_CONSOLE_MAIN_MUTE_STATUS_LED = LED_OFF;
VU1_BACKLIGHT_PIN = LED_OFF;
break;
}
case AUDIO_CONSOLE_Z2_MUTE_LED:
case AUDIO_CONSOLE_Z2_VU_BACKLIGHT_LED:
{
AUDIO_CONSOLE_Z2_MUTE_STATUS_LED = LED_OFF;
VU2_BACKLIGHT_PIN = LED_OFF;
break;
}
case AUDIO_CONSOLE_PUSHBTN_4_LED:
@@ -267,4 +267,10 @@ int LedMgrShowOfflineMode(bool Offline)
LedMgrSetLED(i,Offline,100,true);
}
if(Offline == false)
{
TurnON(AUDIO_CONSOLE_MAIN_VU_BACKLIGHT_LED);
TurnON(AUDIO_CONSOLE_Z2_VU_BACKLIGHT_LED);
}
}

+ 8
- 8
AudioConsole.X/Source/AudioConsoleLedMgr.h Zobrazit soubor

@@ -14,19 +14,19 @@

#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_MAIN_PWR_STATUS_LED PUSH_BUTTON_LED1_PIN//VU1_BACKLIGHT_PIN
#define AUDIO_CONSOLE_ZONE2_PWR_STATUS_LED PUSH_BUTTON_LED2_PIN//VU2_BACKLIGHT_PIN
#define AUDIO_CONSOLE_LINK_Z2_STATUS_LED PUSH_BUTTON_LED3_PIN
#define AUDIO_CONSOLE_MAIN_MUTE_STATUS_LED PUSH_BUTTON_LED1_PIN
#define AUDIO_CONSOLE_Z2_MUTE_STATUS_LED PUSH_BUTTON_LED2_PIN
//#define AUDIO_CONSOLE_MAIN_MUTE_STATUS_LED VU1_BACKLIGHT_PIN
//#define AUDIO_CONSOLE_Z2_MUTE_STATUS_LED VU2_BACKLIGHT_PIN

enum eAudioConsoleLED
{
AUDIO_CONSOLE_SYNC_Z2_LED,
AUDIO_CONSOLE_MAIN_PWR_LED, //VU1 backlight
AUDIO_CONSOLE_Z2_PWR_LED, //VU2 backlight
AUDIO_CONSOLE_MAIN_MUTE_LED,
AUDIO_CONSOLE_Z2_MUTE_LED,
AUDIO_CONSOLE_MAIN_PWR_LED,
AUDIO_CONSOLE_Z2_PWR_LED,
AUDIO_CONSOLE_MAIN_VU_BACKLIGHT_LED,
AUDIO_CONSOLE_Z2_VU_BACKLIGHT_LED,
AUDIO_CONSOLE_PUSHBTN_4_LED,
AUDIO_CONSOLE_PUSHBTN_5_LED,
AUDIO_CONSOLE_PUSHBTN_6_LED,


+ 5
- 5
AudioConsole.X/Source/ChaletduinoV2Board.c Zobrazit soubor

@@ -67,14 +67,14 @@ int InitBoard()
//ADC Config
AD1PCFG = 0xFFFF; //Sart with I/O pins configured as digital I/O
AD1PCFGbits.PCFG1 = 0;
AD1PCFGbits.PCFG2 = 0;
// AD1PCFGbits.PCFG1 = 0;
// AD1PCFGbits.PCFG2 = 0;
// TRISBbits.TRISB1 = PIN_INPUT;
//TRISBbits.TRISB2 = PIN_INPUT;
AD1CON1 = 0;
AD1CON2 = 0;
AD1CON3 = 0;
// AD1CON1 = 0;
// AD1CON2 = 0;
// AD1CON3 = 0;
// AD1CHS = 0;
// AD1CHSbits.CH0SA = 1; //AN1


binární
AudioConsole.X/build/ChaletDuinoV2_795F512H_/production/Source/ChaletduinoV2Board.o Zobrazit soubor


binární
AudioConsole.X/dist/ChaletDuinoV2_795F512H_/debug/AudioConsole.X.debug.elf Zobrazit soubor


+ 0
- 4734
AudioConsole.X/dist/ChaletDuinoV2_795F512H_/debug/AudioConsole.X.debug.map
Diff nebyl zobrazen, protože je příliš veliký
Zobrazit soubor


binární
AudioConsole.X/dist/ChaletDuinoV2_795F512H_/production/AudioConsole.X.production.elf Zobrazit soubor


+ 3676
- 3685
AudioConsole.X/dist/ChaletDuinoV2_795F512H_/production/AudioConsole.X.production.hex
Diff nebyl zobrazen, protože je příliš veliký
Zobrazit soubor


+ 740
- 740
AudioConsole.X/dist/ChaletDuinoV2_795F512H_/production/AudioConsole.X.production.map
Diff nebyl zobrazen, protože je příliš veliký
Zobrazit soubor


+ 1
- 1
AudioConsole.X/nbproject/Makefile-genesis.properties Zobrazit soubor

@@ -1,5 +1,5 @@
#
#Sun Mar 09 13:04:23 EDT 2025
#Sun Dec 14 12:36:15 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


+ 15
- 16
AudioConsole.X/nbproject/private/private.xml Zobrazit soubor

@@ -1,19 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="11">
<file>
<url>Source/BootloaderInterface.c</url>
<bookmark id="5">
<name/>
<line>387</line>
<key/>
</bookmark>
<bookmark id="4">
<name/>
<line>437</line>
<key/>
</bookmark>
</file>
<file>
<url>Source/hd44780.c</url>
<bookmark id="7">
@@ -45,15 +32,27 @@
<key/>
</bookmark>
</file>
<file>
<url>Source/BootloaderInterface.c</url>
<bookmark id="5">
<name/>
<line>387</line>
<key/>
</bookmark>
<bookmark id="4">
<name/>
<line>437</line>
<key/>
</bookmark>
</file>
</editor-bookmarks>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group>
<file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/PushBtnMgr.c</file>
<file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/AudioConsoleLedMgr.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/AudioConsole.h</file>
<file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/AudioConsoleLedMgr.c</file>
<file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/main.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/AudioConsoleLedMgr.c</file>
<file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/BoardCfg_ChaletduinoV2.h</file>
<file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/PushBtnMgr.h</file>
<file>file:/D:/Main/PicDev/Projets/AudioConsole/AudioConsole.X/Source/VolumeTransducer.c</file>


Načítá se…
Zrušit
Uložit