martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more work on mdevices module.

Browse Source
This commit is contained in:
Martin Preuss
2025-10-25 16:36:24 +02:00
parent 0fa4c6c8b5
commit 7c320b210f
12 changed files with 471 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
apps/aqhome-cgi/modules/devices/mdevices_vgraph.c
View File

@@ -46,7 +46,9 @@ enum {
VALUEGRAPH_PERIOD_4H=1,
VALUEGRAPH_PERIOD_1D,
VALUEGRAPH_PERIOD_1W,
VALUEGRAPH_PERIOD_1M
VALUEGRAPH_PERIOD_1M,
VALUEGRAPH_PERIOD_6M,
VALUEGRAPH_PERIOD_12M,
};
@@ -268,11 +270,13 @@ AQDG_GRAPH *_mkGraphObjectWithTitle(const char *graphTitle, int period, int prec
tbuf=GWEN_Buffer_new(0, 256, 0, 1);
switch(period) {
case VALUEGRAPH_PERIOD_4H: s="last 4 hours"; break;
case VALUEGRAPH_PERIOD_1D: s="last 24 hours"; break;
case VALUEGRAPH_PERIOD_1W: s="last 7 days"; break;
case VALUEGRAPH_PERIOD_1M: s="last 30 days"; break;
default: s="last 24 hours"; break;
case VALUEGRAPH_PERIOD_4H: s="last 4 hours"; break;
case VALUEGRAPH_PERIOD_1D: s="last 24 hours"; break;
case VALUEGRAPH_PERIOD_1W: s="last 7 days"; break;
case VALUEGRAPH_PERIOD_1M: s="last 30 days"; break;
case VALUEGRAPH_PERIOD_6M: s="last 6 months"; break;
case VALUEGRAPH_PERIOD_12M: s="last 12 months"; break;
default: s="last 24 hours"; break;
}
GBAA(tbuf, "%s - %s", graphTitle, s);
@@ -293,6 +297,10 @@ int _getPeriodFromString(const char *sPeriod)
return VALUEGRAPH_PERIOD_1W;
else if (strcasecmp(sPeriod, "1m")==0)
return VALUEGRAPH_PERIOD_1M;
else if (strcasecmp(sPeriod, "6m")==0)
return VALUEGRAPH_PERIOD_6M;
else if (strcasecmp(sPeriod, "12m")==0)
return VALUEGRAPH_PERIOD_12M;
return VALUEGRAPH_PERIOD_1D;
}
@@ -315,11 +323,13 @@ void _mkPathForValueAndPeriod(AQH_MODULE *m, const AQH_VALUE *v, int period, GWE
/* period */
switch(period) {
case VALUEGRAPH_PERIOD_4H: s="4h"; break;
case VALUEGRAPH_PERIOD_1D: s="1d"; break;
case VALUEGRAPH_PERIOD_1W: s="1w"; break;
case VALUEGRAPH_PERIOD_1M: s="1m"; break;
default: s="1d"; break;
case VALUEGRAPH_PERIOD_4H: s="4h"; break;
case VALUEGRAPH_PERIOD_1D: s="1d"; break;
case VALUEGRAPH_PERIOD_1W: s="1w"; break;
case VALUEGRAPH_PERIOD_1M: s="1m"; break;
case VALUEGRAPH_PERIOD_6M: s="6m"; break;
case VALUEGRAPH_PERIOD_12M: s="12m"; break;
default: s="1d"; break;
}
GBAA(dbuf, "-%s.png", s);
@@ -335,11 +345,13 @@ uint64_t _getStartTimeForPeriod(int period)
/* period */
switch(period) {
case VALUEGRAPH_PERIOD_4H: t-=4*60*60; break;
case VALUEGRAPH_PERIOD_1D: t-=24*60*60; break;
case VALUEGRAPH_PERIOD_1W: t-=7*24*60*60; break;
case VALUEGRAPH_PERIOD_1M: t-=30*24*60*60; break;
default: t-=24*60*60; break;
case VALUEGRAPH_PERIOD_4H: t-=4*60*60; break;
case VALUEGRAPH_PERIOD_1D: t-=24*60*60; break;
case VALUEGRAPH_PERIOD_1W: t-=7*24*60*60; break;
case VALUEGRAPH_PERIOD_1M: t-=30*24*60*60; break;
case VALUEGRAPH_PERIOD_6M: t-=182*24*60*60; break;
case VALUEGRAPH_PERIOD_12M: t-=365*24*60*60; break;
default: t-=24*60*60; break;
}
return (uint64_t) t;
@@ -351,11 +363,13 @@ const char *_getModifiersForPeriod(int period)
{
/* period */
switch(period) {
case VALUEGRAPH_PERIOD_4H: return "La5";
case VALUEGRAPH_PERIOD_1D: return "La30";
case VALUEGRAPH_PERIOD_1W: return "La240";
case VALUEGRAPH_PERIOD_1M: return "La480";
default: return "La15";
case VALUEGRAPH_PERIOD_4H: return "La5";
case VALUEGRAPH_PERIOD_1D: return "La30";
case VALUEGRAPH_PERIOD_1W: return "La240";
case VALUEGRAPH_PERIOD_1M: return "La480";
case VALUEGRAPH_PERIOD_6M: return "La720";
case VALUEGRAPH_PERIOD_12M: return "La1440";
default: return "La30";
}
}