From 32c8d559cdad26bf2ac6ac7707c34a089893e4dd Mon Sep 17 00:00:00 2001
From: stephb9959 <stephane.bourque@gmail.com>
Date: Sun, 27 Mar 2022 11:56:38 -0700
Subject: [PATCH] Fine tuning statistics.

---
 src/APStats.cpp                                 | 6 +++---
 src/RESTAPI/RESTAPI_board_timepoint_handler.cpp | 1 +
 src/RESTObjects/RESTAPI_AnalyticsObjects.cpp    | 2 ++
 src/RESTObjects/RESTAPI_AnalyticsObjects.h      | 1 +
 test_scripts/curl/cli                           | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/APStats.cpp b/src/APStats.cpp
index c2ac597..534f020 100644
--- a/src/APStats.cpp
+++ b/src/APStats.cpp
@@ -100,8 +100,8 @@ namespace OpenWifi {
                         GetJSON("tx_power", radio, RTP.tx_power, (uint64_t) 0);
                         GetJSON("active_ms", radio, RTP.active_ms, (uint64_t) 0);
                         GetJSON("channel", radio, RTP.channel, (uint64_t) 0);
-                        GetJSON("temperature", radio, RTP.temperature, (int64_t) 0);
-                        GetJSON("noise", radio, RTP.noise, (int64_t) 0);
+                        GetJSON("temperature", radio, RTP.temperature, (int64_t) 20);
+                        GetJSON("noise", radio, RTP.noise, (int64_t) -100);
                         DTP.radio_data.push_back(RTP);
                     }
                 }
@@ -331,7 +331,7 @@ namespace OpenWifi {
                 GetJSON("compatible", ping, DI_.deviceType, std::string{} );
                 GetJSON("connectionIp", ping, DI_.connectionIp, std::string{} );
                 GetJSON("locale", ping, DI_.locale, std::string{} );
-                GetJSON("timestamp", ping, DI_.lastConnection, (uint64_t)0 );
+                GetJSON("timestamp", ping, DI_.lastConnection, (uint64_t) OpenWifi::Now() );
                 if (ping.contains("firmware")) {
                     auto NewFirmware = ping["firmware"];
                     if (NewFirmware != DI_.lastFirmware) {
diff --git a/src/RESTAPI/RESTAPI_board_timepoint_handler.cpp b/src/RESTAPI/RESTAPI_board_timepoint_handler.cpp
index a376dbb..22c6a59 100644
--- a/src/RESTAPI/RESTAPI_board_timepoint_handler.cpp
+++ b/src/RESTAPI/RESTAPI_board_timepoint_handler.cpp
@@ -191,6 +191,7 @@ namespace OpenWifi {
                 AverageAPData(&AnalyticsObjects::APTimePoint::tx_errors_pct, point_list, DTPA.tx_errors_pct);
 
                 AverageRadioData(&AnalyticsObjects::RadioTimePoint::noise, point_list, DTPA.noise);
+                AverageRadioData(&AnalyticsObjects::RadioTimePoint::temperature, point_list, DTPA.temperature);
                 AverageRadioData(&AnalyticsObjects::RadioTimePoint::tx_power, point_list, DTPA.tx_power);
                 AverageRadioData(&AnalyticsObjects::RadioTimePoint::active_pct, point_list, DTPA.active_pct);
                 AverageRadioData(&AnalyticsObjects::RadioTimePoint::busy_pct, point_list, DTPA.busy_pct);
diff --git a/src/RESTObjects/RESTAPI_AnalyticsObjects.cpp b/src/RESTObjects/RESTAPI_AnalyticsObjects.cpp
index d0e50e7..35c8aa8 100644
--- a/src/RESTObjects/RESTAPI_AnalyticsObjects.cpp
+++ b/src/RESTObjects/RESTAPI_AnalyticsObjects.cpp
@@ -399,6 +399,7 @@ namespace OpenWifi::AnalyticsObjects {
 
     void DeviceTimePointAnalysis::to_json(Poco::JSON::Object &Obj) const {
         field_to_json(Obj,"noise",noise);
+        field_to_json(Obj,"temperature",temperature);
         field_to_json(Obj,"active_pct",active_pct);
         field_to_json(Obj,"busy_pct",busy_pct);
         field_to_json(Obj,"receive_pct",receive_pct);
@@ -417,6 +418,7 @@ namespace OpenWifi::AnalyticsObjects {
     bool DeviceTimePointAnalysis::from_json(const Poco::JSON::Object::Ptr &Obj) {
         try {
             field_from_json(Obj,"noise",noise);
+            field_from_json(Obj,"temperature",temperature);
             field_from_json(Obj,"active_pct",active_pct);
             field_from_json(Obj,"busy_pct",busy_pct);
             field_from_json(Obj,"receive_pct",receive_pct);
diff --git a/src/RESTObjects/RESTAPI_AnalyticsObjects.h b/src/RESTObjects/RESTAPI_AnalyticsObjects.h
index 94c3e0a..1fc556a 100644
--- a/src/RESTObjects/RESTAPI_AnalyticsObjects.h
+++ b/src/RESTObjects/RESTAPI_AnalyticsObjects.h
@@ -281,6 +281,7 @@ namespace OpenWifi {
             uint64_t        timestamp;
 
             AveragePoint    noise;
+            AveragePoint    temperature;
             AveragePoint    active_pct;
             AveragePoint    busy_pct;
             AveragePoint    receive_pct;
diff --git a/test_scripts/curl/cli b/test_scripts/curl/cli
index 387db67..e6a2be7 100755
--- a/test_scripts/curl/cli
+++ b/test_scripts/curl/cli
@@ -251,7 +251,7 @@ boarddevices() {
 }
 
 points() {
-    curl ${FLAGS} -X GET "https://${OWANALYTICS}/api/v1/board/$1/timepoints" \
+    curl ${FLAGS} -X GET "https://${OWANALYTICS}/api/v1/board/$1/timepoints?pointsStatsOnly=true" \
     -H "accept: application/json" \
     -H "Authorization: Bearer ${token}" > ${result_file}
     jq < ${result_file}