From f804d7997c58a5f37ce04dfb04bc28256db17c3e Mon Sep 17 00:00:00 2001 From: GullCode Date: Thu, 21 Apr 2022 21:41:02 +0200 Subject: [PATCH] Fix for warning: narrowing conversion --- firmware/common/tpms_packet.cpp | 10 +++++----- firmware/common/tpms_packet.hpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/firmware/common/tpms_packet.cpp b/firmware/common/tpms_packet.cpp index a2abaada..f81ef35a 100644 --- a/firmware/common/tpms_packet.cpp +++ b/firmware/common/tpms_packet.cpp @@ -40,7 +40,7 @@ Optional Packet::reading_fsk_19k2_schrader() const { case 64: return Reading { Reading::Type::FLM_64, - reader_.read(0, 32), + (uint32_t)reader_.read(0, 32), Pressure { static_cast(reader_.read(32, 8)) * 4 / 3 }, Temperature { static_cast(reader_.read(40, 8) & 0x7f) - 56 } }; @@ -48,7 +48,7 @@ Optional Packet::reading_fsk_19k2_schrader() const { case 72: return Reading { Reading::Type::FLM_72, - reader_.read(0, 32), + (uint32_t)reader_.read(0, 32), Pressure { static_cast(reader_.read(40, 8)) * 4 / 3 }, Temperature { static_cast(reader_.read(48, 8)) - 56 } }; @@ -56,7 +56,7 @@ Optional Packet::reading_fsk_19k2_schrader() const { case 80: return Reading { Reading::Type::FLM_80, - reader_.read(8, 32), + (uint32_t)reader_.read(8, 32), Pressure { static_cast(reader_.read(48, 8)) * 4 / 3 }, Temperature { static_cast(reader_.read(56, 8)) - 56 } }; @@ -85,7 +85,7 @@ Optional Packet::reading_ook_8k192_schrader() const { if( (checksum_calculated & 3) == 3 ) { return Reading { Reading::Type::Schrader, - reader_.read(3, 24), + (uint32_t)reader_.read(3, 24), Pressure { static_cast(reader_.read(27, 8)) * 4 / 3 }, { }, Flags { static_cast((flags << 4) | checksum) } @@ -122,7 +122,7 @@ Optional Packet::reading_ook_8k4_schrader() const { if( checksum_calculated == checksum ) { return Reading { Reading::Type::GMC_96, - id, + (uint32_t)id, Pressure { static_cast(value_1) * 4 / 3 }, Temperature { static_cast(value_0) - 56 } }; diff --git a/firmware/common/tpms_packet.hpp b/firmware/common/tpms_packet.hpp index 5ee3e02a..75ad0077 100644 --- a/firmware/common/tpms_packet.hpp +++ b/firmware/common/tpms_packet.hpp @@ -39,7 +39,7 @@ namespace tpms { using Flags = uint8_t; -enum SignalType : uint32_t { +enum SignalType { FSK_19k2_Schrader = 1, OOK_8k192_Schrader = 2, OOK_8k4_Schrader = 3,