From 52efa43e4bd5aaf86faed4191cb1f61d75ca24bb Mon Sep 17 00:00:00 2001 From: ehorvat1 <108073384+ehorvat1@users.noreply.github.com> Date: Thu, 3 Oct 2024 22:07:46 +0200 Subject: [PATCH] Fix issue #1375 and #1376 (#1377) * Fix issue #1376 Fix issue #1376 .....wrong time in charts when using NTP with an offset * Update drv_charts.c Issue #1375 For issue #1375: add a default color to improve readability (applies to: dataset names, axis ticks, color for axes title, (use color: '#099') * Update drv_charts.c Add a chart title * Update obk_config.h Set ENABLE_DRIVER_CHARTS = 1 also for Beken Devices * Update http_fns.c Add charts to About page * Update obk_config.h File just cloned from openshwprojects/OpenBK7231T_App * Revert "Update obk_config.h" This reverts commit b83c7db2ead8c042130d051b4e87af8b67757583. * Revert "Update obk_config.h" This reverts commit 7b7d97966710a8916492bb017fe42f13af683fa3. * Revert "Update http_fns.c" This reverts commit d81e4b3db8dcd7b8cd23445731977d31d018aa65. * Revert "Update drv_charts.c" This reverts commit c5d122994a095d806d5d1f7b96d3b530b39992b3. --- src/driver/drv_charts.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/driver/drv_charts.c b/src/driver/drv_charts.c index 820daeecb..a19b8f6e2 100644 --- a/src/driver/drv_charts.c +++ b/src/driver/drv_charts.c @@ -507,6 +507,7 @@ void Chart_Display(http_request_t *request, chart_t *s) { poststr(request, " }"); poststr(request, " }"); poststr(request, "});"); + poststr(request, "Chart.defaults.color = '#099'; "); // Issue #1375, add a default color to improve readability (applies to: dataset names, axis ticks, color for axes title, (use color: '#099') poststr(request, "}"); poststr(request, ""); poststr(request, ""); @@ -625,7 +626,7 @@ static commandResult_t CMD_Chart_AddNow(const void *context, const char *cmd, co float f = Tokenizer_GetArgFloat(i); Chart_SetSample(g_chart, i, f); } - Chart_AddTime(g_chart, NTP_GetCurrentTime()); + Chart_AddTime(g_chart, NTP_GetCurrentTimeWithoutOffset()); // Fix issue #1376 .....was NTP_GetCurrentTime() ... now "WithoutOffset" since NTP drivers timestamp are already offsetted return CMD_RES_OK; }