Skip to content

Commit 93d4d29

Browse files
EddyK69EddyK69
committed
Added CounterType Time
1 parent 9eec158 commit 93d4d29

File tree

6 files changed

+62
-1
lines changed

6 files changed

+62
-1
lines changed

‎main/EventSystem.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,9 @@ void CEventSystem::GetCurrentMeasurementStates()
699699
case MTYPE_COUNTER:
700700
sprintf(szTmp, "%llu", total_real);
701701
break;
702+
case MTYPE_TIME:
703+
sprintf(szTmp, "%llu min", total_real);
704+
break;
702705
}
703706
utilityval = static_cast<float>(atof(szTmp));
704707
isUtility = true;
@@ -892,6 +895,9 @@ void CEventSystem::GetCurrentMeasurementStates()
892895
case MTYPE_COUNTER:
893896
sprintf(szTmp, "%llu", total_real);
894897
break;
898+
case MTYPE_TIME:
899+
sprintf(szTmp, "%llu min", total_real);
900+
break;
895901
}
896902
utilityval = static_cast<float>(atof(szTmp));
897903
isUtility = true;

‎main/RFXNames.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ const char *Notification_Type_Desc(const int nType, const unsigned char snum)
295295
{ NTYPE_PAUSED, "Pause Stream", "Y" },
296296
{ NTYPE_STOPPED, "Stop Stream", "Q" },
297297
{ NTYPE_PLAYING, "Play Stream", "a" },
298+
{ NTYPE_TODAYTIME, "Today", "m" },
298299
{ 0,NULL,NULL }
299300
};
300301
if (snum==0)
@@ -333,6 +334,7 @@ const char *Notification_Type_Label(const int nType)
333334
{ NTYPE_PAUSED, "" },
334335
{ NTYPE_STOPPED, "" },
335336
{ NTYPE_PLAYING, "" },
337+
{ NTYPE_TODAYTIME, "min" },
336338
{ 0,NULL,NULL }
337339
};
338340
return findTableIDSingle1 (Table, nType);

‎main/RFXNames.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,8 @@ enum _eNotificationTypes
181181
NTYPE_PHOTO,
182182
NTYPE_PAUSED,
183183
NTYPE_STOPPED,
184-
NTYPE_PLAYING
184+
NTYPE_PLAYING,
185+
NTYPE_TODAYTIME
185186
};
186187

187188
const char *RFX_Type_Desc(const unsigned char i, const unsigned char snum);

‎main/SQLHelper.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4741,6 +4741,11 @@ void CSQLHelper::AddCalendarUpdateMeter()
47414741
if (musage!=0)
47424742
m_notifications.CheckAndHandleNotification(ID, devname, devType, subType, NTYPE_TODAYCOUNTER, musage);
47434743
break;
4744+
case MTYPE_TIME:
4745+
musage = float(total_real);
4746+
if (musage != 0)
4747+
m_notifications.CheckAndHandleNotification(ID, devname, devType, subType, NTYPE_TODAYTIME, musage);
4748+
break;
47444749
}
47454750
}
47464751
else

