Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-12-24 06:49:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Extract Temperature, Pressure into units header.

Browse Source
This commit is contained in:
Jared Boone 2016-01-23 21:37:22 -08:00
parent 45a8759d7b
commit 798b5eb972
2 changed files with 87 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
firmware/application/tpms_app.hpp
View File

@ -31,6 +31,10 @@
#include "optional.hpp"
#include "units.hpp"
using units::Temperature;
using units::Pressure;
namespace tpms {
class TransponderID {
@ -54,56 +58,6 @@ private:
uint32_t id_;
};
class Pressure {
public:
constexpr Pressure(
) : kpa_ { 0 }
{
}
constexpr Pressure(
const int32_t kilopascal
) : kpa_ { static_cast<int16_t>(kilopascal) }
{
}
int kilopascal() const {
return kpa_;
}
int psi() const {
return static_cast<int32_t>(kpa_) * 1000 / 6895;
}
private:
int16_t kpa_;
};
class Temperature {
public:
constexpr Temperature(
) : c_ { 0 }
{
}
constexpr Temperature(
const int32_t celsius
) : c_ { static_cast<int16_t>(celsius) }
{
}
int celsius() const {
return c_;
}
int fahrenheit() const {
return (c_ * 9 / 5) + 32;
}
private:
int16_t c_;
};
class Reading {
public:
enum Type {
@ -208,8 +162,8 @@ struct TPMSRecentEntry {
size_t received_count { 0 };
Optional<tpms::Pressure> last_pressure;
Optional<tpms::Temperature> last_temperature;
Optional<Pressure> last_pressure;
Optional<Temperature> last_temperature;
TPMSRecentEntry(
const Key& key

81
firmware/common/units.hpp Normal file
View File

@ -0,0 +1,81 @@
/*
* Copyright (C) 2016 Jared Boone, ShareBrained Technology, Inc.
*
* This file is part of PortaPack.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
* Boston, MA 02110-1301, USA.
*/
#ifndef __UNITS_H__
#define __UNITS_H__
#include <cstdint>
namespace units {
class Pressure {
public:
constexpr Pressure(
) : kpa_ { 0 }
{
}
constexpr Pressure(
const int kilopascal
) : kpa_ { static_cast<int16_t>(kilopascal) }
{
}
int kilopascal() const {
return kpa_;
}
int psi() const {
return kpa_ * 1000 / 6895;
}
private:
int16_t kpa_;
};
class Temperature {
public:
constexpr Temperature(
) : c_ { 0 }
{
}
constexpr Temperature(
const int celsius
) : c_ { static_cast<int16_t>(celsius) }
{
}
int celsius() const {
return c_;
}
int fahrenheit() const {
return (c_ * 9 / 5) + 32;
}
private:
int16_t c_;
};
} /* namespace units */
#endif/*__UNITS_H__*/