jfmartel/ChaletLora
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ajouté délai au LVD pour filtrer les glitchs

Browse Source
This commit is contained in:
jfmartel 2026-07-04 23:44:11 -04:00
parent bbfc4e10e2
commit 24d8155ca2
9 changed files with 3197 additions and 3157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ChaletLora.X/Source/ChaletPowerRelay.c
View File

@ -16,6 +16,7 @@ void InitChaletPowerRelay()
POWER_RELAY_OFF_PIN = PIN_INACTIVE;
PowerRelayState = CHALET_POWER_RELAY_UNKNOWN_STATE;
TimerStop(CHALET_POWER_RELAY_COIL_TIMER);
TimerStop(CHALET_POWER_RELAY_LVD_TIMER);
}
void ChaletPowerRelayTick()
@ -37,7 +38,7 @@ void ChaletPowerRelayTick()
PowerRelayState = CHALET_POWER_RELAY_OFF_STATE;
}
if(IsTimerRunning(CHALET_POWER_RELAY_COIL_TIMER) == true)
if((CHALET_POWER_RELAY_COIL_TIMER) == true)
{
if(IsTimerExpired(CHALET_POWER_RELAY_COIL_TIMER))
{
@ -46,11 +47,35 @@ void ChaletPowerRelayTick()
TimerStop(CHALET_POWER_RELAY_COIL_TIMER);
}
}
//LVD: if battery voltage is too low, turn off the power relay
if(PowerRelayState == CHALET_POWER_RELAY_ON_STATE && GetBatteryVoltage(0) < POWER_RELAY_LVD_VOLTAGE_TRESHOLD)
if(IsTimerRunning(CHALET_POWER_RELAY_LVD_TIMER) == true)
{
ChaletPowerRelayTurnOff();
if(PowerRelayState != CHALET_POWER_RELAY_ON_STATE)
{
TimerStop(CHALET_POWER_RELAY_LVD_TIMER);
}
else if(IsTimerExpired(CHALET_POWER_RELAY_LVD_TIMER))
{
//Check if it was just a glitch
if(GetBatteryVoltage(0) >= POWER_RELAY_LVD_VOLTAGE_TRESHOLD)
{
TimerStop(CHALET_POWER_RELAY_LVD_TIMER);
}
else
{
TimerStop(CHALET_POWER_RELAY_LVD_TIMER);
ChaletPowerRelayTurnOff();
}
}
}
else
{
//LVD: if battery voltage is too low, turn off the power relay
if(PowerRelayState == CHALET_POWER_RELAY_ON_STATE && GetBatteryVoltage(0) < POWER_RELAY_LVD_VOLTAGE_TRESHOLD && GetBatteryVoltage(0) != 0.0)
{
//ChaletPowerRelayTurnOff();
TimerStart(CHALET_POWER_RELAY_LVD_TIMER,CHALET_POWER_RELAY_LVD_DEBOUNCE_TIMEOUT);
}
}
if(IsTimerExpired(CHALET_POWER_RELAY_AUTOTURNOFF_TIMER))
@ -81,6 +106,7 @@ bool ChaletPowerRelayTurnOff()
{
POWER_RELAY_OFF_PIN = PIN_ACTIVE;
TimerStart(CHALET_POWER_RELAY_COIL_TIMER,CHALET_POWER_RELAY_COIL_TIMEOUT);
TimerStop(CHALET_POWER_RELAY_LVD_TIMER);
// PowerRelayState = CHALET_POWER_RELAY_OFF_STATE;
return true;
}

1
ChaletLora.X/Source/ChaletPowerRelay.h
View File

@ -11,6 +11,7 @@
#define CHALET_OFFLINE_POWER_RELAY_RESET_TIMEOUT 43200 //43,200 = 12 hours in seconds
#define POWER_RELAY_LVD_VOLTAGE_TRESHOLD (float)12.00
#define CHALET_POWER_RELAY_LVD_DEBOUNCE_TIMEOUT 1000 //ms
enum eChaletPowerRelayState
{

1
ChaletLora.X/Source/timer.h
View File

@ -54,6 +54,7 @@ typedef enum
LTE_MODULE_TIMER,
LTE_COMM_TIMER,
LTE_NWI_TIMER,
CHALET_POWER_RELAY_LVD_TIMER,
TIMER_MAX_ID
}eTimerID;

2
ChaletLora.X/Source/versionbuild.h
View File

@ -1,4 +1,4 @@
#define VERSIONNUMBER "CHALET_V01.02.5" //shall be 15 chars...
#define VERSIONNUMBER "CHALET_V01.02.6" //shall be 15 chars...
//Force DHCP instead of static IP.
//#define VERSIONNUMBER "CHALET_V01.00.1" //shall be 15 chars...

BIN
ChaletLora.X/dist/ChaletDuinoV2_795F512H_/production/ChaletLora.X.production.elf vendored
View File

Binary file not shown.

4658
ChaletLora.X/dist/ChaletDuinoV2_795F512H_/production/ChaletLora.X.production.hex vendored
View File

File diff suppressed because it is too large Load Diff

1608
ChaletLora.X/dist/ChaletDuinoV2_795F512H_/production/ChaletLora.X.production.map vendored
View File

File diff suppressed because it is too large Load Diff

2
ChaletLora.X/nbproject/Makefile-genesis.properties
View File

@ -1,5 +1,5 @@
#
#Sun Jan 04 10:46:07 EST 2026
#Sat Jul 04 11:51:56 EDT 2026
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\\ChaletLora\\ChaletLora.X

46
ChaletLora.X/nbproject/private/private.xml
View File

@ -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="12">
<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">
@ -22,14 +9,6 @@
<key/>
</bookmark>
</file>
<file>
<url>Source/WiFiCtrl.c</url>
<bookmark id="12">
<name/>
<line>407</line>
<key/>
</bookmark>
</file>
<file>
<url>Source/SIM7080GInterface.c</url>
<bookmark id="11">
@ -53,12 +32,31 @@
<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>
<file>
<url>Source/WiFiCtrl.c</url>
<bookmark id="12">
<name/>
<line>407</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/ChaletLora/ChaletLora.X/Source/ChaletPowerRelay.c</file>
<file>file:/D:/Main/PicDev/Projets/ChaletLora/ChaletLora.X/Source/ChaletPowerRelay.h</file>
<file>file:/D:/Main/PicDev/Projets/ChaletLora/ChaletLora.X/Source/versionbuild.h</file>
<file>file:/D:/Main/PicDev/Projets/ChaletLora/ChaletLora.X/Source/WiFiCtrl.c</file>
</group>
</open-files>
</project-private>