From 9cdc4f7b53b6522e1cdea37557123f655405a585 Mon Sep 17 00:00:00 2001 From: kon Date: Sat, 20 Jun 2020 12:11:21 +0000 Subject: [PATCH] Added time message to cluster (#1524) * second can bus, first steps * added most important messages; no more errors * cleaned up can messages * second can bus, first steps * added most important messages; no more errors * cleaned up can messages * post rebase/merge fixes * more rebase/merge fixes * even more rebase/merge fixes * more fixes, removed auto-gen files * removed more auto-gen files... * pulled fix from upstream * added RTC date/time message to cluster * forgot to set boolean.... --- firmware/controllers/can/can_dash.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/firmware/controllers/can/can_dash.cpp b/firmware/controllers/can/can_dash.cpp index 655928e2cd..fdb0b78d2c 100644 --- a/firmware/controllers/can/can_dash.cpp +++ b/firmware/controllers/can/can_dash.cpp @@ -17,6 +17,7 @@ #include "sensor.h" #include "allsensors.h" #include "vehicle_speed.h" +#include "rtc_helper.h" EXTERN_ENGINE; @@ -61,6 +62,7 @@ EXTERN_ENGINE; #define E90_GEAR 0x1D2 #define E90_FUEL 0x349 #define E90_EBRAKE 0x34F +#define E90_TIME 0x39E static uint8_t rpmcounter; static uint16_t e90msgcounter; @@ -71,6 +73,7 @@ static uint8_t mph_a, mph_2a, mph_last, tmp_cnt, gear_cnt; static uint16_t mph_counter = 0xF000; static time_msecs_t mph_timer; static time_msecs_t mph_ctr; +static bool cluster_time_set; constexpr uint8_t e90_temp_offset = 49; @@ -367,6 +370,23 @@ void canDashboardBMWE90() msg[7] = (mph_counter >> 8) | 0xF0; } } + + { + if (!cluster_time_set) { + struct tm timp; + date_get_tm(&timp); + CanTxMessage msg(E90_TIME, 8); + msg[0] = timp.tm_hour; + msg[1] = timp.tm_min; + msg[2] = timp.tm_sec; + msg[3] = timp.tm_mday; + msg[4] = (((timp.tm_mon + 1) << 4) | 0x0F); + msg[5] = (timp.tm_year + 1900) & 0xFF; + msg[6] = ((timp.tm_year + 1900) >> 8) | 0xF0; + msg[7] = 0xF2; + cluster_time_set = 1; + } + } } #endif // EFI_CAN_SUPPORT