Add Bpm unit (close #330)

This commit is contained in:
Simon Stürz 2016-05-12 10:04:15 +02:00 committed by Michael Zanetti
parent 8b1f9e5e2c
commit b4738530a6
5 changed files with 30 additions and 23 deletions

View File

@ -214,88 +214,92 @@
\li 26 \li 26
\li The value of the \l{Param} has unit \tt {[db]} \unicode{0x2192} dezibel. \li The value of the \l{Param} has unit \tt {[db]} \unicode{0x2192} dezibel.
\row \row
\li Types::UnitKiloByte \li Types::UnitBpm
\li 27 \li 27
\li The value of the \l{Param} has unit \tt {[db]} \unicode{0x2192} dezibel.
\row
\li Types::UnitKiloByte
\li 28
\li The value of the \l{Param} has unit \tt {[kB]} \unicode{0x2192} kilo byte. \li The value of the \l{Param} has unit \tt {[kB]} \unicode{0x2192} kilo byte.
\row \row
\li Types::UnitMegaByte \li Types::UnitMegaByte
\li 28 \li 29
\li The value of the \l{Param} has unit \tt {[MB]} \unicode{0x2192} mega byte. \li The value of the \l{Param} has unit \tt {[MB]} \unicode{0x2192} mega byte.
\row \row
\li Types::UnitGigaByte \li Types::UnitGigaByte
\li 29 \li 30
\li The value of the \l{Param} has unit \tt {[GB]} \unicode{0x2192} giga byte. \li The value of the \l{Param} has unit \tt {[GB]} \unicode{0x2192} giga byte.
\row \row
\li Types::UnitTeraByte \li Types::UnitTeraByte
\li 30 \li 31
\li The value of the \l{Param} has unit \tt {[TB]} \unicode{0x2192} tera byte. \li The value of the \l{Param} has unit \tt {[TB]} \unicode{0x2192} tera byte.
\row \row
\li Types::UnitMilliWatt \li Types::UnitMilliWatt
\li 31 \li 32
\li The value of the \l{Param} has unit \tt {[mW]} \unicode{0x2192} milli watt. \li The value of the \l{Param} has unit \tt {[mW]} \unicode{0x2192} milli watt.
\row \row
\li Types::UnitWatt \li Types::UnitWatt
\li 32 \li 33
\li The value of the \l{Param} has unit \tt {[W]} \unicode{0x2192} watt. \li The value of the \l{Param} has unit \tt {[W]} \unicode{0x2192} watt.
\row \row
\li Types::UnitKiloWatt \li Types::UnitKiloWatt
\li 33 \li 34
\li The value of the \l{Param} has unit \tt {[kW]} \unicode{0x2192} kilo watt. \li The value of the \l{Param} has unit \tt {[kW]} \unicode{0x2192} kilo watt.
\row \row
\li Types::UnitKiloWattHour \li Types::UnitKiloWattHour
\li 34 \li 35
\li The value of the \l{Param} has unit \tt {[kWh]} \unicode{0x2192} kilo watt hour. \li The value of the \l{Param} has unit \tt {[kWh]} \unicode{0x2192} kilo watt hour.
\row \row
\li Types::UnitEuroPerMegaWattHour \li Types::UnitEuroPerMegaWattHour
\li 35 \li 36
\li The value of the \l{Param} has unit \tt {[€/MWh]} \unicode{0x2192} euro per mega watt hour. \li The value of the \l{Param} has unit \tt {[€/MWh]} \unicode{0x2192} euro per mega watt hour.
\row \row
\li Types::UnitPercentage \li Types::UnitPercentage
\li 36 \li 37
\li The value of the \l{Param} has unit \tt {[\%]} \unicode{0x2192} percentage. \li The value of the \l{Param} has unit \tt {[\%]} \unicode{0x2192} percentage.
\row \row
\li Types::UnitPartsPerMillion \li Types::UnitPartsPerMillion
\li 37 \li 38
\li The value of the \l{Param} has unit \tt {[ppm]} \unicode{0x2192} parts per million. \li The value of the \l{Param} has unit \tt {[ppm]} \unicode{0x2192} parts per million.
\row \row
\li Types::UnitEuro \li Types::UnitEuro
\li 38 \li 39
\li The value of the \l{Param} has unit \tt {[€]} \unicode{0x2192} euro. \li The value of the \l{Param} has unit \tt {[€]} \unicode{0x2192} euro.
\row \row
\li Types::UnitDollar \li Types::UnitDollar
\li 39 \li 40
\li The value of the \l{Param} has unit \tt {[\$]} \unicode{0x2192} dollar. \li The value of the \l{Param} has unit \tt {[\$]} \unicode{0x2192} dollar.
\row \row
\li Types::UnitHerz \li Types::UnitHerz
\li 40 \li 41
\li The value of the \l{Param} has unit \tt {[Hz]} \unicode{0x2192} herz. \li The value of the \l{Param} has unit \tt {[Hz]} \unicode{0x2192} herz.
\row \row
\li Types::UnitAmpere \li Types::UnitAmpere
\li 41 \li 42
\li The value of the \l{Param} has unit \tt {[A]} \unicode{0x2192} ampere. \li The value of the \l{Param} has unit \tt {[A]} \unicode{0x2192} ampere.
\row \row
\li Types::UnitMilliAmpere \li Types::UnitMilliAmpere
\li 42 \li 43
\li The value of the \l{Param} has unit \tt {[mA]} \unicode{0x2192} milli ampere. \li The value of the \l{Param} has unit \tt {[mA]} \unicode{0x2192} milli ampere.
\row \row
\li Types::UnitVolt \li Types::UnitVolt
\li 43 \li 44
\li The value of the \l{Param} has unit \tt {[V]} \unicode{0x2192} volt. \li The value of the \l{Param} has unit \tt {[V]} \unicode{0x2192} volt.
\row \row
\li Types::UnitMilliVolt \li Types::UnitMilliVolt
\li 44 \li 45
\li The value of the \l{Param} has unit \tt {[mV]} \unicode{0x2192} milli volt. \li The value of the \l{Param} has unit \tt {[mV]} \unicode{0x2192} milli volt.
\row \row
\li Types::UnitVoltAmpere \li Types::UnitVoltAmpere
\li 45 \li 46
\li The value of the \l{Param} has unit \tt {[VA]} \unicode{0x2192} volt ampere. \li The value of the \l{Param} has unit \tt {[VA]} \unicode{0x2192} volt ampere.
\row \row
\li Types::UnitVoltAmpereReactive \li Types::UnitVoltAmpereReactive
\li 46 \li 47
\li The value of the \l{Param} has unit \tt {[var]} \unicode{0x2192} volt-ampere reactive. \li The value of the \l{Param} has unit \tt {[var]} \unicode{0x2192} volt-ampere reactive.
\row \row
\li Types::UnitAmpereHour \li Types::UnitAmpereHour
\li 47 \li 48
\li The value of the \l{Param} has unit \tt {[Ah]} \unicode{0x2192} ampere hour. \li The value of the \l{Param} has unit \tt {[Ah]} \unicode{0x2192} ampere hour.
\endtable \endtable

View File

@ -2,7 +2,7 @@
GUH_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"') GUH_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"')
# define protocol versions # define protocol versions
JSON_PROTOCOL_VERSION=40 JSON_PROTOCOL_VERSION=41
REST_API_VERSION=1 REST_API_VERSION=1
DEFINES += GUH_VERSION_STRING=\\\"$${GUH_VERSION_STRING}\\\" \ DEFINES += GUH_VERSION_STRING=\\\"$${GUH_VERSION_STRING}\\\" \

View File

@ -40,6 +40,7 @@ class LIBGUH_EXPORT DeviceClass
Q_ENUMS(SetupMethod) Q_ENUMS(SetupMethod)
Q_ENUMS(BasicTag) Q_ENUMS(BasicTag)
Q_ENUMS(DeviceIcon) Q_ENUMS(DeviceIcon)
Q_FLAGS(CreateMethods)
public: public:
enum CreateMethod { enum CreateMethod {
@ -177,4 +178,6 @@ private:
QString m_pairingInfo; QString m_pairingInfo;
}; };
Q_DECLARE_OPERATORS_FOR_FLAGS(DeviceClass::CreateMethods)
#endif #endif

View File

@ -119,7 +119,6 @@ QVariantList StateType::possibleValues() const
return m_possibleValues; return m_possibleValues;
} }
/*! Set the list of possible values of this StateType to \a possibleValues. */ /*! Set the list of possible values of this StateType to \a possibleValues. */
void StateType::setPossibleValues(const QVariantList &possibleValues) void StateType::setPossibleValues(const QVariantList &possibleValues)
{ {

View File

@ -106,6 +106,7 @@ public:
UnitGram, UnitGram,
UnitKiloGram, UnitKiloGram,
UnitDezibel, UnitDezibel,
UnitBpm,
UnitKiloByte, UnitKiloByte,
UnitMegaByte, UnitMegaByte,
UnitGigaByte, UnitGigaByte,