‎main/WebServer.cpp‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4984,6 +4984,12 @@ namespace http {
49844984
root["result"][ii]["text"] = Notification_Type_Desc(NTYPE_TODAYCOUNTER, 0);
49854985
root["result"][ii]["ptag"] = Notification_Type_Desc(NTYPE_TODAYCOUNTER, 1);
49864986
}
4987+
else if (switchtype == MTYPE_TIME)
4988+
{
4989+
root["result"][ii]["val"] = NTYPE_TODAYTIME;
4990+
root["result"][ii]["text"] = Notification_Type_Desc(NTYPE_TODAYTIME, 0);
4991+
root["result"][ii]["ptag"] = Notification_Type_Desc(NTYPE_TODAYTIME, 1);
4992+
}
49874993
else
49884994
{
49894995
//water (same as gas)
@@ -8616,6 +8622,9 @@ namespace http {
86168622
case MTYPE_COUNTER:
86178623
sprintf(szTmp, "%llu", total_real);
86188624
break;
8625+
case MTYPE_TIME:
8626+
sprintf(szTmp, "%llu min", total_real);
8627+
break;
86198628
}
86208629
}
86218630
root["result"][ii]["Counter"] = sValue;
@@ -8641,6 +8650,11 @@ namespace http {
86418650
root["result"][ii]["Data"] = szTmp;
86428651
root["result"][ii]["Counter"] = szTmp;
86438652
break;
8653+
case MTYPE_TIME:
8654+
sprintf(szTmp, "%i min", atoi(sValue.c_str()));
8655+
root["result"][ii]["Data"] = szTmp;
8656+
root["result"][ii]["Counter"] = szTmp;
8657+
break;
86448658
}
86458659
}
86468660
else if (dType == pTypeGeneral && dSubType == sTypeCounterIncremental)
@@ -8715,6 +8729,9 @@ namespace http {
87158729
case MTYPE_COUNTER:
87168730
sprintf(szTmp, "%llu", total_real);
87178731
break;
8732+
case MTYPE_TIME:
8733+
sprintf(szTmp, "%llu min", total_real);
8734+
break;
87188735
}
87198736
}
87208737
root["result"][ii]["Counter"] = sValue;
@@ -8741,6 +8758,11 @@ namespace http {
87418758
root["result"][ii]["Data"] = szTmp;
87428759
root["result"][ii]["Counter"] = szTmp;
87438760
break;
8761+
case MTYPE_TIME:
8762+
sprintf(szTmp, "%.03f min", fvalue / WaterDivider);
8763+
root["result"][ii]["Data"] = szTmp;
8764+
root["result"][ii]["Counter"] = szTmp;
8765+
break;
87448766
}
87458767
}
87468768
else if (dType == pTypeYouLess)
@@ -8816,6 +8838,9 @@ namespace http {
88168838
case MTYPE_COUNTER:
88178839
sprintf(szTmp, "%llu", total_real);
88188840
break;
8841+
case MTYPE_TIME:
8842+
sprintf(szTmp, "%llu min", total_real);
8843+
break;
88198844
}
88208845
}
88218846
root["result"][ii]["CounterToday"] = szTmp;
@@ -8845,6 +8870,9 @@ namespace http {
88458870
case MTYPE_COUNTER:
88468871
sprintf(szTmp, "%llu", total_actual);
88478872
break;
8873+
case MTYPE_TIME:
8874+
sprintf(szTmp, "%llu min", total_actual);
8875+
break;
88488876
}
88498877
root["result"][ii]["Counter"] = szTmp;
88508878

@@ -8872,6 +8900,9 @@ namespace http {
88728900
case MTYPE_COUNTER:
88738901
sprintf(szTmp, "%llu", acounter);
88748902
break;
8903+
case MTYPE_TIME:
8904+
sprintf(szTmp, "%llu min", acounter);
8905+
break;
88758906
}
88768907
root["result"][ii]["Data"] = szTmp;
88778908
switch (metertype)
@@ -8887,6 +8918,7 @@ namespace http {
88878918
sprintf(szTmp, "%s m", splitresults[1].c_str());
88888919
break;
88898920
case MTYPE_COUNTER:
8921+
case MTYPE_TIME:
88908922
sprintf(szTmp, "%s", splitresults[1].c_str());
88918923
break;
88928924
}
@@ -12603,6 +12635,7 @@ namespace http {
1260312635
sprintf(szTmp, "%.3f", TotalValue / WaterDivider);
1260412636
break;
1260512637
case MTYPE_COUNTER:
12638+
case MTYPE_TIME:
1260612639
sprintf(szTmp, "%.1f", TotalValue);
1260712640
break;
1260812641
}
@@ -12654,6 +12687,7 @@ namespace http {
1265412687
sprintf(szTmp, "%.3f", TotalValue / WaterDivider);
1265512688
break;
1265612689
case MTYPE_COUNTER:
12690+
case MTYPE_TIME:
1265712691
sprintf(szTmp, "%.1f", TotalValue);
1265812692
break;
1265912693
}
@@ -12760,6 +12794,7 @@ namespace http {
1276012794
sprintf(szTmp, "%.3f", TotalValue / WaterDivider);
1276112795
break;
1276212796
case MTYPE_COUNTER:
12797+
case MTYPE_TIME:
1276312798
sprintf(szTmp, "%.1f", TotalValue);
1276412799
break;
1276512800
}
@@ -12825,6 +12860,7 @@ namespace http {
1282512860
sprintf(szTmp, "%.3f", TotalValue / WaterDivider);
1282612861
break;
1282712862
case MTYPE_COUNTER:
12863+
case MTYPE_TIME:
1282812864
sprintf(szTmp, "%.1f", TotalValue);
1282912865
break;
1283012866
}
@@ -12864,6 +12900,7 @@ namespace http {
1286412900
sprintf(szTmp, "%.3f", TotalValue / WaterDivider);
1286512901
break;
1286612902
case MTYPE_COUNTER:
12903+
case MTYPE_TIME:
1286712904
sprintf(szTmp, "%.1f", TotalValue);
1286812905
break;
1286912906
}
@@ -14574,6 +14611,9 @@ namespace http {
1457414611
case MTYPE_WATER:
1457514612
sprintf(szTmp, "%.3f", fvalue / WaterDivider);
1457614613
break;
14614+
default:
14615+
sprintf(szTmp, "");
14616+
break;
1457714617
}
1457814618
root["counter"] = szTmp;
1457914619
}
@@ -14597,6 +14637,9 @@ namespace http {
1459714637
case MTYPE_WATER:
1459814638
sprintf(szTmp, "%.3f", fvalue / WaterDivider);
1459914639
break;
14640+
default:
14641+
sprintf(szTmp, "");
14642+
break;
1460014643
}
1460114644
root["counter"] = szTmp;
1460214645
}
@@ -14653,6 +14696,7 @@ namespace http {
1465314696
root["result"][ii]["c"] = szTmp;
1465414697
break;
1465514698
case MTYPE_COUNTER:
14699+
case MTYPE_TIME:
1465614700
sprintf(szTmp, "%.0f", atof(szValue.c_str()));
1465714701
root["result"][ii]["v"] = szTmp;
1465814702
if (fcounter != 0)
@@ -14693,6 +14737,7 @@ namespace http {
1469314737
root["resultprev"][iPrev]["v"] = szTmp;
1469414738
break;
1469514739
case MTYPE_COUNTER:
14740+
case MTYPE_TIME:
1469614741
sprintf(szTmp, "%.0f", atof(szValue.c_str()));
1469714742
root["resultprev"][iPrev]["v"] = szTmp;
1469814743
break;
@@ -14973,6 +15018,7 @@ namespace http {
1497315018
root["result"][ii]["c"] = szTmp;
1497415019
break;
1497515020
case MTYPE_COUNTER:
15021+
case MTYPE_TIME:
1497615022
sprintf(szTmp, "%.0f", atof(szValue.c_str()));
1497715023
root["result"][ii]["v"] = szTmp;
1497815024
sprintf(szTmp, "%.0f", (atof(sValue.c_str()) - atof(szValue.c_str())));

‎main/mainworker.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9814,6 +9814,7 @@ bool MainWorker::GetSensorData(const unsigned long long idx, int &nValue, std::s
98149814
sprintf(szTmp, "%llu", total_real);
98159815
break;
98169816
case MTYPE_COUNTER:
9817+
case MTYPE_TIME:
98179818
sprintf(szTmp, "%llu", total_real);
98189819
break;
98199820
}

0 commit comments

Comments
 (0)