From 1f940576abb3c033e3fb1e3c80ab280b8bb1d84d Mon Sep 17 00:00:00 2001 From: BlueAndi Date: Thu, 2 Jan 2025 11:27:38 +0100 Subject: [PATCH 1/6] New bootloader events added and a lot of other events updated. #13 --- src/framework/core/vscp_core.c | 12 ++ src/framework/core/vscp_core.h | 2 +- src/framework/core/vscp_type_display.h | 6 +- src/framework/core/vscp_type_measurement.h | 153 ++++++++-------- src/framework/core/vscp_type_measurement32.h | 153 ++++++++-------- src/framework/core/vscp_type_measurement64.h | 153 ++++++++-------- src/framework/core/vscp_type_measurezone.h | 153 ++++++++-------- src/framework/core/vscp_type_protocol.h | 47 ++++- src/framework/core/vscp_type_setvaluezone.h | 142 +++++++------- src/framework/events/vscp_evt_display.c | 4 +- src/framework/events/vscp_evt_measurement.c | 20 +- src/framework/events/vscp_evt_measurement.h | 14 +- src/framework/events/vscp_evt_measurement32.c | 20 +- src/framework/events/vscp_evt_measurement32.h | 14 +- src/framework/events/vscp_evt_measurement64.c | 20 +- src/framework/events/vscp_evt_measurement64.h | 14 +- src/framework/events/vscp_evt_measurezone.c | 20 +- src/framework/events/vscp_evt_measurezone.h | 14 +- src/framework/events/vscp_evt_protocol.c | 173 +++++++++--------- src/framework/events/vscp_evt_protocol.h | 60 +++--- src/framework/events/vscp_evt_setvaluezone.c | 14 +- src/framework/events/vscp_evt_setvaluezone.h | 10 +- 22 files changed, 639 insertions(+), 579 deletions(-) diff --git a/src/framework/core/vscp_core.c b/src/framework/core/vscp_core.c index c26b670..91df1d5 100644 --- a/src/framework/core/vscp_core.c +++ b/src/framework/core/vscp_core.c @@ -1551,6 +1551,18 @@ static inline void vscp_core_handleProtocolClassType(void) /* Boot loader specific event. Not supported. */ break; + case VSCP_TYPE_PROTOCOL_BLOCK_CHUNK_ACK: + /* Boot loader specific event. Not supported. */ + break; + + case VSCP_TYPE_PROTOCOL_BLOCK_CHUNK_NACK: + /* Boot loader specific event. Not supported. */ + break; + + case VSCP_TYPE_PROTOCOL_BOOT_LOADER_CHECK: + /* Boot loader specific event. Not supported. */ + break; + /* Not handled type */ default: break; diff --git a/src/framework/core/vscp_core.h b/src/framework/core/vscp_core.h index 7c723ed..584affb 100644 --- a/src/framework/core/vscp_core.h +++ b/src/framework/core/vscp_core.h @@ -102,7 +102,7 @@ extern "C" #define VSCP_CORE_VERSION_STR "v1.13.1" /** VSCP framework version string */ -#define VSCP_CORE_FRAMEWORK_VERSION "v2.0.3" +#define VSCP_CORE_FRAMEWORK_VERSION "v2.1.0" /******************************************************************************* MACROS diff --git a/src/framework/core/vscp_type_display.h b/src/framework/core/vscp_type_display.h index b27d49a..ab21a11 100644 --- a/src/framework/core/vscp_type_display.h +++ b/src/framework/core/vscp_type_display.h @@ -116,12 +116,12 @@ extern "C" /** * This event contains information that should be displayed on LED(s) pointed out by zone/sub-zone. */ -#define VSCP_TYPE_DISPLAY_SHOW_LED 48 +#define VSCP_TYPE_DISPLAY_SET_LED 48 /** - * This event set the color for LED(s) pointed out by zone/sub-zone. + * This event set the color for LED(s) (or similar device) pointed out by zone/sub-zone. */ -#define VSCP_TYPE_DISPLAY_SHOW_LED_COLOR 49 +#define VSCP_TYPE_DISPLAY_SET_COLOR 49 /******************************************************************************* MACROS diff --git a/src/framework/core/vscp_type_measurement.h b/src/framework/core/vscp_type_measurement.h index d59e54d..c0437dd 100644 --- a/src/framework/core/vscp_type_measurement.h +++ b/src/framework/core/vscp_type_measurement.h @@ -70,179 +70,179 @@ extern "C" /** * General Event. */ -#define VSCP_TYPE_MEASUREMENT_GENERAL 0 +#define VSCP_TYPE_MEASUREMENT_GENERAL 0 /** * This is a discrete value typical for a count. There is no unit for this measurement just a discrete * value. */ -#define VSCP_TYPE_MEASUREMENT_COUNT 1 +#define VSCP_TYPE_MEASUREMENT_COUNT 1 /** * Default unit: Meter. * This is a measurement of a length or a distance. */ -#define VSCP_TYPE_MEASUREMENT_LENGTH 2 +#define VSCP_TYPE_MEASUREMENT_LENGTH 2 /** * Default unit: Kilogram. * This is a measurement of a mass. */ -#define VSCP_TYPE_MEASUREMENT_MASS 3 +#define VSCP_TYPE_MEASUREMENT_MASS 3 /** * A time measurement. * Default unit: Seconds. * Opt. unit: (1) Milliseconds. Absolute: (2) y-y-m-d-h-m-s (binary). String: (3) "HHMMSS". */ -#define VSCP_TYPE_MEASUREMENT_TIME 4 +#define VSCP_TYPE_MEASUREMENT_TIME 4 /** * Default unit: Ampere. * This is a measurement of an electric current. */ -#define VSCP_TYPE_MEASUREMENT_ELECTRIC_CURRENT 5 +#define VSCP_TYPE_MEASUREMENT_ELECTRIC_CURRENT 5 /** * Default unit: Kelvin. * Opt. unit: Degree Celsius (1), Fahrenheit (2) * This is a measurement of a temperature. */ -#define VSCP_TYPE_MEASUREMENT_TEMPERATURE 6 +#define VSCP_TYPE_MEASUREMENT_TEMPERATURE 6 /** * Default unit: Mole. * This is a measurement of an amount of a substance. */ -#define VSCP_TYPE_MEASUREMENT_AMOUNT_OF_SUBSTANCE 7 +#define VSCP_TYPE_MEASUREMENT_AMOUNT_OF_SUBSTANCE 7 /** * Default unit: Candela. * This is a measurement of luminous intensity. */ -#define VSCP_TYPE_MEASUREMENT_INTENSITY_OF_LIGHT 8 +#define VSCP_TYPE_MEASUREMENT_INTENSITY_OF_LIGHT 8 /** * Default unit: Hertz. * This is a measurement of regular events during a second. */ -#define VSCP_TYPE_MEASUREMENT_FREQUENCY 9 +#define VSCP_TYPE_MEASUREMENT_FREQUENCY 9 /** * Default unit: becquerel. * Optional unit: curie (1) * This is a measurement of rates of things, which happen randomly, or are unpredictable. */ -#define VSCP_TYPE_MEASUREMENT_RADIOACTIVITY 10 +#define VSCP_TYPE_MEASUREMENT_RADIOACTIVITY 10 /** * Default unit: newton. * This is a measurement of force. */ -#define VSCP_TYPE_MEASUREMENT_FORCE 11 +#define VSCP_TYPE_MEASUREMENT_FORCE 11 /** * Default unit: pascal. * Opt. unit: bar (1), psi (2) * This is a measurement of pressure. */ -#define VSCP_TYPE_MEASUREMENT_PRESSURE 12 +#define VSCP_TYPE_MEASUREMENT_PRESSURE 12 /** * Default unit: Joule. * Optional unit: KWh (1), Wh(2) * This is a measurement of energy. */ -#define VSCP_TYPE_MEASUREMENT_ENERGY 13 +#define VSCP_TYPE_MEASUREMENT_ENERGY 13 /** * Default unit: watt. * Optional unit: Horse power (1). * This is a measurement of power. */ -#define VSCP_TYPE_MEASUREMENT_POWER 14 +#define VSCP_TYPE_MEASUREMENT_POWER 14 /** * Default unit: coulomb. * This is a measurement electrical charge. */ -#define VSCP_TYPE_MEASUREMENT_ELECTRICAL_CHARGE 15 +#define VSCP_TYPE_MEASUREMENT_ELECTRICAL_CHARGE 15 /** * Default unit: volt. * This is a measurement of electrical potential. */ -#define VSCP_TYPE_MEASUREMENT_ELECTRICAL_POTENTIAL 16 +#define VSCP_TYPE_MEASUREMENT_ELECTRICAL_POTENTIAL 16 /** * Default unit: farad (F). * This is a measurement of electric capacitance. */ -#define VSCP_TYPE_MEASUREMENT_ELECTRICAL_CAPACITANCE 17 +#define VSCP_TYPE_MEASUREMENT_ELECTRICAL_CAPACITANCE 17 /** * Default unit: ohm (Ω). * This is a measurement of resistance. */ -#define VSCP_TYPE_MEASUREMENT_ELECTRICAL_RESISTANCE 18 +#define VSCP_TYPE_MEASUREMENT_ELECTRICAL_RESISTANCE 18 /** * Default unit: siemens. * This is a measurement of electrical conductance. */ -#define VSCP_TYPE_MEASUREMENT_ELECTRICAL_CONDUCTANCE 19 +#define VSCP_TYPE_MEASUREMENT_ELECTRICAL_CONDUCTANCE 19 /** * Default unit: amperes per meter (H). * Optional units: teslas (B) (1) * This is a measurement of magnetic field strength. */ -#define VSCP_TYPE_MEASUREMENT_MAGNETIC_FIELD_STRENGTH 20 +#define VSCP_TYPE_MEASUREMENT_MAGNETIC_FIELD_STRENGTH 20 /** * Default unit: weber (Wb). * This is a measurement of magnetic flux. */ -#define VSCP_TYPE_MEASUREMENT_MAGNETIC_FLUX 21 +#define VSCP_TYPE_MEASUREMENT_MAGNETIC_FLUX 21 /** * Default unit: tesla (B). + * Optional units: Gauss (1) * This is a measurement of flux density or field strength for magnetic fields (also called the * magnetic induction). */ -#define VSCP_TYPE_MEASUREMENT_MAGNETIC_FLUX_DENSITY 22 +#define VSCP_TYPE_MEASUREMENT_MAGNETIC_FLUX_DENSITY 22 /** * Default unit: henry (H). * This is a measurement of inductance. */ -#define VSCP_TYPE_MEASUREMENT_INDUCTANCE 23 +#define VSCP_TYPE_MEASUREMENT_INDUCTANCE 23 /** * Default unit: Lumen (lm= cd * sr) * This is a measurement of luminous Flux. */ -#define VSCP_TYPE_MEASUREMENT_FLUX_OF_LIGHT 24 +#define VSCP_TYPE_MEASUREMENT_FLUX_OF_LIGHT 24 /** * Default unit: lux (lx) ( lx = lm / m² ) * This is used to express both Illuminance (incidence of light) and Luminous Emittance (emission of * light). */ -#define VSCP_TYPE_MEASUREMENT_ILLUMINANCE 25 +#define VSCP_TYPE_MEASUREMENT_ILLUMINANCE 25 /** * Default unit: gray (Gy). - * Opt unit: sievert (Sv) (1). * This is a measurement of a radiation dose (Absorbed dose of ionizing radiation). */ -#define VSCP_TYPE_MEASUREMENT_RADIATION_DOSE 26 +#define VSCP_TYPE_MEASUREMENT_RADIATION_DOSE_ABSORBED 26 /** - * Default unit: katal (z). + * Default unit: katal (kat). * This is a measurement of catalytic activity used in biochemistry. */ -#define VSCP_TYPE_MEASUREMENT_CATALYTIC_ACITIVITY 27 +#define VSCP_TYPE_MEASUREMENT_CATALYTIC_ACITIVITY 27 /** * Default unit: cubic meter (m³) @@ -250,13 +250,13 @@ extern "C" * where unit 4 is only available for Level II measurement events where units can hold this value. * This is a measurement of volume. */ -#define VSCP_TYPE_MEASUREMENT_VOLUME 28 +#define VSCP_TYPE_MEASUREMENT_VOLUME 28 /** * Default unit: W/m2, watt per square meter. * This is a measurement of sound intensity (acoustic intensity). */ -#define VSCP_TYPE_MEASUREMENT_SOUND_INTENSITY 29 +#define VSCP_TYPE_MEASUREMENT_SOUND_INTENSITY 29 /** * Default unit: radian (rad) (Plane angles). @@ -265,162 +265,163 @@ extern "C" * Opt Unit: arcseconds (3). * This is a measurement of an angle or a direction or similar. */ -#define VSCP_TYPE_MEASUREMENT_ANGLE 30 +#define VSCP_TYPE_MEASUREMENT_ANGLE 30 /** * Default unit: Longitude. * Opt. unit: Latitude. - * This is a measurement of a position as of WGS 84. Normally given as a floating point value. See - * ./class1.gps.md for a better candidate to use for position data. + * This is a (decimal) measurement of a position as of WGS 84. Normally given as a floating point + * value. See ./class1.gps.md for a better candidate to use for position data. */ -#define VSCP_TYPE_MEASUREMENT_POSITION 31 +#define VSCP_TYPE_MEASUREMENT_POSITION 31 /** * Default unit: Meters per second. * Optional unit: Kilometers per hour (1) Miles per hour (2) * This is a measurement of a speed. */ -#define VSCP_TYPE_MEASUREMENT_SPEED 32 +#define VSCP_TYPE_MEASUREMENT_SPEED 32 /** * Default unit: Meters per second/second (m/s2). * This is a measurement of acceleration. */ -#define VSCP_TYPE_MEASUREMENT_ACCELERATION 33 +#define VSCP_TYPE_MEASUREMENT_ACCELERATION 33 /** * Default unit: N/m. * This is a measurement of tension. */ -#define VSCP_TYPE_MEASUREMENT_TENSION 34 +#define VSCP_TYPE_MEASUREMENT_TENSION 34 /** * Default unit: Relative percentage 0-100%. * This is a measurement of relative moistness (Humidity). */ -#define VSCP_TYPE_MEASUREMENT_HUMIDITY 35 +#define VSCP_TYPE_MEASUREMENT_HUMIDITY 35 /** * Default unit: Cubic meters/second. * Opt Unit: Liters/Second. * This is a measurement of flow. */ -#define VSCP_TYPE_MEASUREMENT_FLOW 36 +#define VSCP_TYPE_MEASUREMENT_FLOW 36 /** * Default unit: Thermal ohm K/W. * This is a measurement of thermal resistance. */ -#define VSCP_TYPE_MEASUREMENT_THERMAL_RESISTANCE 37 +#define VSCP_TYPE_MEASUREMENT_THERMAL_RESISTANCE 37 /** * Default unit: dioptre (dpt) m-1. * This is a measurement of refractive (optical) power. */ -#define VSCP_TYPE_MEASUREMENT_REFRACTIVE_POWER 38 +#define VSCP_TYPE_MEASUREMENT_REFRACTIVE_POWER 38 /** - * Default unit: poiseuille (Pl) + * Default unit: pascal second + * Optional units: poiseuille (Pl) = 1, poise (P) = 2 * This is a measurement of dynamic viscosity. */ -#define VSCP_TYPE_MEASUREMENT_DYNAMIC_VISCOSITY 39 +#define VSCP_TYPE_MEASUREMENT_DYNAMIC_VISCOSITY 39 /** * Default unit: rayl (Pa·s/m) * This is a measurement of sound impedance. */ -#define VSCP_TYPE_MEASUREMENT_SOUND_IMPEDANCE 40 +#define VSCP_TYPE_MEASUREMENT_SOUND_IMPEDANCE 40 /** * Default unit: Acoustic ohm Pa · s/ m³. * This is a measurement of sound resistance. */ -#define VSCP_TYPE_MEASUREMENT_SOUND_RESISTANCE 41 +#define VSCP_TYPE_MEASUREMENT_SOUND_RESISTANCE 41 /** * Default unit: daraf (f-1). * This is a measurement of electric elasticity. */ -#define VSCP_TYPE_MEASUREMENT_ELECTRIC_ELASTANCE 42 +#define VSCP_TYPE_MEASUREMENT_ELECTRIC_ELASTANCE 42 /** * Default unit: talbot ( tb = lm * s) * This is a measurement of luminous energy. */ -#define VSCP_TYPE_MEASUREMENT_LUMINOUS_ENERGY 43 +#define VSCP_TYPE_MEASUREMENT_LUMINOUS_ENERGY 43 /** * Default unit: cd / m²) (non SI unit = nit) * This is a measurement of luminance. */ -#define VSCP_TYPE_MEASUREMENT_LUMINANCE 44 +#define VSCP_TYPE_MEASUREMENT_LUMINANCE 44 /** - * Default unit: molal (mol/kg). - * This is a measurement of chemical concentration. + * Default unit: mol/m³. + * This is a measurement of chemical mol/ppm/percent concentration. */ -#define VSCP_TYPE_MEASUREMENT_CHEMICAL_CONCENTRATION 45 +#define VSCP_TYPE_MEASUREMENT_CHEMICAL_CONCENTRATION_MOLAR 45 /** - * Reserved (previously was doublet of Type= 26, don't use any longer!) + * Default unit: mol/m³. + * This is a measurement of chemical mass concentration. */ -#define VSCP_TYPE_MEASUREMENT_RESERVED46 46 +#define VSCP_TYPE_MEASUREMENT_CHEMICAL_CONCENTRATION_MASS 46 /** - * Default unit: sievert (J/Kg). - * This is a measurement of dose equivalent. + * Reserved. */ -#define VSCP_TYPE_MEASUREMENT_DOSE_EQVIVALENT 47 +#define VSCP_TYPE_MEASUREMENT_RESERVED47 47 /** * Reserved (was doublet of Type= 24, do not use any longer!) */ -#define VSCP_TYPE_MEASUREMENT_RESERVED48 48 +#define VSCP_TYPE_MEASUREMENT_RESERVED48 48 /** * Default unit: Kelvin. * Opt. unit: Degree Celsius (1), Fahrenheit (2) * This is a measurement of the Dew Point. */ -#define VSCP_TYPE_MEASUREMENT_DEWPOINT 49 +#define VSCP_TYPE_MEASUREMENT_DEWPOINT 49 /** * Default unit: Relative value. * This is a relative value for a level measurement without a unit. It is just relative to the min/max * value for the selected data representation, typically percentage or per mille or similar. */ -#define VSCP_TYPE_MEASUREMENT_RELATIVE_LEVEL 50 +#define VSCP_TYPE_MEASUREMENT_RELATIVE_LEVEL 50 /** * Default unit: Meter. * Opt. unit: Feet(1), inches (2) * Altitude in meters. */ -#define VSCP_TYPE_MEASUREMENT_ALTITUDE 51 +#define VSCP_TYPE_MEASUREMENT_ALTITUDE 51 /** * Default unit: square meter (m²) * Area in square meter. */ -#define VSCP_TYPE_MEASUREMENT_AREA 52 +#define VSCP_TYPE_MEASUREMENT_AREA 52 /** * Default unit: watt per steradian ( W / sr ) * Radiated power per room angle. */ -#define VSCP_TYPE_MEASUREMENT_RADIANT_INTENSITY 53 +#define VSCP_TYPE_MEASUREMENT_RADIANT_INTENSITY 53 /** * Default unit: watt per steradian per square metre ( W / (sr * m²) ) * This is the radiant flux emitted, reflected, transmitted or received by a surface. */ -#define VSCP_TYPE_MEASUREMENT_RADIANCE 54 +#define VSCP_TYPE_MEASUREMENT_RADIANCE 54 /** * Default unit: watt per square metre ( W / m² ) * Power emitted from or striking onto a surface or area. */ -#define VSCP_TYPE_MEASUREMENT_IRRADIANCE 55 +#define VSCP_TYPE_MEASUREMENT_IRRADIANCE 55 /** * Default unit: watt per steradian per square metre per nm (W·sr-1·m-2·nm-1) @@ -428,46 +429,46 @@ extern "C" * hertz (W·sr-1·m-3) (2) * Radiance of a surface per unit frequency or wavelength. */ -#define VSCP_TYPE_MEASUREMENT_SPECTRAL_RADIANCE 56 +#define VSCP_TYPE_MEASUREMENT_SPECTRAL_RADIANCE 56 /** * Default unit: watt per square metre per nm (W·m-2·nm-1) * Opt. unit: watt per metre3 (W·m-3) (1), watt per square metre per hertz (W·m-2·Hz-1) (2) * Irradiance of a surface per unit frequency or wavelength. */ -#define VSCP_TYPE_MEASUREMENT_SPECTRAL_IRRADIANCE 57 +#define VSCP_TYPE_MEASUREMENT_SPECTRAL_IRRADIANCE 57 /** * Default unit: pascal (Pa) * This is a measurement of sound pressure (acoustic pressure). */ -#define VSCP_TYPE_MEASUREMENT_SOUND_PRESSURE 58 +#define VSCP_TYPE_MEASUREMENT_SOUND_PRESSURE 58 /** * Default unit: pascal (Pa) * Sound energy density or sound density is the sound energy per unit volume. */ -#define VSCP_TYPE_MEASUREMENT_SOUND_DENSITY 59 +#define VSCP_TYPE_MEASUREMENT_SOUND_DENSITY 59 /** * Default unit: decibel (dB) * Sound level expressed in decibel. This event is supplied for convenience. */ -#define VSCP_TYPE_MEASUREMENT_SOUND_LEVEL 60 +#define VSCP_TYPE_MEASUREMENT_SOUND_LEVEL 60 /** * Default unit: sievert (Sv). * Optional unit rem (1) * This is a measurement of a radiation dose (Equivalent dose of ionizing radiation). */ -#define VSCP_TYPE_MEASUREMENT_RADIATION_DOSE_EQ 61 +#define VSCP_TYPE_MEASUREMENT_RADIATION_DOSE_EQ 61 /** * Default unit: coulomb per kilogram (C/kg). * Optional unit: Röntgen/R (1) * This is a measurement of a radiation dose (Exposed dose of ionizing radiation). */ -#define VSCP_TYPE_MEASUREMENT_RADIATION_DOSE_EXPOSURE 62 +#define VSCP_TYPE_MEASUREMENT_RADIATION_DOSE_EXPOSURE 62 /** * Default unit: cos of phase angle. @@ -475,7 +476,7 @@ extern "C" * usually expressed as a percentage - and the lower the percentage, the less efficient power usage * is. */ -#define VSCP_TYPE_MEASUREMENT_POWER_FACTOR 63 +#define VSCP_TYPE_MEASUREMENT_POWER_FACTOR 63 /** * Default unit: VAr @@ -483,14 +484,14 @@ extern "C" * measurement of reactive power. Reactive power exists in AC circuit when the current and voltage are * not in phase. */ -#define VSCP_TYPE_MEASUREMENT_REACTIVE_POWER 64 +#define VSCP_TYPE_MEASUREMENT_REACTIVE_POWER 64 /** * Default unit: kVArh * Reactive energy is the electrical energy produced, flowing or supplied by an electric circuit * during a time interval, measured in units of kVArh or standard multiples thereof. */ -#define VSCP_TYPE_MEASUREMENT_REACTIVE_ENERGY 65 +#define VSCP_TYPE_MEASUREMENT_REACTIVE_ENERGY 65 /******************************************************************************* MACROS diff --git a/src/framework/core/vscp_type_measurement32.h b/src/framework/core/vscp_type_measurement32.h index 9b00090..b55c89c 100644 --- a/src/framework/core/vscp_type_measurement32.h +++ b/src/framework/core/vscp_type_measurement32.h @@ -69,179 +69,179 @@ extern "C" /** * General Event. */ -#define VSCP_TYPE_MEASUREMENT32_GENERAL 0 +#define VSCP_TYPE_MEASUREMENT32_GENERAL 0 /** * This is a discrete value typical for a count. There is no unit for this measurement just a discrete * value. */ -#define VSCP_TYPE_MEASUREMENT32_COUNT 1 +#define VSCP_TYPE_MEASUREMENT32_COUNT 1 /** * Default unit: Meter. * This is a measurement of a length or a distance. */ -#define VSCP_TYPE_MEASUREMENT32_LENGTH 2 +#define VSCP_TYPE_MEASUREMENT32_LENGTH 2 /** * Default unit: Kilogram. * This is a measurement of a mass. */ -#define VSCP_TYPE_MEASUREMENT32_MASS 3 +#define VSCP_TYPE_MEASUREMENT32_MASS 3 /** * A time measurement. * Default unit: Seconds. * Opt. unit: (1) Milliseconds. Absolute: (2) y-y-m-d-h-m-s (binary). String: (3) "HHMMSS". */ -#define VSCP_TYPE_MEASUREMENT32_TIME 4 +#define VSCP_TYPE_MEASUREMENT32_TIME 4 /** * Default unit: Ampere. * This is a measurement of an electric current. */ -#define VSCP_TYPE_MEASUREMENT32_ELECTRIC_CURRENT 5 +#define VSCP_TYPE_MEASUREMENT32_ELECTRIC_CURRENT 5 /** * Default unit: Kelvin. * Opt. unit: Degree Celsius (1), Fahrenheit (2) * This is a measurement of a temperature. */ -#define VSCP_TYPE_MEASUREMENT32_TEMPERATURE 6 +#define VSCP_TYPE_MEASUREMENT32_TEMPERATURE 6 /** * Default unit: Mole. * This is a measurement of an amount of a substance. */ -#define VSCP_TYPE_MEASUREMENT32_AMOUNT_OF_SUBSTANCE 7 +#define VSCP_TYPE_MEASUREMENT32_AMOUNT_OF_SUBSTANCE 7 /** * Default unit: Candela. * This is a measurement of luminous intensity. */ -#define VSCP_TYPE_MEASUREMENT32_INTENSITY_OF_LIGHT 8 +#define VSCP_TYPE_MEASUREMENT32_INTENSITY_OF_LIGHT 8 /** * Default unit: Hertz. * This is a measurement of regular events during a second. */ -#define VSCP_TYPE_MEASUREMENT32_FREQUENCY 9 +#define VSCP_TYPE_MEASUREMENT32_FREQUENCY 9 /** * Default unit: becquerel. * Optional unit: curie (1) * This is a measurement of rates of things, which happen randomly, or are unpredictable. */ -#define VSCP_TYPE_MEASUREMENT32_RADIOACTIVITY 10 +#define VSCP_TYPE_MEASUREMENT32_RADIOACTIVITY 10 /** * Default unit: newton. * This is a measurement of force. */ -#define VSCP_TYPE_MEASUREMENT32_FORCE 11 +#define VSCP_TYPE_MEASUREMENT32_FORCE 11 /** * Default unit: pascal. * Opt. unit: bar (1), psi (2) * This is a measurement of pressure. */ -#define VSCP_TYPE_MEASUREMENT32_PRESSURE 12 +#define VSCP_TYPE_MEASUREMENT32_PRESSURE 12 /** * Default unit: Joule. * Optional unit: KWh (1) * This is a measurement of energy. */ -#define VSCP_TYPE_MEASUREMENT32_ENERGY 13 +#define VSCP_TYPE_MEASUREMENT32_ENERGY 13 /** * Default unit: watt. * Optional unit: Horse power (1). * This is a measurement of power. */ -#define VSCP_TYPE_MEASUREMENT32_POWER 14 +#define VSCP_TYPE_MEASUREMENT32_POWER 14 /** * Default unit: coulomb. * This is a measurement electrical charge. */ -#define VSCP_TYPE_MEASUREMENT32_ELECTRICAL_CHARGE 15 +#define VSCP_TYPE_MEASUREMENT32_ELECTRICAL_CHARGE 15 /** * Default unit: volt. * This is a measurement of electrical potential. */ -#define VSCP_TYPE_MEASUREMENT32_ELECTRICAL_POTENTIAL 16 +#define VSCP_TYPE_MEASUREMENT32_ELECTRICAL_POTENTIAL 16 /** * Default unit: farad (F). * This is a measurement of electric capacitance. */ -#define VSCP_TYPE_MEASUREMENT32_ELECTRICAL_CAPACITANCE 17 +#define VSCP_TYPE_MEASUREMENT32_ELECTRICAL_CAPACITANCE 17 /** * Default unit: ohm (Ω). * This is a measurement of resistance. */ -#define VSCP_TYPE_MEASUREMENT32_ELECTRICAL_RESISTANCE 18 +#define VSCP_TYPE_MEASUREMENT32_ELECTRICAL_RESISTANCE 18 /** * Default unit: siemens. * This is a measurement of electrical conductance. */ -#define VSCP_TYPE_MEASUREMENT32_ELECTRICAL_CONDUCTANCE 19 +#define VSCP_TYPE_MEASUREMENT32_ELECTRICAL_CONDUCTANCE 19 /** * Default unit: amperes per meter (H). * Optional units: teslas (B) (1) * This is a measurement of magnetic field strength. */ -#define VSCP_TYPE_MEASUREMENT32_MAGNETIC_FIELD_STRENGTH 20 +#define VSCP_TYPE_MEASUREMENT32_MAGNETIC_FIELD_STRENGTH 20 /** * Default unit: weber (Wb). * This is a measurement of magnetic flux. */ -#define VSCP_TYPE_MEASUREMENT32_MAGNETIC_FLUX 21 +#define VSCP_TYPE_MEASUREMENT32_MAGNETIC_FLUX 21 /** * Default unit: tesla (B). + * Optional units: Gauss (1) * This is a measurement of flux density or field strength for magnetic fields (also called the * magnetic induction). */ -#define VSCP_TYPE_MEASUREMENT32_MAGNETIC_FLUX_DENSITY 22 +#define VSCP_TYPE_MEASUREMENT32_MAGNETIC_FLUX_DENSITY 22 /** * Default unit: henry (H). * This is a measurement of inductance. */ -#define VSCP_TYPE_MEASUREMENT32_INDUCTANCE 23 +#define VSCP_TYPE_MEASUREMENT32_INDUCTANCE 23 /** * Default unit: Lumen (lm= cd * sr) * This is a measurement of luminous Flux. */ -#define VSCP_TYPE_MEASUREMENT32_FLUX_OF_LIGHT 24 +#define VSCP_TYPE_MEASUREMENT32_FLUX_OF_LIGHT 24 /** * Default unit: lux (lx) ( lx = lm / m² ) * This is used to express both Illuminance (incidence of light) and Luminous Emittance (emission of * light). */ -#define VSCP_TYPE_MEASUREMENT32_ILLUMINANCE 25 +#define VSCP_TYPE_MEASUREMENT32_ILLUMINANCE 25 /** * Default unit: gray (Gy). - * Opt unit: sievert (Sv) (1). * This is a measurement of a radiation dose (Absorbed dose of ionizing radiation). */ -#define VSCP_TYPE_MEASUREMENT32_RADIATION_DOSE 26 +#define VSCP_TYPE_MEASUREMENT32_RADIATION_DOSE_ABSORBED 26 /** - * Default unit: katal (z). + * Default unit: katal (kat). * This is a measurement of catalytic activity used in biochemistry. */ -#define VSCP_TYPE_MEASUREMENT32_CATALYTIC_ACITIVITY 27 +#define VSCP_TYPE_MEASUREMENT32_CATALYTIC_ACITIVITY 27 /** * Default unit: cubic meter (m³) @@ -249,13 +249,13 @@ extern "C" * where unit 4 is only available for Level II measurement events where units can hold this value. * This is a measurement of volume. */ -#define VSCP_TYPE_MEASUREMENT32_VOLUME 28 +#define VSCP_TYPE_MEASUREMENT32_VOLUME 28 /** * Default unit: W/m2, watt per square meter. * This is a measurement of sound intensity (acoustic intensity). */ -#define VSCP_TYPE_MEASUREMENT32_SOUND_INTENSITY 29 +#define VSCP_TYPE_MEASUREMENT32_SOUND_INTENSITY 29 /** * Default unit: radian (rad) (Plane angles). @@ -264,162 +264,163 @@ extern "C" * Opt Unit: arcseconds (3). * This is a measurement of an angle. */ -#define VSCP_TYPE_MEASUREMENT32_ANGLE 30 +#define VSCP_TYPE_MEASUREMENT32_ANGLE 30 /** * Default unit: Longitude. * Opt. unit: Latitude. - * This is a measurement of a position as of WGS 84. Normally given as a floating point value. See - * ./class1.gps.md for a better candidate to use for position data. + * This is a (decimal) measurement of a position as of WGS 84. Normally given as a floating point + * value. See ./class1.gps.md for a better candidate to use for position data. */ -#define VSCP_TYPE_MEASUREMENT32_POSITION 31 +#define VSCP_TYPE_MEASUREMENT32_POSITION 31 /** * Default unit: Meters per second. * Optional unit: Kilometers per hour (1) Miles per hour (2) * This is a measurement of a speed. */ -#define VSCP_TYPE_MEASUREMENT32_SPEED 32 +#define VSCP_TYPE_MEASUREMENT32_SPEED 32 /** * Default unit: Meters per second/second (m/s2). * This is a measurement of acceleration. */ -#define VSCP_TYPE_MEASUREMENT32_ACCELERATION 33 +#define VSCP_TYPE_MEASUREMENT32_ACCELERATION 33 /** * Default unit: N/m. * This is a measurement of tension. */ -#define VSCP_TYPE_MEASUREMENT32_TENSION 34 +#define VSCP_TYPE_MEASUREMENT32_TENSION 34 /** * Default unit: Relative percentage 0-100%. * This is a measurement of relative moistness (Humidity). */ -#define VSCP_TYPE_MEASUREMENT32_HUMIDITY 35 +#define VSCP_TYPE_MEASUREMENT32_HUMIDITY 35 /** * Default unit: Cubic meters/second. * Opt Unit: Liters/Second. * This is a measurement of flow. */ -#define VSCP_TYPE_MEASUREMENT32_FLOW 36 +#define VSCP_TYPE_MEASUREMENT32_FLOW 36 /** * Default unit: Thermal ohm K/W. * This is a measurement of thermal resistance. */ -#define VSCP_TYPE_MEASUREMENT32_THERMAL_RESISTANCE 37 +#define VSCP_TYPE_MEASUREMENT32_THERMAL_RESISTANCE 37 /** * Default unit: dioptre (dpt) m-1. * This is a measurement of refractive (optical) power. */ -#define VSCP_TYPE_MEASUREMENT32_REFRACTIVE_POWER 38 +#define VSCP_TYPE_MEASUREMENT32_REFRACTIVE_POWER 38 /** - * Default unit: poiseuille (Pl) + * Default unit: pascal second + * Optional units: poiseuille (Pl) = 1, poise (P) = 2 * This is a measurement of dynamic viscosity. */ -#define VSCP_TYPE_MEASUREMENT32_DYNAMIC_VISCOSITY 39 +#define VSCP_TYPE_MEASUREMENT32_DYNAMIC_VISCOSITY 39 /** * Default unit: rayl (Pa·s/m) * This is a measurement of sound impedance. */ -#define VSCP_TYPE_MEASUREMENT32_SOUND_IMPEDANCE 40 +#define VSCP_TYPE_MEASUREMENT32_SOUND_IMPEDANCE 40 /** * Default unit: Acoustic ohm Pa · s/ m³. * This is a measurement of sound resistance. */ -#define VSCP_TYPE_MEASUREMENT32_SOUND_RESISTANCE 41 +#define VSCP_TYPE_MEASUREMENT32_SOUND_RESISTANCE 41 /** * Default unit: daraf (f-1). * This is a measurement of electric elasticity. */ -#define VSCP_TYPE_MEASUREMENT32_ELECTRIC_ELASTANCE 42 +#define VSCP_TYPE_MEASUREMENT32_ELECTRIC_ELASTANCE 42 /** * Default unit: talbot ( tb = lm * s) * This is a measurement of luminous energy. */ -#define VSCP_TYPE_MEASUREMENT32_LUMINOUS_ENERGY 43 +#define VSCP_TYPE_MEASUREMENT32_LUMINOUS_ENERGY 43 /** * Default unit: cd / m²) (non SI unit = nit) * This is a measurement of luminance. */ -#define VSCP_TYPE_MEASUREMENT32_LUMINANCE 44 +#define VSCP_TYPE_MEASUREMENT32_LUMINANCE 44 /** - * Default unit: molal (mol/kg). - * This is a measurement of chemical concentration. + * Default unit: mol/m³. + * This is a measurement of chemical mol/ppm/percent concentration. */ -#define VSCP_TYPE_MEASUREMENT32_CHEMICAL_CONCENTRATION 45 +#define VSCP_TYPE_MEASUREMENT32_CHEMICAL_CONCENTRATION_MOLAR 45 /** - * Reserved (previously was doublet of Type= 26, don't use any longer!) + * Default unit: mol/m³. + * This is a measurement of chemical mass concentration. */ -#define VSCP_TYPE_MEASUREMENT32_RESERVED46 46 +#define VSCP_TYPE_MEASUREMENT32_CHEMICAL_CONCENTRATION_MASS 46 /** - * Default unit: sievert (J/Kg). - * This is a measurement of dose equivalent. + * Reserved. */ -#define VSCP_TYPE_MEASUREMENT32_DOSE_EQVIVALENT 47 +#define VSCP_TYPE_MEASUREMENT32_RESERVED47 47 /** * Reserved (was doublet of Type= 24, do not use any longer!) */ -#define VSCP_TYPE_MEASUREMENT32_RESERVED48 48 +#define VSCP_TYPE_MEASUREMENT32_RESERVED48 48 /** * Default unit: Kelvin. * Opt. unit: Degree Celsius (1), Fahrenheit (2) * This is a measurement of the Dew Point. */ -#define VSCP_TYPE_MEASUREMENT32_DEWPOINT 49 +#define VSCP_TYPE_MEASUREMENT32_DEWPOINT 49 /** * Default unit: Relative value. * This is a relative value for a level measurement without a unit. It is just relative to the min/max * value for the selected data representation, typically percentage or per mille or similar. */ -#define VSCP_TYPE_MEASUREMENT32_RELATIVE_LEVEL 50 +#define VSCP_TYPE_MEASUREMENT32_RELATIVE_LEVEL 50 /** * Default unit: Meter. * Opt. unit: Feet(1), inches (2) * Altitude in meters. */ -#define VSCP_TYPE_MEASUREMENT32_ALTITUDE 51 +#define VSCP_TYPE_MEASUREMENT32_ALTITUDE 51 /** * Default unit: square meter (m²) * Area in square meter. */ -#define VSCP_TYPE_MEASUREMENT32_AREA 52 +#define VSCP_TYPE_MEASUREMENT32_AREA 52 /** * Default unit: watt per steradian ( W / sr ) * Radiated power per room angle. */ -#define VSCP_TYPE_MEASUREMENT32_RADIANT_INTENSITY 53 +#define VSCP_TYPE_MEASUREMENT32_RADIANT_INTENSITY 53 /** * Default unit: watt per steradian per square metre ( W / (sr * m²) ) * This is the radiant flux emitted, reflected, transmitted or received by a surface. */ -#define VSCP_TYPE_MEASUREMENT32_RADIANCE 54 +#define VSCP_TYPE_MEASUREMENT32_RADIANCE 54 /** * Default unit: watt per square metre ( W / m² ) * Power emitted from or striking onto a surface or area. */ -#define VSCP_TYPE_MEASUREMENT32_IRRADIANCE 55 +#define VSCP_TYPE_MEASUREMENT32_IRRADIANCE 55 /** * Default unit: watt per steradian per square metre per nm (W·sr-1·m-2·nm-1) @@ -427,46 +428,46 @@ extern "C" * hertz (W·sr-1·m-3) (2) * Radiance of a surface per unit frequency or wavelength. */ -#define VSCP_TYPE_MEASUREMENT32_SPECTRAL_RADIANCE 56 +#define VSCP_TYPE_MEASUREMENT32_SPECTRAL_RADIANCE 56 /** * Default unit: watt per square metre per nm (W·m-2·nm-1) * Opt. unit: watt per metre3 (W·m-3) (1), watt per square metre per hertz (W·m-2·Hz-1) (2) * Irradiance of a surface per unit frequency or wavelength. */ -#define VSCP_TYPE_MEASUREMENT32_SPECTRAL_IRRADIANCE 57 +#define VSCP_TYPE_MEASUREMENT32_SPECTRAL_IRRADIANCE 57 /** * Default unit: pascal (Pa) * This is a measurement of sound pressure (acoustic pressure). */ -#define VSCP_TYPE_MEASUREMENT32_SOUND_PRESSURE 58 +#define VSCP_TYPE_MEASUREMENT32_SOUND_PRESSURE 58 /** * Default unit: pascal (Pa) * Sound energy density or sound density is the sound energy per unit volume. */ -#define VSCP_TYPE_MEASUREMENT32_SOUND_DENSITY 59 +#define VSCP_TYPE_MEASUREMENT32_SOUND_DENSITY 59 /** * Default unit: decibel (dB) * Sound level expressed in decibel. This event is supplied for convenience. */ -#define VSCP_TYPE_MEASUREMENT32_SOUND_LEVEL 60 +#define VSCP_TYPE_MEASUREMENT32_SOUND_LEVEL 60 /** * Default unit: sievert (Sv). * Optional unit rem (1) * This is a measurement of a radiation dose (Equivalent dose of ionizing radiation). */ -#define VSCP_TYPE_MEASUREMENT32_RADIATION_DOSE_EQ 61 +#define VSCP_TYPE_MEASUREMENT32_RADIATION_DOSE_EQ 61 /** * Default unit: coulomb per kilogram (C/kg). * Optional unit: Röntgen/R (1) * This is a measurement of a radiation dose (Exposed dose of ionizing radiation). */ -#define VSCP_TYPE_MEASUREMENT32_RADIATION_DOSE_EXPOSURE 62 +#define VSCP_TYPE_MEASUREMENT32_RADIATION_DOSE_EXPOSURE 62 /** * Default unit: cos of phase angle. @@ -474,7 +475,7 @@ extern "C" * usually expressed as a percentage - and the lower the percentage, the less efficient power usage * is. */ -#define VSCP_TYPE_MEASUREMENT32_POWER_FACTOR 63 +#define VSCP_TYPE_MEASUREMENT32_POWER_FACTOR 63 /** * Default unit: VAr @@ -482,14 +483,14 @@ extern "C" * measurement of reactive power. Reactive power exists in AC circuit when the current and voltage are * not in phase. */ -#define VSCP_TYPE_MEASUREMENT32_REACTIVE_POWER 64 +#define VSCP_TYPE_MEASUREMENT32_REACTIVE_POWER 64 /** * Default unit: kVArh * Reactive energy is the electrical energy produced, flowing or supplied by an electric circuit * during a time interval, measured in units of kVArh or standard multiples thereof. */ -#define VSCP_TYPE_MEASUREMENT32_REACTIVE_ENERGY 65 +#define VSCP_TYPE_MEASUREMENT32_REACTIVE_ENERGY 65 /******************************************************************************* MACROS diff --git a/src/framework/core/vscp_type_measurement64.h b/src/framework/core/vscp_type_measurement64.h index 7a61404..d446187 100644 --- a/src/framework/core/vscp_type_measurement64.h +++ b/src/framework/core/vscp_type_measurement64.h @@ -69,179 +69,179 @@ extern "C" /** * General Event. */ -#define VSCP_TYPE_MEASUREMENT64_GENERAL 0 +#define VSCP_TYPE_MEASUREMENT64_GENERAL 0 /** * This is a discrete value typical for a count. There is no unit for this measurement just a discrete * value. */ -#define VSCP_TYPE_MEASUREMENT64_COUNT 1 +#define VSCP_TYPE_MEASUREMENT64_COUNT 1 /** * Default unit: Meter. * This is a measurement of a length or a distance. */ -#define VSCP_TYPE_MEASUREMENT64_LENGTH 2 +#define VSCP_TYPE_MEASUREMENT64_LENGTH 2 /** * Default unit: Kilogram. * This is a measurement of a mass. */ -#define VSCP_TYPE_MEASUREMENT64_MASS 3 +#define VSCP_TYPE_MEASUREMENT64_MASS 3 /** * A time measurement. * Default unit: Seconds. * Opt. unit: (1) Milliseconds. Absolute: (2) y-y-m-d-h-m-s (binary). String: (3) "HHMMSS". */ -#define VSCP_TYPE_MEASUREMENT64_TIME 4 +#define VSCP_TYPE_MEASUREMENT64_TIME 4 /** * Default unit: Ampere. * This is a measurement of an electric current. */ -#define VSCP_TYPE_MEASUREMENT64_ELECTRIC_CURRENT 5 +#define VSCP_TYPE_MEASUREMENT64_ELECTRIC_CURRENT 5 /** * Default unit: Kelvin. * Opt. unit: Degree Celsius (1), Fahrenheit (2) * This is a measurement of a temperature. */ -#define VSCP_TYPE_MEASUREMENT64_TEMPERATURE 6 +#define VSCP_TYPE_MEASUREMENT64_TEMPERATURE 6 /** * Default unit: Mole. * This is a measurement of an amount of a substance. */ -#define VSCP_TYPE_MEASUREMENT64_AMOUNT_OF_SUBSTANCE 7 +#define VSCP_TYPE_MEASUREMENT64_AMOUNT_OF_SUBSTANCE 7 /** * Default unit: Candela. * This is a measurement of luminous intensity. */ -#define VSCP_TYPE_MEASUREMENT64_INTENSITY_OF_LIGHT 8 +#define VSCP_TYPE_MEASUREMENT64_INTENSITY_OF_LIGHT 8 /** * Default unit: Hertz. * This is a measurement of regular events during a second. */ -#define VSCP_TYPE_MEASUREMENT64_FREQUENCY 9 +#define VSCP_TYPE_MEASUREMENT64_FREQUENCY 9 /** * Default unit: becquerel. * Optional unit: curie (1) * This is a measurement of rates of things, which happen randomly, or are unpredictable. */ -#define VSCP_TYPE_MEASUREMENT64_RADIOACTIVITY 10 +#define VSCP_TYPE_MEASUREMENT64_RADIOACTIVITY 10 /** * Default unit: newton. * This is a measurement of force. */ -#define VSCP_TYPE_MEASUREMENT64_FORCE 11 +#define VSCP_TYPE_MEASUREMENT64_FORCE 11 /** * Default unit: pascal. * Opt. unit: bar (1), psi (2) * This is a measurement of pressure. */ -#define VSCP_TYPE_MEASUREMENT64_PRESSURE 12 +#define VSCP_TYPE_MEASUREMENT64_PRESSURE 12 /** * Default unit: Joule. * Optional unit: KWh (1) * This is a measurement of energy. */ -#define VSCP_TYPE_MEASUREMENT64_ENERGY 13 +#define VSCP_TYPE_MEASUREMENT64_ENERGY 13 /** * Default unit: watt. * Optional unit: Horse power (1). * This is a measurement of power. */ -#define VSCP_TYPE_MEASUREMENT64_POWER 14 +#define VSCP_TYPE_MEASUREMENT64_POWER 14 /** * Default unit: coulomb. * This is a measurement electrical charge. */ -#define VSCP_TYPE_MEASUREMENT64_ELECTRICAL_CHARGE 15 +#define VSCP_TYPE_MEASUREMENT64_ELECTRICAL_CHARGE 15 /** * Default unit: volt. * This is a measurement of electrical potential. */ -#define VSCP_TYPE_MEASUREMENT64_ELECTRICAL_POTENTIAL 16 +#define VSCP_TYPE_MEASUREMENT64_ELECTRICAL_POTENTIAL 16 /** * Default unit: farad (F). * This is a measurement of electric capacitance. */ -#define VSCP_TYPE_MEASUREMENT64_ELECTRICAL_CAPACITANCE 17 +#define VSCP_TYPE_MEASUREMENT64_ELECTRICAL_CAPACITANCE 17 /** * Default unit: ohm (Ω). * This is a measurement of resistance. */ -#define VSCP_TYPE_MEASUREMENT64_ELECTRICAL_RESISTANCE 18 +#define VSCP_TYPE_MEASUREMENT64_ELECTRICAL_RESISTANCE 18 /** * Default unit: siemens. * This is a measurement of electrical conductance. */ -#define VSCP_TYPE_MEASUREMENT64_ELECTRICAL_CONDUCTANCE 19 +#define VSCP_TYPE_MEASUREMENT64_ELECTRICAL_CONDUCTANCE 19 /** * Default unit: amperes per meter (H). * Optional units: teslas (B) (1) * This is a measurement of magnetic field strength. */ -#define VSCP_TYPE_MEASUREMENT64_MAGNETIC_FIELD_STRENGTH 20 +#define VSCP_TYPE_MEASUREMENT64_MAGNETIC_FIELD_STRENGTH 20 /** * Default unit: weber (Wb). * This is a measurement of magnetic flux. */ -#define VSCP_TYPE_MEASUREMENT64_MAGNETIC_FLUX 21 +#define VSCP_TYPE_MEASUREMENT64_MAGNETIC_FLUX 21 /** * Default unit: tesla (B). + * Optional units: Gauss (1) * This is a measurement of flux density or field strength for magnetic fields (also called the * magnetic induction). */ -#define VSCP_TYPE_MEASUREMENT64_MAGNETIC_FLUX_DENSITY 22 +#define VSCP_TYPE_MEASUREMENT64_MAGNETIC_FLUX_DENSITY 22 /** * Default unit: henry (H). * This is a measurement of inductance. */ -#define VSCP_TYPE_MEASUREMENT64_INDUCTANCE 23 +#define VSCP_TYPE_MEASUREMENT64_INDUCTANCE 23 /** * Default unit: Lumen (lm= cd * sr) * This is a measurement of luminous Flux. */ -#define VSCP_TYPE_MEASUREMENT64_FLUX_OF_LIGHT 24 +#define VSCP_TYPE_MEASUREMENT64_FLUX_OF_LIGHT 24 /** * Default unit: lux (lx) ( lx = lm / m² ) * This is used to express both Illuminance (incidence of light) and Luminous Emittance (emission of * light). */ -#define VSCP_TYPE_MEASUREMENT64_ILLUMINANCE 25 +#define VSCP_TYPE_MEASUREMENT64_ILLUMINANCE 25 /** * Default unit: gray (Gy). - * Opt unit: sievert (Sv) (1). * This is a measurement of a radiation dose (Absorbed dose of ionizing radiation). */ -#define VSCP_TYPE_MEASUREMENT64_RADIATION_DOSE 26 +#define VSCP_TYPE_MEASUREMENT64_RADIATION_DOSE_ABSORBED 26 /** - * Default unit: katal (z). + * Default unit: katal (kat). * This is a measurement of catalytic activity used in biochemistry. */ -#define VSCP_TYPE_MEASUREMENT64_CATALYTIC_ACITIVITY 27 +#define VSCP_TYPE_MEASUREMENT64_CATALYTIC_ACITIVITY 27 /** * Default unit: cubic meter (m³) @@ -249,13 +249,13 @@ extern "C" * where unit 4 is only available for Level II measurement events where units can hold this value. * This is a measurement of volume. */ -#define VSCP_TYPE_MEASUREMENT64_VOLUME 28 +#define VSCP_TYPE_MEASUREMENT64_VOLUME 28 /** * Default unit: W/m2, watt per square meter. * This is a measurement of sound intensity (acoustic intensity). */ -#define VSCP_TYPE_MEASUREMENT64_SOUND_INTENSITY 29 +#define VSCP_TYPE_MEASUREMENT64_SOUND_INTENSITY 29 /** * Default unit: radian (rad) (Plane angles). @@ -264,162 +264,163 @@ extern "C" * Opt Unit: arcseconds (3). * This is a measurement of an angle. */ -#define VSCP_TYPE_MEASUREMENT64_ANGLE 30 +#define VSCP_TYPE_MEASUREMENT64_ANGLE 30 /** * Default unit: Longitude. * Opt. unit: Latitude. - * This is a measurement of a position as of WGS 84. Normally given as a floating point value. See - * ./class1.gps.md for a better candidate to use for position data. + * This is a (decimal) measurement of a position as of WGS 84. Normally given as a floating point + * value. See ./class1.gps.md for a better candidate to use for position data. */ -#define VSCP_TYPE_MEASUREMENT64_POSITION 31 +#define VSCP_TYPE_MEASUREMENT64_POSITION 31 /** * Default unit: Meters per second. * Optional unit: Kilometers per hour (1) Miles per hour (2) * This is a measurement of a speed. */ -#define VSCP_TYPE_MEASUREMENT64_SPEED 32 +#define VSCP_TYPE_MEASUREMENT64_SPEED 32 /** * Default unit: Meters per second/second (m/s2). * This is a measurement of acceleration. */ -#define VSCP_TYPE_MEASUREMENT64_ACCELERATION 33 +#define VSCP_TYPE_MEASUREMENT64_ACCELERATION 33 /** * Default unit: N/m. * This is a measurement of tension. */ -#define VSCP_TYPE_MEASUREMENT64_TENSION 34 +#define VSCP_TYPE_MEASUREMENT64_TENSION 34 /** * Default unit: Relative percentage 0-100%. * This is a measurement of relative moistness (Humidity). */ -#define VSCP_TYPE_MEASUREMENT64_HUMIDITY 35 +#define VSCP_TYPE_MEASUREMENT64_HUMIDITY 35 /** * Default unit: Cubic meters/second. * Opt Unit: Liters/Second. * This is a measurement of flow. */ -#define VSCP_TYPE_MEASUREMENT64_FLOW 36 +#define VSCP_TYPE_MEASUREMENT64_FLOW 36 /** * Default unit: Thermal ohm K/W. * This is a measurement of thermal resistance. */ -#define VSCP_TYPE_MEASUREMENT64_THERMAL_RESISTANCE 37 +#define VSCP_TYPE_MEASUREMENT64_THERMAL_RESISTANCE 37 /** * Default unit: dioptre (dpt) m-1. * This is a measurement of refractive (optical) power. */ -#define VSCP_TYPE_MEASUREMENT64_REFRACTIVE_POWER 38 +#define VSCP_TYPE_MEASUREMENT64_REFRACTIVE_POWER 38 /** - * Default unit: poiseuille (Pl) + * Default unit: pascal second + * Optional units: poiseuille (Pl) = 1, poise (P) = 2 * This is a measurement of dynamic viscosity. */ -#define VSCP_TYPE_MEASUREMENT64_DYNAMIC_VISCOSITY 39 +#define VSCP_TYPE_MEASUREMENT64_DYNAMIC_VISCOSITY 39 /** * Default unit: rayl (Pa·s/m) * This is a measurement of sound impedance. */ -#define VSCP_TYPE_MEASUREMENT64_SOUND_IMPEDANCE 40 +#define VSCP_TYPE_MEASUREMENT64_SOUND_IMPEDANCE 40 /** * Default unit: Acoustic ohm Pa · s/ m³. * This is a measurement of sound resistance. */ -#define VSCP_TYPE_MEASUREMENT64_SOUND_RESISTANCE 41 +#define VSCP_TYPE_MEASUREMENT64_SOUND_RESISTANCE 41 /** * Default unit: daraf (f-1). * This is a measurement of electric elasticity. */ -#define VSCP_TYPE_MEASUREMENT64_ELECTRIC_ELASTANCE 42 +#define VSCP_TYPE_MEASUREMENT64_ELECTRIC_ELASTANCE 42 /** * Default unit: talbot ( tb = lm * s) * This is a measurement of luminous energy. */ -#define VSCP_TYPE_MEASUREMENT64_LUMINOUS_ENERGY 43 +#define VSCP_TYPE_MEASUREMENT64_LUMINOUS_ENERGY 43 /** * Default unit: cd / m²) (non SI unit = nit) * This is a measurement of luminance. */ -#define VSCP_TYPE_MEASUREMENT64_LUMINANCE 44 +#define VSCP_TYPE_MEASUREMENT64_LUMINANCE 44 /** - * Default unit: molal (mol/kg). - * This is a measurement of chemical concentration. + * Default unit: mol/m³. + * This is a measurement of chemical mol/ppm/percent concentration. */ -#define VSCP_TYPE_MEASUREMENT64_CHEMICAL_CONCENTRATION 45 +#define VSCP_TYPE_MEASUREMENT64_CHEMICAL_CONCENTRATION_MOLAR 45 /** - * Reserved (previously was doublet of Type= 26, don't use any longer!) + * Default unit: mol/m³. + * This is a measurement of chemical mass concentration. */ -#define VSCP_TYPE_MEASUREMENT64_RESERVED46 46 +#define VSCP_TYPE_MEASUREMENT64_CHEMICAL_CONCENTRATION_MASS 46 /** - * Default unit: sievert (J/Kg). - * This is a measurement of dose equivalent. + * Reserved. */ -#define VSCP_TYPE_MEASUREMENT64_DOSE_EQVIVALENT 47 +#define VSCP_TYPE_MEASUREMENT64_RESERVED47 47 /** * Reserved (was doublet of Type= 24, do not use any longer!) */ -#define VSCP_TYPE_MEASUREMENT64_RESERVED48 48 +#define VSCP_TYPE_MEASUREMENT64_RESERVED48 48 /** * Default unit: Kelvin. * Opt. unit: Degree Celsius (1), Fahrenheit (2) * This is a measurement of the Dew Point. */ -#define VSCP_TYPE_MEASUREMENT64_DEWPOINT 49 +#define VSCP_TYPE_MEASUREMENT64_DEWPOINT 49 /** * Default unit: Relative value. * This is a relative value for a level measurement without a unit. It is just relative to the min/max * value for the selected data representation, typically percentage or per mille or similar. */ -#define VSCP_TYPE_MEASUREMENT64_RELATIVE_LEVEL 50 +#define VSCP_TYPE_MEASUREMENT64_RELATIVE_LEVEL 50 /** * Default unit: Meter. * Opt. unit: Feet(1), inches (2) * Altitude in meters. */ -#define VSCP_TYPE_MEASUREMENT64_ALTITUDE 51 +#define VSCP_TYPE_MEASUREMENT64_ALTITUDE 51 /** * Default unit: square meter (m²) * Area in square meter. */ -#define VSCP_TYPE_MEASUREMENT64_AREA 52 +#define VSCP_TYPE_MEASUREMENT64_AREA 52 /** * Default unit: watt per steradian ( W / sr ) * Radiated power per room angle. */ -#define VSCP_TYPE_MEASUREMENT64_RADIANT_INTENSITY 53 +#define VSCP_TYPE_MEASUREMENT64_RADIANT_INTENSITY 53 /** * Default unit: watt per steradian per square metre ( W / (sr * m²) ) * This is the radiant flux emitted, reflected, transmitted or received by a surface. */ -#define VSCP_TYPE_MEASUREMENT64_RADIANCE 54 +#define VSCP_TYPE_MEASUREMENT64_RADIANCE 54 /** * Default unit: watt per square metre ( W / m² ) * Power emitted from or striking onto a surface or area. */ -#define VSCP_TYPE_MEASUREMENT64_IRRADIANCE 55 +#define VSCP_TYPE_MEASUREMENT64_IRRADIANCE 55 /** * Default unit: watt per steradian per square metre per nm (W·sr-1·m-2·nm-1) @@ -427,46 +428,46 @@ extern "C" * hertz (W·sr-1·m-3) (2) * Radiance of a surface per unit frequency or wavelength. */ -#define VSCP_TYPE_MEASUREMENT64_SPECTRAL_RADIANCE 56 +#define VSCP_TYPE_MEASUREMENT64_SPECTRAL_RADIANCE 56 /** * Default unit: watt per square metre per nm (W·m-2·nm-1) * Opt. unit: watt per metre3 (W·m-3) (1), watt per square metre per hertz (W·m-2·Hz-1) (2) * Irradiance of a surface per unit frequency or wavelength. */ -#define VSCP_TYPE_MEASUREMENT64_SPECTRAL_IRRADIANCE 57 +#define VSCP_TYPE_MEASUREMENT64_SPECTRAL_IRRADIANCE 57 /** * Default unit: pascal (Pa) * This is a measurement of sound pressure (acoustic pressure). */ -#define VSCP_TYPE_MEASUREMENT64_SOUND_PRESSURE 58 +#define VSCP_TYPE_MEASUREMENT64_SOUND_PRESSURE 58 /** * Default unit: pascal (Pa) * Sound energy density or sound density is the sound energy per unit volume. */ -#define VSCP_TYPE_MEASUREMENT64_SOUND_DENSITY 59 +#define VSCP_TYPE_MEASUREMENT64_SOUND_DENSITY 59 /** * Default unit: decibel (dB) * Sound level expressed in decibel. This event is supplied for convenience. */ -#define VSCP_TYPE_MEASUREMENT64_SOUND_LEVEL 60 +#define VSCP_TYPE_MEASUREMENT64_SOUND_LEVEL 60 /** * Default unit: sievert (Sv). * Optional unit rem (1) * This is a measurement of a radiation dose (Equivalent dose of ionizing radiation). */ -#define VSCP_TYPE_MEASUREMENT64_RADIATION_DOSE_EQ 61 +#define VSCP_TYPE_MEASUREMENT64_RADIATION_DOSE_EQ 61 /** * Default unit: coulomb per kilogram (C/kg). * Optional unit: Röntgen/R (1) * This is a measurement of a radiation dose (Exposed dose of ionizing radiation). */ -#define VSCP_TYPE_MEASUREMENT64_RADIATION_DOSE_EXPOSURE 62 +#define VSCP_TYPE_MEASUREMENT64_RADIATION_DOSE_EXPOSURE 62 /** * Default unit: cos of phase angle. @@ -474,7 +475,7 @@ extern "C" * usually expressed as a percentage - and the lower the percentage, the less efficient power usage * is. */ -#define VSCP_TYPE_MEASUREMENT64_POWER_FACTOR 63 +#define VSCP_TYPE_MEASUREMENT64_POWER_FACTOR 63 /** * Default unit: VAr @@ -482,14 +483,14 @@ extern "C" * measurement of reactive power. Reactive power exists in AC circuit when the current and voltage are * not in phase. */ -#define VSCP_TYPE_MEASUREMENT64_REACTIVE_POWER 64 +#define VSCP_TYPE_MEASUREMENT64_REACTIVE_POWER 64 /** * Default unit: kVArh * Reactive energy is the electrical energy produced, flowing or supplied by an electric circuit * during a time interval, measured in units of kVArh or standard multiples thereof. */ -#define VSCP_TYPE_MEASUREMENT64_REACTIVE_ENERGY 65 +#define VSCP_TYPE_MEASUREMENT64_REACTIVE_ENERGY 65 /******************************************************************************* MACROS diff --git a/src/framework/core/vscp_type_measurezone.h b/src/framework/core/vscp_type_measurezone.h index 976a4c9..eeb02f3 100644 --- a/src/framework/core/vscp_type_measurezone.h +++ b/src/framework/core/vscp_type_measurezone.h @@ -71,179 +71,179 @@ extern "C" /** * General Event. */ -#define VSCP_TYPE_MEASUREZONE_GENERAL 0 +#define VSCP_TYPE_MEASUREZONE_GENERAL 0 /** * This is a discrete value typical for a count. There is no unit for this measurement just a discrete * value. */ -#define VSCP_TYPE_MEASUREZONE_COUNT 1 +#define VSCP_TYPE_MEASUREZONE_COUNT 1 /** * Default unit: Meter. * This is a measurement of a length or a distance. */ -#define VSCP_TYPE_MEASUREZONE_LENGTH 2 +#define VSCP_TYPE_MEASUREZONE_LENGTH 2 /** * Default unit: Kilogram. * This is a measurement of a mass. */ -#define VSCP_TYPE_MEASUREZONE_MASS 3 +#define VSCP_TYPE_MEASUREZONE_MASS 3 /** * A time measurement. * Default unit: Seconds. * Opt. unit: (1) Milliseconds. Absolute: (2) y-y-m-d-h-m-s (binary). String: (3) "HHMMSS". */ -#define VSCP_TYPE_MEASUREZONE_TIME 4 +#define VSCP_TYPE_MEASUREZONE_TIME 4 /** * Default unit: Ampere. * This is a measurement of an electric current. */ -#define VSCP_TYPE_MEASUREZONE_ELECTRIC_CURRENT 5 +#define VSCP_TYPE_MEASUREZONE_ELECTRIC_CURRENT 5 /** * Default unit: Kelvin. * Opt. unit: Degree Celsius (1), Fahrenheit (2) * This is a measurement of a temperature. */ -#define VSCP_TYPE_MEASUREZONE_TEMPERATURE 6 +#define VSCP_TYPE_MEASUREZONE_TEMPERATURE 6 /** * Default unit: Mole. * This is a measurement of an amount of a substance. */ -#define VSCP_TYPE_MEASUREZONE_AMOUNT_OF_SUBSTANCE 7 +#define VSCP_TYPE_MEASUREZONE_AMOUNT_OF_SUBSTANCE 7 /** * Default unit: Candela. * This is a measurement of luminous intensity. */ -#define VSCP_TYPE_MEASUREZONE_INTENSITY_OF_LIGHT 8 +#define VSCP_TYPE_MEASUREZONE_INTENSITY_OF_LIGHT 8 /** * Default unit: Hertz. * This is a measurement of regular events during a second. */ -#define VSCP_TYPE_MEASUREZONE_FREQUENCY 9 +#define VSCP_TYPE_MEASUREZONE_FREQUENCY 9 /** * Default unit: becquerel. * Optional unit: curie (1) * This is a measurement of rates of things, which happen randomly, or are unpredictable. */ -#define VSCP_TYPE_MEASUREZONE_RADIOACTIVITY 10 +#define VSCP_TYPE_MEASUREZONE_RADIOACTIVITY 10 /** * Default unit: newton. * This is a measurement of force. */ -#define VSCP_TYPE_MEASUREZONE_FORCE 11 +#define VSCP_TYPE_MEASUREZONE_FORCE 11 /** * Default unit: pascal. * Opt. unit: bar (1), psi (2) * This is a measurement of pressure. */ -#define VSCP_TYPE_MEASUREZONE_PRESSURE 12 +#define VSCP_TYPE_MEASUREZONE_PRESSURE 12 /** * Default unit: Joule. * Optional unit: KWh (1) * This is a measurement of energy. */ -#define VSCP_TYPE_MEASUREZONE_ENERGY 13 +#define VSCP_TYPE_MEASUREZONE_ENERGY 13 /** * Default unit: watt. * Optional unit: Horse power (1). * This is a measurement of power. */ -#define VSCP_TYPE_MEASUREZONE_POWER 14 +#define VSCP_TYPE_MEASUREZONE_POWER 14 /** * Default unit: coulomb. * This is a measurement electrical charge. */ -#define VSCP_TYPE_MEASUREZONE_ELECTRICAL_CHARGE 15 +#define VSCP_TYPE_MEASUREZONE_ELECTRICAL_CHARGE 15 /** * Default unit: volt. * This is a measurement of electrical potential. */ -#define VSCP_TYPE_MEASUREZONE_ELECTRICAL_POTENTIAL 16 +#define VSCP_TYPE_MEASUREZONE_ELECTRICAL_POTENTIAL 16 /** * Default unit: farad (F). * This is a measurement of electric capacitance. */ -#define VSCP_TYPE_MEASUREZONE_ELECTRICAL_CAPACITANCE 17 +#define VSCP_TYPE_MEASUREZONE_ELECTRICAL_CAPACITANCE 17 /** * Default unit: ohm (Ω). * This is a measurement of resistance. */ -#define VSCP_TYPE_MEASUREZONE_ELECTRICAL_RESISTANCE 18 +#define VSCP_TYPE_MEASUREZONE_ELECTRICAL_RESISTANCE 18 /** * Default unit: siemens. * This is a measurement of electrical conductance. */ -#define VSCP_TYPE_MEASUREZONE_ELECTRICAL_CONDUCTANCE 19 +#define VSCP_TYPE_MEASUREZONE_ELECTRICAL_CONDUCTANCE 19 /** * Default unit: amperes per meter (H). * Optional units: teslas (B) (1) * This is a measurement of magnetic field strength. */ -#define VSCP_TYPE_MEASUREZONE_MAGNETIC_FIELD_STRENGTH 20 +#define VSCP_TYPE_MEASUREZONE_MAGNETIC_FIELD_STRENGTH 20 /** * Default unit: weber (Wb). * This is a measurement of magnetic flux. */ -#define VSCP_TYPE_MEASUREZONE_MAGNETIC_FLUX 21 +#define VSCP_TYPE_MEASUREZONE_MAGNETIC_FLUX 21 /** * Default unit: tesla (B). + * Optional units: Gauss (1) * This is a measurement of flux density or field strength for magnetic fields (also called the * magnetic induction). */ -#define VSCP_TYPE_MEASUREZONE_MAGNETIC_FLUX_DENSITY 22 +#define VSCP_TYPE_MEASUREZONE_MAGNETIC_FLUX_DENSITY 22 /** * Default unit: henry (H). * This is a measurement of inductance. */ -#define VSCP_TYPE_MEASUREZONE_INDUCTANCE 23 +#define VSCP_TYPE_MEASUREZONE_INDUCTANCE 23 /** * Default unit: Lumen (lm= cd * sr) * This is a measurement of luminous Flux. */ -#define VSCP_TYPE_MEASUREZONE_FLUX_OF_LIGHT 24 +#define VSCP_TYPE_MEASUREZONE_FLUX_OF_LIGHT 24 /** * Default unit: lux (lx) ( lx = lm / m² ) * This is used to express both Illuminance (incidence of light) and Luminous Emittance (emission of * light). */ -#define VSCP_TYPE_MEASUREZONE_ILLUMINANCE 25 +#define VSCP_TYPE_MEASUREZONE_ILLUMINANCE 25 /** * Default unit: gray (Gy). - * Opt unit: sievert (Sv) (1). * This is a measurement of a radiation dose (Absorbed dose of ionizing radiation). */ -#define VSCP_TYPE_MEASUREZONE_RADIATION_DOSE 26 +#define VSCP_TYPE_MEASUREZONE_RADIATION_DOSE_ABSORBED 26 /** - * Default unit: katal (z). + * Default unit: katal (kat). * This is a measurement of catalytic activity used in biochemistry. */ -#define VSCP_TYPE_MEASUREZONE_CATALYTIC_ACITIVITY 27 +#define VSCP_TYPE_MEASUREZONE_CATALYTIC_ACITIVITY 27 /** * Default unit: cubic meter (m³) @@ -251,13 +251,13 @@ extern "C" * where unit 4 is only available for Level II measurement events where units can hold this value. * This is a measurement of volume. */ -#define VSCP_TYPE_MEASUREZONE_VOLUME 28 +#define VSCP_TYPE_MEASUREZONE_VOLUME 28 /** * Default unit: W/m2, watt per square meter. * This is a measurement of sound intensity (acoustic intensity). */ -#define VSCP_TYPE_MEASUREZONE_SOUND_INTENSITY 29 +#define VSCP_TYPE_MEASUREZONE_SOUND_INTENSITY 29 /** * Default unit: radian (rad) (Plane angles). @@ -266,162 +266,163 @@ extern "C" * Opt Unit: arcseconds (3). * This is a measurement of an angle. */ -#define VSCP_TYPE_MEASUREZONE_ANGLE 30 +#define VSCP_TYPE_MEASUREZONE_ANGLE 30 /** * Default unit: Longitude. * Opt. unit: Latitude. - * This is a measurement of a position as of WGS 84. Normally given as a floating point value. See - * ./class1.gps.md for a better candidate to use for position data. + * This is a (decimal) measurement of a position as of WGS 84. Normally given as a floating point + * value. See ./class1.gps.md for a better candidate to use for position data. */ -#define VSCP_TYPE_MEASUREZONE_POSITION 31 +#define VSCP_TYPE_MEASUREZONE_POSITION 31 /** * Default unit: Meters per second. * Optional unit: Kilometers per hour (1) Miles per hour (2) * This is a measurement of a speed. */ -#define VSCP_TYPE_MEASUREZONE_SPEED 32 +#define VSCP_TYPE_MEASUREZONE_SPEED 32 /** * Default unit: Meters per second/second (m/s2). * This is a measurement of acceleration. */ -#define VSCP_TYPE_MEASUREZONE_ACCELERATION 33 +#define VSCP_TYPE_MEASUREZONE_ACCELERATION 33 /** * Default unit: N/m. * This is a measurement of tension. */ -#define VSCP_TYPE_MEASUREZONE_TENSION 34 +#define VSCP_TYPE_MEASUREZONE_TENSION 34 /** * Default unit: Relative percentage 0-100%. * This is a measurement of relative moistness (Humidity). */ -#define VSCP_TYPE_MEASUREZONE_HUMIDITY 35 +#define VSCP_TYPE_MEASUREZONE_HUMIDITY 35 /** * Default unit: Cubic meters/second. * Opt Unit: Liters/Second. * This is a measurement of flow. */ -#define VSCP_TYPE_MEASUREZONE_FLOW 36 +#define VSCP_TYPE_MEASUREZONE_FLOW 36 /** * Default unit: Thermal ohm K/W. * This is a measurement of thermal resistance. */ -#define VSCP_TYPE_MEASUREZONE_THERMAL_RESISTANCE 37 +#define VSCP_TYPE_MEASUREZONE_THERMAL_RESISTANCE 37 /** * Default unit: dioptre (dpt) m-1. * This is a measurement of refractive (optical) power. */ -#define VSCP_TYPE_MEASUREZONE_REFRACTIVE_POWER 38 +#define VSCP_TYPE_MEASUREZONE_REFRACTIVE_POWER 38 /** - * Default unit: poiseuille (Pl) + * Default unit: pascal second + * Optional units: poiseuille (Pl) = 1, poise (P) = 2 * This is a measurement of dynamic viscosity. */ -#define VSCP_TYPE_MEASUREZONE_DYNAMIC_VISCOSITY 39 +#define VSCP_TYPE_MEASUREZONE_DYNAMIC_VISCOSITY 39 /** * Default unit: rayl (Pa·s/m) * This is a measurement of sound impedance. */ -#define VSCP_TYPE_MEASUREZONE_SOUND_IMPEDANCE 40 +#define VSCP_TYPE_MEASUREZONE_SOUND_IMPEDANCE 40 /** * Default unit: Acoustic ohm Pa · s/ m³. * This is a measurement of sound resistance. */ -#define VSCP_TYPE_MEASUREZONE_SOUND_RESISTANCE 41 +#define VSCP_TYPE_MEASUREZONE_SOUND_RESISTANCE 41 /** * Default unit: daraf (f-1). * This is a measurement of electric elasticity. */ -#define VSCP_TYPE_MEASUREZONE_ELECTRIC_ELASTANCE 42 +#define VSCP_TYPE_MEASUREZONE_ELECTRIC_ELASTANCE 42 /** * Default unit: talbot ( tb = lm * s) * This is a measurement of luminous energy. */ -#define VSCP_TYPE_MEASUREZONE_LUMINOUS_ENERGY 43 +#define VSCP_TYPE_MEASUREZONE_LUMINOUS_ENERGY 43 /** * Default unit: cd / m²) (non SI unit = nit) * This is a measurement of luminance. */ -#define VSCP_TYPE_MEASUREZONE_LUMINANCE 44 +#define VSCP_TYPE_MEASUREZONE_LUMINANCE 44 /** - * Default unit: molal (mol/kg). - * This is a measurement of chemical concentration. + * Default unit: mol/m³. + * This is a measurement of chemical mol/ppm/percent concentration. */ -#define VSCP_TYPE_MEASUREZONE_CHEMICAL_CONCENTRATION 45 +#define VSCP_TYPE_MEASUREZONE_CHEMICAL_CONCENTRATION_MOLAR 45 /** - * Reserved (previously was doublet of Type= 26, don't use any longer!) + * Default unit: mol/m³. + * This is a measurement of chemical mass concentration. */ -#define VSCP_TYPE_MEASUREZONE_RESERVED46 46 +#define VSCP_TYPE_MEASUREZONE_CHEMICAL_CONCENTRATION_MASS 46 /** - * Default unit: sievert (J/Kg). - * This is a measurement of dose equivalent. + * Reserved. */ -#define VSCP_TYPE_MEASUREZONE_DOSE_EQVIVALENT 47 +#define VSCP_TYPE_MEASUREZONE_RESERVED47 47 /** * Reserved (was doublet of Type= 24, do not use any longer!) */ -#define VSCP_TYPE_MEASUREZONE_RESERVED48 48 +#define VSCP_TYPE_MEASUREZONE_RESERVED48 48 /** * Default unit: Kelvin. * Opt. unit: Degree Celsius (1), Fahrenheit (2) * This is a measurement of the Dew Point. */ -#define VSCP_TYPE_MEASUREZONE_DEWPOINT 49 +#define VSCP_TYPE_MEASUREZONE_DEWPOINT 49 /** * Default unit: Relative value. * This is a relative value for a level measurement without a unit. It is just relative to the min/max * value for the selected data representation, typically percentage or per mille or similar. */ -#define VSCP_TYPE_MEASUREZONE_RELATIVE_LEVEL 50 +#define VSCP_TYPE_MEASUREZONE_RELATIVE_LEVEL 50 /** * Default unit: Meter. * Opt. unit: Feet(1), inches (2) * Altitude in meters. */ -#define VSCP_TYPE_MEASUREZONE_ALTITUDE 51 +#define VSCP_TYPE_MEASUREZONE_ALTITUDE 51 /** * Default unit: square meter (m²) * Area in square meter. */ -#define VSCP_TYPE_MEASUREZONE_AREA 52 +#define VSCP_TYPE_MEASUREZONE_AREA 52 /** * Default unit: watt per steradian ( W / sr ) * Radiated power per room angle. */ -#define VSCP_TYPE_MEASUREZONE_RADIANT_INTENSITY 53 +#define VSCP_TYPE_MEASUREZONE_RADIANT_INTENSITY 53 /** * Default unit: watt per steradian per square metre ( W / (sr * m²) ) * This is the radiant flux emitted, reflected, transmitted or received by a surface. */ -#define VSCP_TYPE_MEASUREZONE_RADIANCE 54 +#define VSCP_TYPE_MEASUREZONE_RADIANCE 54 /** * Default unit: watt per square metre ( W / m² ) * Power emitted from or striking onto a surface or area. */ -#define VSCP_TYPE_MEASUREZONE_IRRADIANCE 55 +#define VSCP_TYPE_MEASUREZONE_IRRADIANCE 55 /** * Default unit: watt per steradian per square metre per nm (W·sr-1·m-2·nm-1) @@ -429,46 +430,46 @@ extern "C" * hertz (W·sr-1·m-3) (2) * Radiance of a surface per unit frequency or wavelength. */ -#define VSCP_TYPE_MEASUREZONE_SPECTRAL_RADIANCE 56 +#define VSCP_TYPE_MEASUREZONE_SPECTRAL_RADIANCE 56 /** * Default unit: watt per square metre per nm (W·m-2·nm-1) * Opt. unit: watt per metre3 (W·m-3) (1), watt per square metre per hertz (W·m-2·Hz-1) (2) * Irradiance of a surface per unit frequency or wavelength. */ -#define VSCP_TYPE_MEASUREZONE_SPECTRAL_IRRADIANCE 57 +#define VSCP_TYPE_MEASUREZONE_SPECTRAL_IRRADIANCE 57 /** * Default unit: pascal (Pa) * This is a measurement of sound pressure (acoustic pressure). */ -#define VSCP_TYPE_MEASUREZONE_SOUND_PRESSURE 58 +#define VSCP_TYPE_MEASUREZONE_SOUND_PRESSURE 58 /** * Default unit: pascal (Pa) * Sound energy density or sound density is the sound energy per unit volume. */ -#define VSCP_TYPE_MEASUREZONE_SOUND_DENSITY 59 +#define VSCP_TYPE_MEASUREZONE_SOUND_DENSITY 59 /** * Default unit: decibel (dB) * Sound level expressed in decibel. This event is supplied for convenience. */ -#define VSCP_TYPE_MEASUREZONE_SOUND_LEVEL 60 +#define VSCP_TYPE_MEASUREZONE_SOUND_LEVEL 60 /** * Default unit: sievert (Sv). * Optional unit rem (1) * This is a measurement of a radiation dose (Equivalent dose of ionizing radiation). */ -#define VSCP_TYPE_MEASUREZONE_RADIATION_DOSE_EQ 61 +#define VSCP_TYPE_MEASUREZONE_RADIATION_DOSE_EQ 61 /** * Default unit: coulomb per kilogram (C/kg). * Optional unit: Röntgen/R (1) * This is a measurement of a radiation dose (Exposed dose of ionizing radiation). */ -#define VSCP_TYPE_MEASUREZONE_RADIATION_DOSE_EXPOSURE 62 +#define VSCP_TYPE_MEASUREZONE_RADIATION_DOSE_EXPOSURE 62 /** * Default unit: cos of phase angle. @@ -476,7 +477,7 @@ extern "C" * usually expressed as a percentage - and the lower the percentage, the less efficient power usage * is. */ -#define VSCP_TYPE_MEASUREZONE_POWER_FACTOR 63 +#define VSCP_TYPE_MEASUREZONE_POWER_FACTOR 63 /** * Default unit: VAr @@ -484,14 +485,14 @@ extern "C" * measurement of reactive power. Reactive power exists in AC circuit when the current and voltage are * not in phase. */ -#define VSCP_TYPE_MEASUREZONE_REACTIVE_POWER 64 +#define VSCP_TYPE_MEASUREZONE_REACTIVE_POWER 64 /** * Default unit: kVArh * Reactive energy is the electrical energy produced, flowing or supplied by an electric circuit * during a time interval, measured in units of kVArh or standard multiples thereof. */ -#define VSCP_TYPE_MEASUREZONE_REACTIVE_ENERGY 65 +#define VSCP_TYPE_MEASUREZONE_REACTIVE_ENERGY 65 /******************************************************************************* MACROS diff --git a/src/framework/core/vscp_type_protocol.h b/src/framework/core/vscp_type_protocol.h index 4bf8c4f..3e366c7 100644 --- a/src/framework/core/vscp_type_protocol.h +++ b/src/framework/core/vscp_type_protocol.h @@ -231,6 +231,8 @@ extern "C" * Not mandatory. Only needed if a VSCP boot-loader algorithm is used. * NACK the reception of data block. This event has no meaning for any node that is not in boot mode * and should be disregarded. + * The state machine of the node that is loaded with firmware should accept new start block data + * events after this event. Other memory types can be programmed. */ #define VSCP_TYPE_PROTOCOL_BLOCK_DATA_NACK 18 @@ -238,6 +240,8 @@ extern "C" * Not mandatory. Only needed if a VSCP boot-loader algorithm is used. * Request from a node to program a data block that has been uploaded and confirmed. This event has no * meaning for any node that is not in boot mode and should be disregarded. + * Sent only if the block was successfully received and confirmed by checking the crc for the full + * block. The block number is the number of the block that was sent in the last block data event. */ #define VSCP_TYPE_PROTOCOL_PROGRAM_BLOCK_DATA 19 @@ -258,9 +262,14 @@ extern "C" /** * Not mandatory. Only needed if a VSCP boot-loader algorithm is used. * This command is sent as the last command during the boot-loader sequence. It resets the device and - * starts it up using the newly loaded code. The 16-bit CRC for the entire program block is sent as an - * argument. This must be correct for the reset/activation to be performed. NACK boot loader mode will - * be sent if the CRC is not correct and the node will not leave boot loader mode. + * starts it up using the newly loaded code. The 16-bit sum of all CRC blocks that was transferred to + * the node (all memory types) is sent as an argument. This sum should be checked and be correct for + * the reset/activation to be performed. Activate new image NACK will be sent if the CRC is not + * correct and the node will not leave boot loader mode. + * If just one memory type is programmed, the CRC sum is the same as the CRC for the programmed block. + * This can be used as an alternative way to program different memory types, that is enter boot loader + * mode, program an area, and then activate the new image, and then enter boot loader mode again and + * program another area, and so on. */ #define VSCP_TYPE_PROTOCOL_ACTIVATE_NEW_IMAGE 22 @@ -444,19 +453,43 @@ extern "C" /** * Not mandatory Only needed if a VSCP boot loader algorithm is used. * Part of the VSCP boot-loader functionality. This is the positive response after a node received a - * CLASS1.PROTOCOL, Type=16 (Block data) event. It is sent by the node as a validation that it can - * handle the block data transfer. + * CLASS1.PROTOCOL, Type=15 (Block data) event (a part of a block). It is sent by the node as a + * validation that it can handle the block data transfer. */ #define VSCP_TYPE_PROTOCOL_START_BLOCK_ACK 50 /** * Not mandatory. Only needed if a VSCP boot-loader algorithm is used. * Part of the VSCP boot-loader functionality. This is the negative response after a node received a - * CLASS1.PROTOCOL, Type=16 (Block data) event. It is sent by the node as an indication that it can - * NOT handle the block data transfer. + * CLASS1.PROTOCOL, Type=15 (Block data) event (a part of a block). It is sent by the node as an + * indication that it can NOT handle the block data transfer. */ #define VSCP_TYPE_PROTOCOL_START_BLOCK_NACK 51 +/** + * Not mandatory. Only needed if a VSCP boot-loader algorithm is used. + * Part of the VSCP boot-loader functionality. This is the positive response after a node received + * CLASS1.PROTOCOL, Type=16 (Block data) event (a part of a block). It is sent by the node as a + * validation that it can handle the block data transfer. + */ +#define VSCP_TYPE_PROTOCOL_BLOCK_CHUNK_ACK 52 + +/** + * Not mandatory. Only needed if a VSCP boot-loader algorithm is used. + * Part of the VSCP boot-loader functionality. This is the negative response after a node received + * CLASS1.PROTOCOL, Type=16 (Block data) event (a part of a block). It is sent by the node as an + * indication that it can NOT handle the block data transfer. + */ +#define VSCP_TYPE_PROTOCOL_BLOCK_CHUNK_NACK 53 + +/** + * Not mandatory. Only needed if a VSCP boot-loader algorithm is used. + * Part of the VSCP boot-loader functionality. This event is a way to check if a device is already in + * bootloader mode. A device that is in bootloader mode should respond with a CLASS1.PROTOCOL, Type=13 + * (ACK boot loader mode) event regardless of the internal state it is in. + */ +#define VSCP_TYPE_PROTOCOL_BOOT_LOADER_CHECK 54 + /******************************************************************************* MACROS *******************************************************************************/ diff --git a/src/framework/core/vscp_type_setvaluezone.h b/src/framework/core/vscp_type_setvaluezone.h index 4dc30fd..8d75b32 100644 --- a/src/framework/core/vscp_type_setvaluezone.h +++ b/src/framework/core/vscp_type_setvaluezone.h @@ -69,179 +69,180 @@ extern "C" /** * General Event. */ -#define VSCP_TYPE_SETVALUEZONE_GENERAL 0 +#define VSCP_TYPE_SETVALUEZONE_GENERAL 0 /** * This is a discrete value typical for a count. There is no unit for this measurement just a discrete * value. */ -#define VSCP_TYPE_SETVALUEZONE_COUNT 1 +#define VSCP_TYPE_SETVALUEZONE_COUNT 1 /** * Default unit: Meter. * This is a measurement of a length or a distance. */ -#define VSCP_TYPE_SETVALUEZONE_LENGTH 2 +#define VSCP_TYPE_SETVALUEZONE_LENGTH 2 /** * Default unit: Kilogram. * This is a measurement of a mass. */ -#define VSCP_TYPE_SETVALUEZONE_MASS 3 +#define VSCP_TYPE_SETVALUEZONE_MASS 3 /** * A time measurement. * Default unit: Seconds. * Opt. unit: (1) Milliseconds. Absolute: (2) y-y-m-d-h-m-s (binary). String: (3) "HHMMSS". */ -#define VSCP_TYPE_SETVALUEZONE_TIME 4 +#define VSCP_TYPE_SETVALUEZONE_TIME 4 /** * Default unit: Ampere. * This is a measurement of an electric current. */ -#define VSCP_TYPE_SETVALUEZONE_ELECTRIC_CURRENT 5 +#define VSCP_TYPE_SETVALUEZONE_ELECTRIC_CURRENT 5 /** * Default unit: Kelvin. * Opt. unit: Degree Celsius (1), Fahrenheit (2) * This is a measurement of a temperature. */ -#define VSCP_TYPE_SETVALUEZONE_TEMPERATURE 6 +#define VSCP_TYPE_SETVALUEZONE_TEMPERATURE 6 /** * Default unit: Mole. * This is a measurement of an amount of a substance. */ -#define VSCP_TYPE_SETVALUEZONE_AMOUNT_OF_SUBSTANCE 7 +#define VSCP_TYPE_SETVALUEZONE_AMOUNT_OF_SUBSTANCE 7 /** * Default unit: Candela. * This is a measurement of luminous intensity. */ -#define VSCP_TYPE_SETVALUEZONE_INTENSITY_OF_LIGHT 8 +#define VSCP_TYPE_SETVALUEZONE_INTENSITY_OF_LIGHT 8 /** * Default unit: Hertz. * This is a measurement of regular events during a second. */ -#define VSCP_TYPE_SETVALUEZONE_FREQUENCY 9 +#define VSCP_TYPE_SETVALUEZONE_FREQUENCY 9 /** * Default unit: becquerel. * Optional unit: curie (1) * This is a measurement of rates of things, which happen randomly, or are unpredictable. */ -#define VSCP_TYPE_SETVALUEZONE_RADIOACTIVITY 10 +#define VSCP_TYPE_SETVALUEZONE_RADIOACTIVITY 10 /** * Default unit: newton. * This is a measurement of force. */ -#define VSCP_TYPE_SETVALUEZONE_FORCE 11 +#define VSCP_TYPE_SETVALUEZONE_FORCE 11 /** * Default unit: pascal. * Opt. unit: bar (1), psi (2) * This is a measurement of pressure. */ -#define VSCP_TYPE_SETVALUEZONE_PRESSURE 12 +#define VSCP_TYPE_SETVALUEZONE_PRESSURE 12 /** * Default unit: Joule. * Optional unit: KWh (1) * This is a measurement of energy. */ -#define VSCP_TYPE_SETVALUEZONE_ENERGY 13 +#define VSCP_TYPE_SETVALUEZONE_ENERGY 13 /** * Default unit: watt. * Optional unit: Horse power (1). * This is a measurement of power. */ -#define VSCP_TYPE_SETVALUEZONE_POWER 14 +#define VSCP_TYPE_SETVALUEZONE_POWER 14 /** * Default unit: coulomb. * This is a measurement electrical charge. */ -#define VSCP_TYPE_SETVALUEZONE_ELECTRICAL_CHARGE 15 +#define VSCP_TYPE_SETVALUEZONE_ELECTRICAL_CHARGE 15 /** * Default unit: volt. * This is a measurement of electrical potential. */ -#define VSCP_TYPE_SETVALUEZONE_ELECTRICAL_POTENTIAL 16 +#define VSCP_TYPE_SETVALUEZONE_ELECTRICAL_POTENTIAL 16 /** * Default unit: farad (F). * This is a measurement of electric capacitance. */ -#define VSCP_TYPE_SETVALUEZONE_ELECTRICAL_CAPACITANCE 17 +#define VSCP_TYPE_SETVALUEZONE_ELECTRICAL_CAPACITANCE 17 /** * Default unit: ohm (Ω). * This is a measurement of resistance. */ -#define VSCP_TYPE_SETVALUEZONE_ELECTRICAL_RESISTANCE 18 +#define VSCP_TYPE_SETVALUEZONE_ELECTRICAL_RESISTANCE 18 /** * Default unit: siemens. * This is a measurement of electrical conductance. */ -#define VSCP_TYPE_SETVALUEZONE_ELECTRICAL_CONDUCTANCE 19 +#define VSCP_TYPE_SETVALUEZONE_ELECTRICAL_CONDUCTANCE 19 /** * Default unit: amperes per meter (H). * Optional units: teslas (B) (1) * This is a measurement of magnetic field strength. */ -#define VSCP_TYPE_SETVALUEZONE_MAGNETIC_FIELD_STRENGTH 20 +#define VSCP_TYPE_SETVALUEZONE_MAGNETIC_FIELD_STRENGTH 20 /** * Default unit: weber (Wb). * This is a measurement of magnetic flux. */ -#define VSCP_TYPE_SETVALUEZONE_MAGNETIC_FLUX 21 +#define VSCP_TYPE_SETVALUEZONE_MAGNETIC_FLUX 21 /** * Default unit: tesla (B). + * Optional units: Gauss (1) * This is a measurement of flux density or field strength for magnetic fields (also called the * magnetic induction). */ -#define VSCP_TYPE_SETVALUEZONE_MAGNETIC_FLUX_DENSITY 22 +#define VSCP_TYPE_SETVALUEZONE_MAGNETIC_FLUX_DENSITY 22 /** * Default unit: henry (H). * This is a measurement of inductance. */ -#define VSCP_TYPE_SETVALUEZONE_INDUCTANCE 23 +#define VSCP_TYPE_SETVALUEZONE_INDUCTANCE 23 /** * Default unit: Lumen (lm= cd * sr) * This is a measurement of luminous Flux. */ -#define VSCP_TYPE_SETVALUEZONE_FLUX_OF_LIGHT 24 +#define VSCP_TYPE_SETVALUEZONE_FLUX_OF_LIGHT 24 /** * Default unit: lux (lx) ( lx = lm / m² ) * This is used to express both Illuminance (incidence of light) and Luminous Emittance (emission of * light). */ -#define VSCP_TYPE_SETVALUEZONE_ILLUMINANCE 25 +#define VSCP_TYPE_SETVALUEZONE_ILLUMINANCE 25 /** * Default unit: gray (Gy). * Opt unit: sievert (Sv) (1). * This is a measurement of a radiation dose (Absorbed dose of ionizing radiation). */ -#define VSCP_TYPE_SETVALUEZONE_RADIATION_DOSE 26 +#define VSCP_TYPE_SETVALUEZONE_RADIATION_DOSE 26 /** - * Default unit: katal (z). + * Default unit: katal (kat). * This is a measurement of catalytic activity used in biochemistry. */ -#define VSCP_TYPE_SETVALUEZONE_CATALYTIC_ACITIVITY 27 +#define VSCP_TYPE_SETVALUEZONE_CATALYTIC_ACITIVITY 27 /** * Default unit: cubic meter (m³) @@ -249,13 +250,13 @@ extern "C" * where unit 4 is only available for Level II measurement events where units can hold this value. * This is a measurement of volume. */ -#define VSCP_TYPE_SETVALUEZONE_VOLUME 28 +#define VSCP_TYPE_SETVALUEZONE_VOLUME 28 /** * Default unit: W/m2, watt per square meter. * This is a measurement of sound intensity (acoustic intensity). */ -#define VSCP_TYPE_SETVALUEZONE_SOUND_INTENSITY 29 +#define VSCP_TYPE_SETVALUEZONE_SOUND_INTENSITY 29 /** * Default unit: radian (rad) (Plane angles). @@ -264,162 +265,163 @@ extern "C" * Opt Unit: arcseconds (3). * This is a measurement of an angle. */ -#define VSCP_TYPE_SETVALUEZONE_ANGLE 30 +#define VSCP_TYPE_SETVALUEZONE_ANGLE 30 /** * Default unit: Longitude. * Opt. unit: Latitude. - * This is a measurement of a position as of WGS 84. Normally given as a floating point value. See - * ./class1.gps.md for a better candidate to use for position data. + * This is a (decimal) measurement of a position as of WGS 84. Normally given as a floating point + * value. See ./class1.gps.md for a better candidate to use for position data. */ -#define VSCP_TYPE_SETVALUEZONE_POSITION 31 +#define VSCP_TYPE_SETVALUEZONE_POSITION 31 /** * Default unit: Meters per second. * Optional unit: Kilometers per hour (1) Miles per hour (2) * This is a measurement of a speed. */ -#define VSCP_TYPE_SETVALUEZONE_SPEED 32 +#define VSCP_TYPE_SETVALUEZONE_SPEED 32 /** * Default unit: Meters per second/second (m/s2). * This is a measurement of acceleration. */ -#define VSCP_TYPE_SETVALUEZONE_ACCELERATION 33 +#define VSCP_TYPE_SETVALUEZONE_ACCELERATION 33 /** * Default unit: N/m. * This is a measurement of tension. */ -#define VSCP_TYPE_SETVALUEZONE_TENSION 34 +#define VSCP_TYPE_SETVALUEZONE_TENSION 34 /** * Default unit: Relative percentage 0-100%. * This is a measurement of relative moistness (Humidity). */ -#define VSCP_TYPE_SETVALUEZONE_HUMIDITY 35 +#define VSCP_TYPE_SETVALUEZONE_HUMIDITY 35 /** * Default unit: Cubic meters/second. * Opt Unit: Liters/Second. * This is a measurement of flow. */ -#define VSCP_TYPE_SETVALUEZONE_FLOW 36 +#define VSCP_TYPE_SETVALUEZONE_FLOW 36 /** * Default unit: Thermal ohm K/W. * This is a measurement of thermal resistance. */ -#define VSCP_TYPE_SETVALUEZONE_THERMAL_RESISTANCE 37 +#define VSCP_TYPE_SETVALUEZONE_THERMAL_RESISTANCE 37 /** * Default unit: dioptre (dpt) m-1. * This is a measurement of refractive (optical) power. */ -#define VSCP_TYPE_SETVALUEZONE_REFRACTIVE_POWER 38 +#define VSCP_TYPE_SETVALUEZONE_REFRACTIVE_POWER 38 /** - * Default unit: poiseuille (Pl) + * Default unit: pascal second + * Optional units: poiseuille (Pl) = 1, poise (P) = 2 * This is a measurement of dynamic viscosity. */ -#define VSCP_TYPE_SETVALUEZONE_DYNAMIC_VISCOSITY 39 +#define VSCP_TYPE_SETVALUEZONE_DYNAMIC_VISCOSITY 39 /** * Default unit: rayl (Pa·s/m) * This is a measurement of sound impedance. */ -#define VSCP_TYPE_SETVALUEZONE_SOUND_IMPEDANCE 40 +#define VSCP_TYPE_SETVALUEZONE_SOUND_IMPEDANCE 40 /** * Default unit: Acoustic ohm Pa · s/ m³. * This is a measurement of sound resistance. */ -#define VSCP_TYPE_SETVALUEZONE_SOUND_RESISTANCE 41 +#define VSCP_TYPE_SETVALUEZONE_SOUND_RESISTANCE 41 /** * Default unit: daraf (f-1). * This is a measurement of electric elasticity. */ -#define VSCP_TYPE_SETVALUEZONE_ELECTRIC_ELASTANCE 42 +#define VSCP_TYPE_SETVALUEZONE_ELECTRIC_ELASTANCE 42 /** * Default unit: talbot ( tb = lm * s) * This is a measurement of luminous energy. */ -#define VSCP_TYPE_SETVALUEZONE_LUMINOUS_ENERGY 43 +#define VSCP_TYPE_SETVALUEZONE_LUMINOUS_ENERGY 43 /** * Default unit: cd / m²) (non SI unit = nit) * This is a measurement of luminance. */ -#define VSCP_TYPE_SETVALUEZONE_LUMINANCE 44 +#define VSCP_TYPE_SETVALUEZONE_LUMINANCE 44 /** - * Default unit: molal (mol/kg). - * This is a measurement of chemical concentration. + * Default unit: mol/m³. + * This is a measurement of chemical mol/ppm/percent concentration. */ -#define VSCP_TYPE_SETVALUEZONE_CHEMICAL_CONCENTRATION 45 +#define VSCP_TYPE_SETVALUEZONE_CHEMICAL_CONCENTRATION_MOLAR 45 /** - * Reserved (previously was doublet of Type= 26, don't use any longer!) + * Default unit: mol/m³. + * This is a measurement of chemical mass concentration. */ -#define VSCP_TYPE_SETVALUEZONE_RESERVED46 46 +#define VSCP_TYPE_SETVALUEZONE_CHEMICAL_CONCENTRATION_MASS 46 /** - * Default unit: sievert (J/Kg). - * This is a measurement of dose equivalent. + * Reserved. */ -#define VSCP_TYPE_SETVALUEZONE_DOSE_EQVIVALENT 47 +#define VSCP_TYPE_SETVALUEZONE_RESERVED47 47 /** * Reserved (was doublet of Type= 24, do not use any longer!) */ -#define VSCP_TYPE_SETVALUEZONE_RESERVED48 48 +#define VSCP_TYPE_SETVALUEZONE_RESERVED48 48 /** * Default unit: Kelvin. * Opt. unit: Degree Celsius (1), Fahrenheit (2) * This is a measurement of the Dew Point. */ -#define VSCP_TYPE_SETVALUEZONE_DEWPOINT 49 +#define VSCP_TYPE_SETVALUEZONE_DEWPOINT 49 /** * Default unit: Relative value. * This is a relative value for a level measurement without a unit. It is just relative to the min/max * value for the selected data representation, typically percentage or per mille or similar. */ -#define VSCP_TYPE_SETVALUEZONE_RELATIVE_LEVEL 50 +#define VSCP_TYPE_SETVALUEZONE_RELATIVE_LEVEL 50 /** * Default unit: Meter. * Opt. unit: Feet(1), inches (2) * Altitude in meters. */ -#define VSCP_TYPE_SETVALUEZONE_ALTITUDE 51 +#define VSCP_TYPE_SETVALUEZONE_ALTITUDE 51 /** * Default unit: square meter (m²) * Area in square meter. */ -#define VSCP_TYPE_SETVALUEZONE_AREA 52 +#define VSCP_TYPE_SETVALUEZONE_AREA 52 /** * Default unit: watt per steradian ( W / sr ) * Radiated power per room angle. */ -#define VSCP_TYPE_SETVALUEZONE_RADIANT_INTENSITY 53 +#define VSCP_TYPE_SETVALUEZONE_RADIANT_INTENSITY 53 /** * Default unit: watt per steradian per square metre ( W / (sr * m²) ) * This is the radiant flux emitted, reflected, transmitted or received by a surface. */ -#define VSCP_TYPE_SETVALUEZONE_RADIANCE 54 +#define VSCP_TYPE_SETVALUEZONE_RADIANCE 54 /** * Default unit: watt per square metre ( W / m² ) * Power emitted from or striking onto a surface or area. */ -#define VSCP_TYPE_SETVALUEZONE_IRRADIANCE 55 +#define VSCP_TYPE_SETVALUEZONE_IRRADIANCE 55 /** * Default unit: watt per steradian per square metre per nm (W·sr-1·m-2·nm-1) @@ -427,32 +429,32 @@ extern "C" * hertz (W·sr-1·m-3) (2) * Radiance of a surface per unit frequency or wavelength. */ -#define VSCP_TYPE_SETVALUEZONE_SPECTRAL_RADIANCE 56 +#define VSCP_TYPE_SETVALUEZONE_SPECTRAL_RADIANCE 56 /** * Default unit: watt per square metre per nm (W·m-2·nm-1) * Opt. unit: watt per metre3 (W·m-3) (1), watt per square metre per hertz (W·m-2·Hz-1) (2) * Irradiance of a surface per unit frequency or wavelength. */ -#define VSCP_TYPE_SETVALUEZONE_SPECTRAL_IRRADIANCE 57 +#define VSCP_TYPE_SETVALUEZONE_SPECTRAL_IRRADIANCE 57 /** * Default unit: pascal (Pa) * This is a measurement of sound pressure (acoustic pressure). */ -#define VSCP_TYPE_SETVALUEZONE_SOUND_PRESSURE 58 +#define VSCP_TYPE_SETVALUEZONE_SOUND_PRESSURE 58 /** * Default unit: pascal (Pa) * Sound energy density or sound density is the sound energy per unit volume. */ -#define VSCP_TYPE_SETVALUEZONE_SOUND_DENSITY 59 +#define VSCP_TYPE_SETVALUEZONE_SOUND_DENSITY 59 /** * Default unit: decibel (dB) * Sound level expressed in decibel. This event is supplied for convenience. */ -#define VSCP_TYPE_SETVALUEZONE_SOUND_LEVEL 60 +#define VSCP_TYPE_SETVALUEZONE_SOUND_LEVEL 60 /******************************************************************************* MACROS diff --git a/src/framework/events/vscp_evt_display.c b/src/framework/events/vscp_evt_display.c index 5b3b61e..1657579 100644 --- a/src/framework/events/vscp_evt_display.c +++ b/src/framework/events/vscp_evt_display.c @@ -394,7 +394,7 @@ extern BOOL vscp_evt_display_sendSetLed(uint8_t index, uint8_t zone, uint8_t sub vscp_TxMessage txMsg; uint8_t size = 0; - vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_DISPLAY, VSCP_TYPE_DISPLAY_SHOW_LED, VSCP_PRIORITY_3_NORMAL); + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_DISPLAY, VSCP_TYPE_DISPLAY_SET_LED, VSCP_PRIORITY_3_NORMAL); txMsg.data[0] = index; size += 1; @@ -438,7 +438,7 @@ extern BOOL vscp_evt_display_sendSetRgbColor(uint8_t index, uint8_t zone, uint8_ vscp_TxMessage txMsg; uint8_t size = 0; - vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_DISPLAY, VSCP_TYPE_DISPLAY_SHOW_LED_COLOR, VSCP_PRIORITY_3_NORMAL); + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_DISPLAY, VSCP_TYPE_DISPLAY_SET_COLOR, VSCP_PRIORITY_3_NORMAL); txMsg.data[0] = index; size += 1; diff --git a/src/framework/events/vscp_evt_measurement.c b/src/framework/events/vscp_evt_measurement.c index a3aed32..444c064 100644 --- a/src/framework/events/vscp_evt_measurement.c +++ b/src/framework/events/vscp_evt_measurement.c @@ -689,7 +689,7 @@ extern BOOL vscp_evt_measurement_sendIlluminance(uint8_t index, uint8_t unit, in } /** - * Radiation dose + * Radiation dose (absorbed) * * @param[in] index Index for sensor. * @param[in] unit The unit of the data. @@ -698,11 +698,11 @@ extern BOOL vscp_evt_measurement_sendIlluminance(uint8_t index, uint8_t unit, in * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurement_sendRadiationDose(uint8_t index, uint8_t unit, int32_t data, int8_t exp) +extern BOOL vscp_evt_measurement_sendRadiationDoseAbsorbed(uint8_t index, uint8_t unit, int32_t data, int8_t exp) { vscp_TxMessage txMsg; - vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_RADIATION_DOSE, VSCP_PRIORITY_3_NORMAL); + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_RADIATION_DOSE_ABSORBED, VSCP_PRIORITY_3_NORMAL); txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); @@ -1145,7 +1145,7 @@ extern BOOL vscp_evt_measurement_sendLuminance(uint8_t index, uint8_t unit, int3 } /** - * Chemical concentration + * Chemical (molar) concentration * * @param[in] index Index for sensor. * @param[in] unit The unit of the data. @@ -1154,11 +1154,11 @@ extern BOOL vscp_evt_measurement_sendLuminance(uint8_t index, uint8_t unit, int3 * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurement_sendChemicalConcentration(uint8_t index, uint8_t unit, int32_t data, int8_t exp) +extern BOOL vscp_evt_measurement_sendChemicalMolarConcentration(uint8_t index, uint8_t unit, int32_t data, int8_t exp) { vscp_TxMessage txMsg; - vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_CHEMICAL_CONCENTRATION, VSCP_PRIORITY_3_NORMAL); + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_CHEMICAL_CONCENTRATION_MOLAR, VSCP_PRIORITY_3_NORMAL); txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); @@ -1168,10 +1168,10 @@ extern BOOL vscp_evt_measurement_sendChemicalConcentration(uint8_t index, uint8_ return vscp_core_sendEvent(&txMsg); } -/* "Reserved" not supported. No frame defined. */ +/* "Chemical (mass) concentration" not supported. No frame defined. */ /** - * Dose equivalent + * Reserved * * @param[in] index Index for sensor. * @param[in] unit The unit of the data. @@ -1180,11 +1180,11 @@ extern BOOL vscp_evt_measurement_sendChemicalConcentration(uint8_t index, uint8_ * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurement_sendDoseEquivalent(uint8_t index, uint8_t unit, int32_t data, int8_t exp) +extern BOOL vscp_evt_measurement_sendReserved(uint8_t index, uint8_t unit, int32_t data, int8_t exp) { vscp_TxMessage txMsg; - vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_DOSE_EQVIVALENT, VSCP_PRIORITY_3_NORMAL); + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_RESERVED47, VSCP_PRIORITY_3_NORMAL); txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); diff --git a/src/framework/events/vscp_evt_measurement.h b/src/framework/events/vscp_evt_measurement.h index ed47566..0974152 100644 --- a/src/framework/events/vscp_evt_measurement.h +++ b/src/framework/events/vscp_evt_measurement.h @@ -387,7 +387,7 @@ extern BOOL vscp_evt_measurement_sendLuminousFlux(uint8_t index, uint8_t unit, i extern BOOL vscp_evt_measurement_sendIlluminance(uint8_t index, uint8_t unit, int32_t data, int8_t exp); /** - * Radiation dose + * Radiation dose (absorbed) * * @param[in] index Index for sensor. * @param[in] unit The unit of the data. @@ -396,7 +396,7 @@ extern BOOL vscp_evt_measurement_sendIlluminance(uint8_t index, uint8_t unit, in * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurement_sendRadiationDose(uint8_t index, uint8_t unit, int32_t data, int8_t exp); +extern BOOL vscp_evt_measurement_sendRadiationDoseAbsorbed(uint8_t index, uint8_t unit, int32_t data, int8_t exp); /** * Catalytic activity @@ -615,7 +615,7 @@ extern BOOL vscp_evt_measurement_sendLuminousEnergy(uint8_t index, uint8_t unit, extern BOOL vscp_evt_measurement_sendLuminance(uint8_t index, uint8_t unit, int32_t data, int8_t exp); /** - * Chemical concentration + * Chemical (molar) concentration * * @param[in] index Index for sensor. * @param[in] unit The unit of the data. @@ -624,12 +624,12 @@ extern BOOL vscp_evt_measurement_sendLuminance(uint8_t index, uint8_t unit, int3 * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurement_sendChemicalConcentration(uint8_t index, uint8_t unit, int32_t data, int8_t exp); +extern BOOL vscp_evt_measurement_sendChemicalMolarConcentration(uint8_t index, uint8_t unit, int32_t data, int8_t exp); -/* "Reserved" not supported. No frame defined. */ +/* "Chemical (mass) concentration" not supported. No frame defined. */ /** - * Dose equivalent + * Reserved * * @param[in] index Index for sensor. * @param[in] unit The unit of the data. @@ -638,7 +638,7 @@ extern BOOL vscp_evt_measurement_sendChemicalConcentration(uint8_t index, uint8_ * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurement_sendDoseEquivalent(uint8_t index, uint8_t unit, int32_t data, int8_t exp); +extern BOOL vscp_evt_measurement_sendReserved(uint8_t index, uint8_t unit, int32_t data, int8_t exp); /* "Reserved" not supported. No frame defined. */ diff --git a/src/framework/events/vscp_evt_measurement32.c b/src/framework/events/vscp_evt_measurement32.c index a65a6fc..d718c26 100644 --- a/src/framework/events/vscp_evt_measurement32.c +++ b/src/framework/events/vscp_evt_measurement32.c @@ -713,18 +713,18 @@ extern BOOL vscp_evt_measurement32_sendIlluminance(float_t value) } /** - * Radiation dose + * Radiation dose (absorbed) * * @param[in] value The value is a "float" - IEEE-754, 32 Bits, single precision. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurement32_sendRadiationDose(float_t value) +extern BOOL vscp_evt_measurement32_sendRadiationDoseAbsorbed(float_t value) { vscp_TxMessage txMsg; uint8_t size = 0; - vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT32, VSCP_TYPE_MEASUREMENT32_RADIATION_DOSE, VSCP_PRIORITY_3_NORMAL); + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT32, VSCP_TYPE_MEASUREMENT32_RADIATION_DOSE_ABSORBED, VSCP_PRIORITY_3_NORMAL); txMsg.data[0] = ((uint8_t*)&value)[3]; txMsg.data[1] = ((uint8_t*)&value)[2]; @@ -1188,18 +1188,18 @@ extern BOOL vscp_evt_measurement32_sendLuminance(float_t value) } /** - * Chemical concentration + * Chemical (molar) concentration * * @param[in] value The value is a "float" - IEEE-754, 32 Bits, single precision. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurement32_sendChemicalConcentration(float_t value) +extern BOOL vscp_evt_measurement32_sendChemicalMolarConcentration(float_t value) { vscp_TxMessage txMsg; uint8_t size = 0; - vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT32, VSCP_TYPE_MEASUREMENT32_CHEMICAL_CONCENTRATION, VSCP_PRIORITY_3_NORMAL); + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT32, VSCP_TYPE_MEASUREMENT32_CHEMICAL_CONCENTRATION_MOLAR, VSCP_PRIORITY_3_NORMAL); txMsg.data[0] = ((uint8_t*)&value)[3]; txMsg.data[1] = ((uint8_t*)&value)[2]; @@ -1212,21 +1212,21 @@ extern BOOL vscp_evt_measurement32_sendChemicalConcentration(float_t value) return vscp_core_sendEvent(&txMsg); } -/* "Reserved" not supported. No frame defined. */ +/* "Chemical (mass) concentration" not supported. No frame defined. */ /** - * Dose equivalent + * Reserved * * @param[in] value The value is a "float" - IEEE-754, 32 Bits, single precision. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurement32_sendDoseEquivalent(float_t value) +extern BOOL vscp_evt_measurement32_sendReserved(float_t value) { vscp_TxMessage txMsg; uint8_t size = 0; - vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT32, VSCP_TYPE_MEASUREMENT32_DOSE_EQVIVALENT, VSCP_PRIORITY_3_NORMAL); + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT32, VSCP_TYPE_MEASUREMENT32_RESERVED47, VSCP_PRIORITY_3_NORMAL); txMsg.data[0] = ((uint8_t*)&value)[3]; txMsg.data[1] = ((uint8_t*)&value)[2]; diff --git a/src/framework/events/vscp_evt_measurement32.h b/src/framework/events/vscp_evt_measurement32.h index 5de1ee1..913405f 100644 --- a/src/framework/events/vscp_evt_measurement32.h +++ b/src/framework/events/vscp_evt_measurement32.h @@ -312,13 +312,13 @@ extern BOOL vscp_evt_measurement32_sendLuminousFlux(float_t value); extern BOOL vscp_evt_measurement32_sendIlluminance(float_t value); /** - * Radiation dose + * Radiation dose (absorbed) * * @param[in] value The value is a "float" - IEEE-754, 32 Bits, single precision. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurement32_sendRadiationDose(float_t value); +extern BOOL vscp_evt_measurement32_sendRadiationDoseAbsorbed(float_t value); /** * Catalytic activity @@ -483,24 +483,24 @@ extern BOOL vscp_evt_measurement32_sendLuminousEnergy(float_t value); extern BOOL vscp_evt_measurement32_sendLuminance(float_t value); /** - * Chemical concentration + * Chemical (molar) concentration * * @param[in] value The value is a "float" - IEEE-754, 32 Bits, single precision. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurement32_sendChemicalConcentration(float_t value); +extern BOOL vscp_evt_measurement32_sendChemicalMolarConcentration(float_t value); -/* "Reserved" not supported. No frame defined. */ +/* "Chemical (mass) concentration" not supported. No frame defined. */ /** - * Dose equivalent + * Reserved * * @param[in] value The value is a "float" - IEEE-754, 32 Bits, single precision. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurement32_sendDoseEquivalent(float_t value); +extern BOOL vscp_evt_measurement32_sendReserved(float_t value); /* "Reserved" not supported. No frame defined. */ diff --git a/src/framework/events/vscp_evt_measurement64.c b/src/framework/events/vscp_evt_measurement64.c index 49379e8..c7808ec 100644 --- a/src/framework/events/vscp_evt_measurement64.c +++ b/src/framework/events/vscp_evt_measurement64.c @@ -813,18 +813,18 @@ extern BOOL vscp_evt_measurement64_sendIlluminance(double_t value) } /** - * Radiation dose + * Radiation dose (absorbed) * * @param[in] value The value is a "double" - IEEE-754, 64 Bits, double precision. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurement64_sendRadiationDose(double_t value) +extern BOOL vscp_evt_measurement64_sendRadiationDoseAbsorbed(double_t value) { vscp_TxMessage txMsg; uint8_t size = 0; - vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT64, VSCP_TYPE_MEASUREMENT64_RADIATION_DOSE, VSCP_PRIORITY_3_NORMAL); + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT64, VSCP_TYPE_MEASUREMENT64_RADIATION_DOSE_ABSORBED, VSCP_PRIORITY_3_NORMAL); txMsg.data[0] = ((uint8_t*)&value)[7]; txMsg.data[1] = ((uint8_t*)&value)[6]; @@ -1364,18 +1364,18 @@ extern BOOL vscp_evt_measurement64_sendLuminance(double_t value) } /** - * Chemical concentration + * Chemical (molar) concentration * * @param[in] value The value is a "double" - IEEE-754, 64 Bits, double precision. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurement64_sendChemicalConcentration(double_t value) +extern BOOL vscp_evt_measurement64_sendChemicalMolarConcentration(double_t value) { vscp_TxMessage txMsg; uint8_t size = 0; - vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT64, VSCP_TYPE_MEASUREMENT64_CHEMICAL_CONCENTRATION, VSCP_PRIORITY_3_NORMAL); + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT64, VSCP_TYPE_MEASUREMENT64_CHEMICAL_CONCENTRATION_MOLAR, VSCP_PRIORITY_3_NORMAL); txMsg.data[0] = ((uint8_t*)&value)[7]; txMsg.data[1] = ((uint8_t*)&value)[6]; @@ -1392,21 +1392,21 @@ extern BOOL vscp_evt_measurement64_sendChemicalConcentration(double_t value) return vscp_core_sendEvent(&txMsg); } -/* "Reserved" not supported. No frame defined. */ +/* "Chemical (mass) concentration" not supported. No frame defined. */ /** - * Dose equivalent + * Reserved * * @param[in] value The value is a "double" - IEEE-754, 64 Bits, double precision. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurement64_sendDoseEquivalent(double_t value) +extern BOOL vscp_evt_measurement64_sendReserved(double_t value) { vscp_TxMessage txMsg; uint8_t size = 0; - vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT64, VSCP_TYPE_MEASUREMENT64_DOSE_EQVIVALENT, VSCP_PRIORITY_3_NORMAL); + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT64, VSCP_TYPE_MEASUREMENT64_RESERVED47, VSCP_PRIORITY_3_NORMAL); txMsg.data[0] = ((uint8_t*)&value)[7]; txMsg.data[1] = ((uint8_t*)&value)[6]; diff --git a/src/framework/events/vscp_evt_measurement64.h b/src/framework/events/vscp_evt_measurement64.h index 4e2b7fb..f34a768 100644 --- a/src/framework/events/vscp_evt_measurement64.h +++ b/src/framework/events/vscp_evt_measurement64.h @@ -312,13 +312,13 @@ extern BOOL vscp_evt_measurement64_sendLuminousFlux(double_t value); extern BOOL vscp_evt_measurement64_sendIlluminance(double_t value); /** - * Radiation dose + * Radiation dose (absorbed) * * @param[in] value The value is a "double" - IEEE-754, 64 Bits, double precision. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurement64_sendRadiationDose(double_t value); +extern BOOL vscp_evt_measurement64_sendRadiationDoseAbsorbed(double_t value); /** * Catalytic activity @@ -483,24 +483,24 @@ extern BOOL vscp_evt_measurement64_sendLuminousEnergy(double_t value); extern BOOL vscp_evt_measurement64_sendLuminance(double_t value); /** - * Chemical concentration + * Chemical (molar) concentration * * @param[in] value The value is a "double" - IEEE-754, 64 Bits, double precision. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurement64_sendChemicalConcentration(double_t value); +extern BOOL vscp_evt_measurement64_sendChemicalMolarConcentration(double_t value); -/* "Reserved" not supported. No frame defined. */ +/* "Chemical (mass) concentration" not supported. No frame defined. */ /** - * Dose equivalent + * Reserved * * @param[in] value The value is a "double" - IEEE-754, 64 Bits, double precision. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurement64_sendDoseEquivalent(double_t value); +extern BOOL vscp_evt_measurement64_sendReserved(double_t value); /* "Reserved" not supported. No frame defined. */ diff --git a/src/framework/events/vscp_evt_measurezone.c b/src/framework/events/vscp_evt_measurezone.c index c4a031d..e3f0ab2 100644 --- a/src/framework/events/vscp_evt_measurezone.c +++ b/src/framework/events/vscp_evt_measurezone.c @@ -764,7 +764,7 @@ extern BOOL vscp_evt_measurezone_sendIlluminance(uint8_t index, uint8_t zone, ui } /** - * Radiation dose + * Radiation dose (absorbed) * * @param[in] index Index for sensor. * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. @@ -774,11 +774,11 @@ extern BOOL vscp_evt_measurezone_sendIlluminance(uint8_t index, uint8_t zone, ui * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurezone_sendRadiationDose(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp) +extern BOOL vscp_evt_measurezone_sendRadiationDoseAbsorbed(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp) { vscp_TxMessage txMsg; - vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_RADIATION_DOSE, VSCP_PRIORITY_3_NORMAL); + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_RADIATION_DOSE_ABSORBED, VSCP_PRIORITY_3_NORMAL); txMsg.dataSize = 3; txMsg.data[0] = index; @@ -1277,7 +1277,7 @@ extern BOOL vscp_evt_measurezone_sendLuminance(uint8_t index, uint8_t zone, uint } /** - * Chemical concentration + * Chemical (molar) concentration * * @param[in] index Index for sensor. * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. @@ -1287,11 +1287,11 @@ extern BOOL vscp_evt_measurezone_sendLuminance(uint8_t index, uint8_t zone, uint * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurezone_sendChemicalConcentration(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp) +extern BOOL vscp_evt_measurezone_sendChemicalMolarConcentration(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp) { vscp_TxMessage txMsg; - vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_CHEMICAL_CONCENTRATION, VSCP_PRIORITY_3_NORMAL); + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_CHEMICAL_CONCENTRATION_MOLAR, VSCP_PRIORITY_3_NORMAL); txMsg.dataSize = 3; txMsg.data[0] = index; @@ -1303,10 +1303,10 @@ extern BOOL vscp_evt_measurezone_sendChemicalConcentration(uint8_t index, uint8_ return vscp_core_sendEvent(&txMsg); } -/* "Reserved" not supported. No frame defined. */ +/* "Chemical (mass) concentration" not supported. No frame defined. */ /** - * Dose equivalent + * Reserved * * @param[in] index Index for sensor. * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. @@ -1316,11 +1316,11 @@ extern BOOL vscp_evt_measurezone_sendChemicalConcentration(uint8_t index, uint8_ * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurezone_sendDoseEquivalent(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp) +extern BOOL vscp_evt_measurezone_sendReserved(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp) { vscp_TxMessage txMsg; - vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_DOSE_EQVIVALENT, VSCP_PRIORITY_3_NORMAL); + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_RESERVED47, VSCP_PRIORITY_3_NORMAL); txMsg.dataSize = 3; txMsg.data[0] = index; diff --git a/src/framework/events/vscp_evt_measurezone.h b/src/framework/events/vscp_evt_measurezone.h index 87de63e..23cd92f 100644 --- a/src/framework/events/vscp_evt_measurezone.h +++ b/src/framework/events/vscp_evt_measurezone.h @@ -413,7 +413,7 @@ extern BOOL vscp_evt_measurezone_sendLuminousFlux(uint8_t index, uint8_t zone, u extern BOOL vscp_evt_measurezone_sendIlluminance(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp); /** - * Radiation dose + * Radiation dose (absorbed) * * @param[in] index Index for sensor. * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. @@ -423,7 +423,7 @@ extern BOOL vscp_evt_measurezone_sendIlluminance(uint8_t index, uint8_t zone, ui * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurezone_sendRadiationDose(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp); +extern BOOL vscp_evt_measurezone_sendRadiationDoseAbsorbed(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp); /** * Catalytic activity @@ -660,7 +660,7 @@ extern BOOL vscp_evt_measurezone_sendLuminousEnergy(uint8_t index, uint8_t zone, extern BOOL vscp_evt_measurezone_sendLuminance(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp); /** - * Chemical concentration + * Chemical (molar) concentration * * @param[in] index Index for sensor. * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. @@ -670,12 +670,12 @@ extern BOOL vscp_evt_measurezone_sendLuminance(uint8_t index, uint8_t zone, uint * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurezone_sendChemicalConcentration(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp); +extern BOOL vscp_evt_measurezone_sendChemicalMolarConcentration(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp); -/* "Reserved" not supported. No frame defined. */ +/* "Chemical (mass) concentration" not supported. No frame defined. */ /** - * Dose equivalent + * Reserved * * @param[in] index Index for sensor. * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. @@ -685,7 +685,7 @@ extern BOOL vscp_evt_measurezone_sendChemicalConcentration(uint8_t index, uint8_ * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_measurezone_sendDoseEquivalent(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp); +extern BOOL vscp_evt_measurezone_sendReserved(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp); /* "Reserved" not supported. No frame defined. */ diff --git a/src/framework/events/vscp_evt_protocol.c b/src/framework/events/vscp_evt_protocol.c index 5df46b2..4e0c0f0 100644 --- a/src/framework/events/vscp_evt_protocol.c +++ b/src/framework/events/vscp_evt_protocol.c @@ -504,12 +504,12 @@ extern BOOL vscp_evt_protocol_sendBlockData(uint8_t const * const data, uint8_t /** * ACK data block. * - * @param[in] blockCrc CRC for block. - * @param[in] writePointer Write pointer. + * @param[in] blockCrc The CRC is calculated over the block data only. + * @param[in] blockToWrite The block to write is the block that was sent in the last block data event. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_protocol_sendAckDataBlock(uint16_t blockCrc, uint32_t writePointer) +extern BOOL vscp_evt_protocol_sendAckDataBlock(uint16_t blockCrc, uint32_t blockToWrite) { vscp_TxMessage txMsg; uint8_t size = 0; @@ -520,10 +520,10 @@ extern BOOL vscp_evt_protocol_sendAckDataBlock(uint16_t blockCrc, uint32_t write txMsg.data[1] = (uint8_t)((blockCrc >> 0) & 0xff); size += 2; - txMsg.data[2] = (uint8_t)((writePointer >> 24) & 0xff); - txMsg.data[3] = (uint8_t)((writePointer >> 16) & 0xff); - txMsg.data[4] = (uint8_t)((writePointer >> 8) & 0xff); - txMsg.data[5] = (uint8_t)((writePointer >> 0) & 0xff); + txMsg.data[2] = (uint8_t)((blockToWrite >> 24) & 0xff); + txMsg.data[3] = (uint8_t)((blockToWrite >> 16) & 0xff); + txMsg.data[4] = (uint8_t)((blockToWrite >> 8) & 0xff); + txMsg.data[5] = (uint8_t)((blockToWrite >> 0) & 0xff); size += 4; txMsg.dataSize = size; @@ -535,11 +535,11 @@ extern BOOL vscp_evt_protocol_sendAckDataBlock(uint16_t blockCrc, uint32_t write * NACK data block. * * @param[in] errorCode User defined error code. - * @param[in] writePointer Write pointer. + * @param[in] blockToWrite The block to write is the block that was sent in the last block data event. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_protocol_sendNackDataBlock(uint8_t errorCode, uint32_t writePointer) +extern BOOL vscp_evt_protocol_sendNackDataBlock(uint8_t errorCode, uint32_t blockToWrite) { vscp_TxMessage txMsg; uint8_t size = 0; @@ -549,10 +549,10 @@ extern BOOL vscp_evt_protocol_sendNackDataBlock(uint8_t errorCode, uint32_t writ txMsg.data[0] = errorCode; size += 1; - txMsg.data[1] = (uint8_t)((writePointer >> 24) & 0xff); - txMsg.data[2] = (uint8_t)((writePointer >> 16) & 0xff); - txMsg.data[3] = (uint8_t)((writePointer >> 8) & 0xff); - txMsg.data[4] = (uint8_t)((writePointer >> 0) & 0xff); + txMsg.data[1] = (uint8_t)((blockToWrite >> 24) & 0xff); + txMsg.data[2] = (uint8_t)((blockToWrite >> 16) & 0xff); + txMsg.data[3] = (uint8_t)((blockToWrite >> 8) & 0xff); + txMsg.data[4] = (uint8_t)((blockToWrite >> 0) & 0xff); size += 4; txMsg.dataSize = size; @@ -642,7 +642,8 @@ extern BOOL vscp_evt_protocol_sendNackProgramDataBlock(uint8_t errorCode, uint32 /** * Activate new image. * - * @param[in] crc CRC of full flash data block. + * @param[in] crc Sum of all CRC of blocks that was transferred to the node up to this point (all + * memory types). * * @return If event is sent, it will return TRUE otherwise FALSE. */ @@ -1195,15 +1196,21 @@ extern BOOL vscp_evt_protocol_sendExtendedPageReadWriteResponse(uint8_t index, u /** * Get event interest. * + * @param[in] nodeAddress Node address. + * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_protocol_sendGetEventInterest(void) +extern BOOL vscp_evt_protocol_sendGetEventInterest(uint8_t nodeAddress) { vscp_TxMessage txMsg; + uint8_t size = 0; vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_PROTOCOL, VSCP_TYPE_PROTOCOL_GET_EVENT_INTEREST, VSCP_PRIORITY_3_NORMAL); - txMsg.dataSize = 0; + txMsg.data[0] = nodeAddress; + size += 1; + + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1212,90 +1219,28 @@ extern BOOL vscp_evt_protocol_sendGetEventInterest(void) * Get event interest response. * * @param[in] index Index. - * @param[in] classBit9 Class bit 9. - * @param[in] class1 Class 1. - * @param[in] type1 Type 1. (array[4]) - * @param[in] type1size Size in byte. - * @param[in] class2 Class 2. - * @param[in] type2 Type 2. (array[4]) - * @param[in] type2size Size in byte. - * @param[in] class3 Class 3. - * @param[in] type3 Type 3. (array[4]) - * @param[in] type3size Size in byte. + * @param[in] class Class. + * @param[in] type Type. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_protocol_sendGetEventInterestResponse(uint8_t index, uint16_t classBit9, uint8_t class1, uint8_t const * const type1, uint8_t type1Size, uint8_t class2, uint8_t const * const type2, uint8_t type2Size, uint8_t class3, uint8_t const * const type3, uint8_t type3Size) +extern BOOL vscp_evt_protocol_sendGetEventInterestResponse(uint8_t index, uint16_t class, uint16_t type) { vscp_TxMessage txMsg; uint8_t size = 0; - uint8_t byteIndex = 0; - - if ((NULL == type1) || (0 == type1Size)) - { - return FALSE; - } - - if ((NULL == type2) || (0 == type2Size)) - { - return FALSE; - } - - if ((NULL == type3) || (0 == type3Size)) - { - return FALSE; - } vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_PROTOCOL, VSCP_TYPE_PROTOCOL_GET_EVENT_INTEREST_RESPONSE, VSCP_PRIORITY_3_NORMAL); txMsg.data[0] = index; size += 1; - txMsg.data[1] = (uint8_t)((classBit9 >> 8) & 0xff); - txMsg.data[2] = (uint8_t)((classBit9 >> 0) & 0xff); + txMsg.data[1] = (uint8_t)((class >> 8) & 0xff); + txMsg.data[2] = (uint8_t)((class >> 0) & 0xff); size += 2; - txMsg.data[2] = class1; - size += 1; - - for(byteIndex = 0; byteIndex < type1Size; ++byteIndex) - { - txMsg.data[3 + byteIndex] = type1[byteIndex]; - size += 1; - - if (VSCP_L1_DATA_SIZE <= size) - { - break; - } - } - - txMsg.data[4] = class2; - size += 1; - - for(byteIndex = 0; byteIndex < type2Size; ++byteIndex) - { - txMsg.data[5 + byteIndex] = type2[byteIndex]; - size += 1; - - if (VSCP_L1_DATA_SIZE <= size) - { - break; - } - } - - txMsg.data[6] = class3; - size += 1; - - for(byteIndex = 0; byteIndex < type3Size; ++byteIndex) - { - txMsg.data[7 + byteIndex] = type3[byteIndex]; - size += 1; - - if (VSCP_L1_DATA_SIZE <= size) - { - break; - } - } + txMsg.data[3] = (uint8_t)((type >> 8) & 0xff); + txMsg.data[4] = (uint8_t)((type >> 0) & 0xff); + size += 2; txMsg.dataSize = size; @@ -1335,11 +1280,11 @@ extern BOOL vscp_evt_protocol_sendActivateNewImageNack(void) } /** - * Block data transfer ACK. + * Start block ACK. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_protocol_sendBlockDataTransferAck(void) +extern BOOL vscp_evt_protocol_sendStartBlockAck(void) { vscp_TxMessage txMsg; @@ -1351,11 +1296,11 @@ extern BOOL vscp_evt_protocol_sendBlockDataTransferAck(void) } /** - * Block data transfer NACK. + * Start block NACK. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_protocol_sendBlockDataTransferNack(void) +extern BOOL vscp_evt_protocol_sendStartBlockNack(void) { vscp_TxMessage txMsg; @@ -1366,3 +1311,51 @@ extern BOOL vscp_evt_protocol_sendBlockDataTransferNack(void) return vscp_core_sendEvent(&txMsg); } +/** + * Block Data Chunk ACK. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_protocol_sendBlockDataChunkAck(void) +{ + vscp_TxMessage txMsg; + + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_PROTOCOL, VSCP_TYPE_PROTOCOL_BLOCK_CHUNK_ACK, VSCP_PRIORITY_3_NORMAL); + + txMsg.dataSize = 0; + + return vscp_core_sendEvent(&txMsg); +} + +/** + * Block Data Chunk NACK. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_protocol_sendBlockDataChunkNack(void) +{ + vscp_TxMessage txMsg; + + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_PROTOCOL, VSCP_TYPE_PROTOCOL_BLOCK_CHUNK_NACK, VSCP_PRIORITY_3_NORMAL); + + txMsg.dataSize = 0; + + return vscp_core_sendEvent(&txMsg); +} + +/** + * Bootloader CHECK. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_protocol_sendBootloaderCheck(void) +{ + vscp_TxMessage txMsg; + + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_PROTOCOL, VSCP_TYPE_PROTOCOL_BOOT_LOADER_CHECK, VSCP_PRIORITY_3_NORMAL); + + txMsg.dataSize = 0; + + return vscp_core_sendEvent(&txMsg); +} + diff --git a/src/framework/events/vscp_evt_protocol.h b/src/framework/events/vscp_evt_protocol.h index 70093c5..d15aceb 100644 --- a/src/framework/events/vscp_evt_protocol.h +++ b/src/framework/events/vscp_evt_protocol.h @@ -240,22 +240,22 @@ extern BOOL vscp_evt_protocol_sendBlockData(uint8_t const * const data, uint8_t /** * ACK data block. * - * @param[in] blockCrc CRC for block. - * @param[in] writePointer Write pointer. + * @param[in] blockCrc The CRC is calculated over the block data only. + * @param[in] blockToWrite The block to write is the block that was sent in the last block data event. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_protocol_sendAckDataBlock(uint16_t blockCrc, uint32_t writePointer); +extern BOOL vscp_evt_protocol_sendAckDataBlock(uint16_t blockCrc, uint32_t blockToWrite); /** * NACK data block. * * @param[in] errorCode User defined error code. - * @param[in] writePointer Write pointer. + * @param[in] blockToWrite The block to write is the block that was sent in the last block data event. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_protocol_sendNackDataBlock(uint8_t errorCode, uint32_t writePointer); +extern BOOL vscp_evt_protocol_sendNackDataBlock(uint8_t errorCode, uint32_t blockToWrite); /** * Program data block. @@ -288,7 +288,8 @@ extern BOOL vscp_evt_protocol_sendNackProgramDataBlock(uint8_t errorCode, uint32 /** * Activate new image. * - * @param[in] crc CRC of full flash data block. + * @param[in] crc Sum of all CRC of blocks that was transferred to the node up to this point (all + * memory types). * * @return If event is sent, it will return TRUE otherwise FALSE. */ @@ -462,28 +463,22 @@ extern BOOL vscp_evt_protocol_sendExtendedPageReadWriteResponse(uint8_t index, u /** * Get event interest. * + * @param[in] nodeAddress Node address. + * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_protocol_sendGetEventInterest(void); +extern BOOL vscp_evt_protocol_sendGetEventInterest(uint8_t nodeAddress); /** * Get event interest response. * * @param[in] index Index. - * @param[in] classBit9 Class bit 9. - * @param[in] class1 Class 1. - * @param[in] type1 Type 1. (array[4]) - * @param[in] type1size Size in byte. - * @param[in] class2 Class 2. - * @param[in] type2 Type 2. (array[4]) - * @param[in] type2size Size in byte. - * @param[in] class3 Class 3. - * @param[in] type3 Type 3. (array[4]) - * @param[in] type3size Size in byte. + * @param[in] class Class. + * @param[in] type Type. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_protocol_sendGetEventInterestResponse(uint8_t index, uint16_t classBit9, uint8_t class1, uint8_t const * const type1, uint8_t type1Size, uint8_t class2, uint8_t const * const type2, uint8_t type2Size, uint8_t class3, uint8_t const * const type3, uint8_t type3Size); +extern BOOL vscp_evt_protocol_sendGetEventInterestResponse(uint8_t index, uint16_t class, uint16_t type); /** * Activate new image ACK. @@ -500,18 +495,39 @@ extern BOOL vscp_evt_protocol_sendActivateNewImageAck(void); extern BOOL vscp_evt_protocol_sendActivateNewImageNack(void); /** - * Block data transfer ACK. + * Start block ACK. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_protocol_sendStartBlockAck(void); + +/** + * Start block NACK. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_protocol_sendStartBlockNack(void); + +/** + * Block Data Chunk ACK. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_protocol_sendBlockDataChunkAck(void); + +/** + * Block Data Chunk NACK. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_protocol_sendBlockDataTransferAck(void); +extern BOOL vscp_evt_protocol_sendBlockDataChunkNack(void); /** - * Block data transfer NACK. + * Bootloader CHECK. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_protocol_sendBlockDataTransferNack(void); +extern BOOL vscp_evt_protocol_sendBootloaderCheck(void); #ifdef __cplusplus } diff --git a/src/framework/events/vscp_evt_setvaluezone.c b/src/framework/events/vscp_evt_setvaluezone.c index e89c6d2..e849d5c 100644 --- a/src/framework/events/vscp_evt_setvaluezone.c +++ b/src/framework/events/vscp_evt_setvaluezone.c @@ -2420,7 +2420,7 @@ extern BOOL vscp_evt_setvaluezone_sendLuminance(uint8_t index, uint8_t zone, uin } /** - * Chemical concentration + * Chemical (molar) concentration * * @param[in] index Index for sensor. * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. @@ -2431,7 +2431,7 @@ extern BOOL vscp_evt_setvaluezone_sendLuminance(uint8_t index, uint8_t zone, uin * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_setvaluezone_sendChemicalConcentration(uint8_t index, uint8_t zone, uint8_t subZone, uint8_t dataCoding, uint8_t const * const data, uint8_t dataSize) +extern BOOL vscp_evt_setvaluezone_sendChemicalMolarConcentration(uint8_t index, uint8_t zone, uint8_t subZone, uint8_t dataCoding, uint8_t const * const data, uint8_t dataSize) { vscp_TxMessage txMsg; uint8_t size = 0; @@ -2442,7 +2442,7 @@ extern BOOL vscp_evt_setvaluezone_sendChemicalConcentration(uint8_t index, uint8 return FALSE; } - vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_SETVALUEZONE, VSCP_TYPE_SETVALUEZONE_CHEMICAL_CONCENTRATION, VSCP_PRIORITY_3_NORMAL); + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_SETVALUEZONE, VSCP_TYPE_SETVALUEZONE_CHEMICAL_CONCENTRATION_MOLAR, VSCP_PRIORITY_3_NORMAL); txMsg.data[0] = index; size += 1; @@ -2472,10 +2472,10 @@ extern BOOL vscp_evt_setvaluezone_sendChemicalConcentration(uint8_t index, uint8 return vscp_core_sendEvent(&txMsg); } -/* "Reserved" not supported. No frame defined. */ +/* "Chemical (mass) concentration" not supported. No frame defined. */ /** - * Dose equivalent + * Reserved * * @param[in] index Index for sensor. * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. @@ -2486,7 +2486,7 @@ extern BOOL vscp_evt_setvaluezone_sendChemicalConcentration(uint8_t index, uint8 * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_setvaluezone_sendDoseEquivalent(uint8_t index, uint8_t zone, uint8_t subZone, uint8_t dataCoding, uint8_t const * const data, uint8_t dataSize) +extern BOOL vscp_evt_setvaluezone_sendReserved(uint8_t index, uint8_t zone, uint8_t subZone, uint8_t dataCoding, uint8_t const * const data, uint8_t dataSize) { vscp_TxMessage txMsg; uint8_t size = 0; @@ -2497,7 +2497,7 @@ extern BOOL vscp_evt_setvaluezone_sendDoseEquivalent(uint8_t index, uint8_t zone return FALSE; } - vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_SETVALUEZONE, VSCP_TYPE_SETVALUEZONE_DOSE_EQVIVALENT, VSCP_PRIORITY_3_NORMAL); + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_SETVALUEZONE, VSCP_TYPE_SETVALUEZONE_RESERVED47, VSCP_PRIORITY_3_NORMAL); txMsg.data[0] = index; size += 1; diff --git a/src/framework/events/vscp_evt_setvaluezone.h b/src/framework/events/vscp_evt_setvaluezone.h index c28f2d5..4c9a862 100644 --- a/src/framework/events/vscp_evt_setvaluezone.h +++ b/src/framework/events/vscp_evt_setvaluezone.h @@ -702,7 +702,7 @@ extern BOOL vscp_evt_setvaluezone_sendLuminousEnergy(uint8_t index, uint8_t zone extern BOOL vscp_evt_setvaluezone_sendLuminance(uint8_t index, uint8_t zone, uint8_t subZone, uint8_t dataCoding, uint8_t const * const data, uint8_t dataSize); /** - * Chemical concentration + * Chemical (molar) concentration * * @param[in] index Index for sensor. * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. @@ -713,12 +713,12 @@ extern BOOL vscp_evt_setvaluezone_sendLuminance(uint8_t index, uint8_t zone, uin * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_setvaluezone_sendChemicalConcentration(uint8_t index, uint8_t zone, uint8_t subZone, uint8_t dataCoding, uint8_t const * const data, uint8_t dataSize); +extern BOOL vscp_evt_setvaluezone_sendChemicalMolarConcentration(uint8_t index, uint8_t zone, uint8_t subZone, uint8_t dataCoding, uint8_t const * const data, uint8_t dataSize); -/* "Reserved" not supported. No frame defined. */ +/* "Chemical (mass) concentration" not supported. No frame defined. */ /** - * Dose equivalent + * Reserved * * @param[in] index Index for sensor. * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. @@ -729,7 +729,7 @@ extern BOOL vscp_evt_setvaluezone_sendChemicalConcentration(uint8_t index, uint8 * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_setvaluezone_sendDoseEquivalent(uint8_t index, uint8_t zone, uint8_t subZone, uint8_t dataCoding, uint8_t const * const data, uint8_t dataSize); +extern BOOL vscp_evt_setvaluezone_sendReserved(uint8_t index, uint8_t zone, uint8_t subZone, uint8_t dataCoding, uint8_t const * const data, uint8_t dataSize); /* "Reserved" not supported. No frame defined. */ From a3f73203d0214e498989c13447745d3ee8df96a0 Mon Sep 17 00:00:00 2001 From: BlueAndi Date: Mon, 6 Jan 2025 20:21:13 +0100 Subject: [PATCH 2/6] Update to VSCP specification v1.15.4 --- src/framework/core/vscp_core.h | 2 +- src/framework/core/vscp_type_measurement.h | 2 +- src/framework/core/vscp_type_measurement32.h | 2 +- src/framework/core/vscp_type_measurement64.h | 2 +- src/framework/core/vscp_type_measurezone.h | 2 +- src/framework/events/vscp_evt_control.c | 4 ++-- src/framework/events/vscp_evt_measurement.c | 2 +- src/framework/events/vscp_evt_measurement32.c | 2 +- src/framework/events/vscp_evt_measurement64.c | 2 +- src/framework/events/vscp_evt_measurezone.c | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/framework/core/vscp_core.h b/src/framework/core/vscp_core.h index 584affb..c966d57 100644 --- a/src/framework/core/vscp_core.h +++ b/src/framework/core/vscp_core.h @@ -99,7 +99,7 @@ extern "C" #define VSCP_CORE_VERSION_SUB_MINOR (1) /** VSCP specification version string, the framework is compliant to. */ -#define VSCP_CORE_VERSION_STR "v1.13.1" +#define VSCP_CORE_VERSION_STR "v1.15.4" /** VSCP framework version string */ #define VSCP_CORE_FRAMEWORK_VERSION "v2.1.0" diff --git a/src/framework/core/vscp_type_measurement.h b/src/framework/core/vscp_type_measurement.h index c0437dd..5a611dc 100644 --- a/src/framework/core/vscp_type_measurement.h +++ b/src/framework/core/vscp_type_measurement.h @@ -461,7 +461,7 @@ extern "C" * Optional unit rem (1) * This is a measurement of a radiation dose (Equivalent dose of ionizing radiation). */ -#define VSCP_TYPE_MEASUREMENT_RADIATION_DOSE_EQ 61 +#define VSCP_TYPE_MEASUREMENT_DOSE_EQUIVALENT 61 /** * Default unit: coulomb per kilogram (C/kg). diff --git a/src/framework/core/vscp_type_measurement32.h b/src/framework/core/vscp_type_measurement32.h index b55c89c..b356d8c 100644 --- a/src/framework/core/vscp_type_measurement32.h +++ b/src/framework/core/vscp_type_measurement32.h @@ -460,7 +460,7 @@ extern "C" * Optional unit rem (1) * This is a measurement of a radiation dose (Equivalent dose of ionizing radiation). */ -#define VSCP_TYPE_MEASUREMENT32_RADIATION_DOSE_EQ 61 +#define VSCP_TYPE_MEASUREMENT32_DOSE_EQUIVALENT 61 /** * Default unit: coulomb per kilogram (C/kg). diff --git a/src/framework/core/vscp_type_measurement64.h b/src/framework/core/vscp_type_measurement64.h index d446187..3702eff 100644 --- a/src/framework/core/vscp_type_measurement64.h +++ b/src/framework/core/vscp_type_measurement64.h @@ -460,7 +460,7 @@ extern "C" * Optional unit rem (1) * This is a measurement of a radiation dose (Equivalent dose of ionizing radiation). */ -#define VSCP_TYPE_MEASUREMENT64_RADIATION_DOSE_EQ 61 +#define VSCP_TYPE_MEASUREMENT64_DOSE_EQUIVALENT 61 /** * Default unit: coulomb per kilogram (C/kg). diff --git a/src/framework/core/vscp_type_measurezone.h b/src/framework/core/vscp_type_measurezone.h index eeb02f3..99b0de0 100644 --- a/src/framework/core/vscp_type_measurezone.h +++ b/src/framework/core/vscp_type_measurezone.h @@ -462,7 +462,7 @@ extern "C" * Optional unit rem (1) * This is a measurement of a radiation dose (Equivalent dose of ionizing radiation). */ -#define VSCP_TYPE_MEASUREZONE_RADIATION_DOSE_EQ 61 +#define VSCP_TYPE_MEASUREZONE_DOSE_EQUIVALENT 61 /** * Default unit: coulomb per kilogram (C/kg). diff --git a/src/framework/events/vscp_evt_control.c b/src/framework/events/vscp_evt_control.c index 18a4efb..e43a0ab 100644 --- a/src/framework/events/vscp_evt_control.c +++ b/src/framework/events/vscp_evt_control.c @@ -1603,8 +1603,8 @@ extern BOOL vscp_evt_control_sendSetSecurityPin(uint8_t reserved, uint8_t zone, * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. * @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones. * @param[in] securityPassword Security password. This password can be 1-5 bytes and length of event - * is set accordingly. It should be interpreted as an UTF-8 string with a length set bt event data - * length - 3 (array[5]) + * is set accordingly. It should be interpreted as a UTF-8 string of length equal to the event data + * length minus 3 bytes (array[5]) * @param[in] securityPasswordsize Size in byte. * * @return If event is sent, it will return TRUE otherwise FALSE. diff --git a/src/framework/events/vscp_evt_measurement.c b/src/framework/events/vscp_evt_measurement.c index 444c064..df61fca 100644 --- a/src/framework/events/vscp_evt_measurement.c +++ b/src/framework/events/vscp_evt_measurement.c @@ -1498,7 +1498,7 @@ extern BOOL vscp_evt_measurement_sendRadiationDoseEquivalent(uint8_t index, uint { vscp_TxMessage txMsg; - vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_RADIATION_DOSE_EQ, VSCP_PRIORITY_3_NORMAL); + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_DOSE_EQUIVALENT, VSCP_PRIORITY_3_NORMAL); txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); diff --git a/src/framework/events/vscp_evt_measurement32.c b/src/framework/events/vscp_evt_measurement32.c index d718c26..2583d45 100644 --- a/src/framework/events/vscp_evt_measurement32.c +++ b/src/framework/events/vscp_evt_measurement32.c @@ -1553,7 +1553,7 @@ extern BOOL vscp_evt_measurement32_sendRadiationDoseEquivalent(float_t value) vscp_TxMessage txMsg; uint8_t size = 0; - vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT32, VSCP_TYPE_MEASUREMENT32_RADIATION_DOSE_EQ, VSCP_PRIORITY_3_NORMAL); + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT32, VSCP_TYPE_MEASUREMENT32_DOSE_EQUIVALENT, VSCP_PRIORITY_3_NORMAL); txMsg.data[0] = ((uint8_t*)&value)[3]; txMsg.data[1] = ((uint8_t*)&value)[2]; diff --git a/src/framework/events/vscp_evt_measurement64.c b/src/framework/events/vscp_evt_measurement64.c index c7808ec..b3c520c 100644 --- a/src/framework/events/vscp_evt_measurement64.c +++ b/src/framework/events/vscp_evt_measurement64.c @@ -1785,7 +1785,7 @@ extern BOOL vscp_evt_measurement64_sendRadiationDoseEquivalent(double_t value) vscp_TxMessage txMsg; uint8_t size = 0; - vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT64, VSCP_TYPE_MEASUREMENT64_RADIATION_DOSE_EQ, VSCP_PRIORITY_3_NORMAL); + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT64, VSCP_TYPE_MEASUREMENT64_DOSE_EQUIVALENT, VSCP_PRIORITY_3_NORMAL); txMsg.data[0] = ((uint8_t*)&value)[7]; txMsg.data[1] = ((uint8_t*)&value)[6]; diff --git a/src/framework/events/vscp_evt_measurezone.c b/src/framework/events/vscp_evt_measurezone.c index e3f0ab2..eb8f033 100644 --- a/src/framework/events/vscp_evt_measurezone.c +++ b/src/framework/events/vscp_evt_measurezone.c @@ -1673,7 +1673,7 @@ extern BOOL vscp_evt_measurezone_sendRadiationDoseEquivalent(uint8_t index, uint { vscp_TxMessage txMsg; - vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_RADIATION_DOSE_EQ, VSCP_PRIORITY_3_NORMAL); + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_DOSE_EQUIVALENT, VSCP_PRIORITY_3_NORMAL); txMsg.dataSize = 3; txMsg.data[0] = index; From e467053d25062ef3c2ac8a9180223c471dfa420a Mon Sep 17 00:00:00 2001 From: BlueAndi Date: Mon, 6 Jan 2025 20:53:09 +0100 Subject: [PATCH 3/6] Copyright year updated. --- LICENSE | 2 +- examples/Generic/Generic.ino | 2 +- examples/LampAndButtonTest/LampAndButtonTest.ino | 2 +- .../Seeed-Studio-CAN_BUS_Shield/Seeed-Studio-CAN_BUS_Shield.ino | 2 +- examples/Sparkfun_CAN-BUS_Shield/Sparkfun_CAN-BUS_Shield.ino | 2 +- mdf_template.xml | 2 +- src/DigInDebounce.h | 2 +- src/SwTimer.h | 2 +- src/VSCP.cpp | 2 +- src/VSCP.h | 2 +- src/framework/core/vscp_class_l1.h | 2 +- src/framework/core/vscp_class_l1_l2.h | 2 +- src/framework/core/vscp_config.h | 2 +- src/framework/core/vscp_config_base.h | 2 +- src/framework/core/vscp_core.c | 2 +- src/framework/core/vscp_core.h | 2 +- src/framework/core/vscp_data_coding.c | 2 +- src/framework/core/vscp_data_coding.h | 2 +- src/framework/core/vscp_dev_data.c | 2 +- src/framework/core/vscp_dev_data.h | 2 +- src/framework/core/vscp_dev_data_config.h | 2 +- src/framework/core/vscp_dm.c | 2 +- src/framework/core/vscp_dm.h | 2 +- src/framework/core/vscp_dm_ng.c | 2 +- src/framework/core/vscp_dm_ng.h | 2 +- src/framework/core/vscp_logger.c | 2 +- src/framework/core/vscp_logger.h | 2 +- src/framework/core/vscp_ps.c | 2 +- src/framework/core/vscp_ps.h | 2 +- src/framework/core/vscp_transport.c | 2 +- src/framework/core/vscp_transport.h | 2 +- src/framework/core/vscp_type_alarm.h | 2 +- src/framework/core/vscp_type_aol.h | 2 +- src/framework/core/vscp_type_configuration.h | 2 +- src/framework/core/vscp_type_control.h | 2 +- src/framework/core/vscp_type_data.h | 2 +- src/framework/core/vscp_type_diagnostic.h | 2 +- src/framework/core/vscp_type_display.h | 2 +- src/framework/core/vscp_type_error.h | 2 +- src/framework/core/vscp_type_gnss.h | 2 +- src/framework/core/vscp_type_information.h | 2 +- src/framework/core/vscp_type_ir.h | 2 +- src/framework/core/vscp_type_log.h | 2 +- src/framework/core/vscp_type_measurement.h | 2 +- src/framework/core/vscp_type_measurement32.h | 2 +- src/framework/core/vscp_type_measurement64.h | 2 +- src/framework/core/vscp_type_measurezone.h | 2 +- src/framework/core/vscp_type_multimedia.h | 2 +- src/framework/core/vscp_type_phone.h | 2 +- src/framework/core/vscp_type_protocol.h | 2 +- src/framework/core/vscp_type_remote.h | 2 +- src/framework/core/vscp_type_security.h | 2 +- src/framework/core/vscp_type_setvaluezone.h | 2 +- src/framework/core/vscp_type_weather.h | 2 +- src/framework/core/vscp_type_weather_forecast.h | 2 +- src/framework/core/vscp_type_wireless.h | 2 +- src/framework/core/vscp_types.h | 2 +- src/framework/core/vscp_util.c | 2 +- src/framework/core/vscp_util.h | 2 +- src/framework/events/vscp_evt_alarm.c | 2 +- src/framework/events/vscp_evt_alarm.h | 2 +- src/framework/events/vscp_evt_aol.c | 2 +- src/framework/events/vscp_evt_aol.h | 2 +- src/framework/events/vscp_evt_configuration.c | 2 +- src/framework/events/vscp_evt_configuration.h | 2 +- src/framework/events/vscp_evt_control.c | 2 +- src/framework/events/vscp_evt_control.h | 2 +- src/framework/events/vscp_evt_data.c | 2 +- src/framework/events/vscp_evt_data.h | 2 +- src/framework/events/vscp_evt_diagnostic.c | 2 +- src/framework/events/vscp_evt_diagnostic.h | 2 +- src/framework/events/vscp_evt_display.c | 2 +- src/framework/events/vscp_evt_display.h | 2 +- src/framework/events/vscp_evt_error.c | 2 +- src/framework/events/vscp_evt_error.h | 2 +- src/framework/events/vscp_evt_gnss.c | 2 +- src/framework/events/vscp_evt_gnss.h | 2 +- src/framework/events/vscp_evt_information.c | 2 +- src/framework/events/vscp_evt_information.h | 2 +- src/framework/events/vscp_evt_ir.c | 2 +- src/framework/events/vscp_evt_ir.h | 2 +- src/framework/events/vscp_evt_log.c | 2 +- src/framework/events/vscp_evt_log.h | 2 +- src/framework/events/vscp_evt_measurement.c | 2 +- src/framework/events/vscp_evt_measurement.h | 2 +- src/framework/events/vscp_evt_measurement32.c | 2 +- src/framework/events/vscp_evt_measurement32.h | 2 +- src/framework/events/vscp_evt_measurement64.c | 2 +- src/framework/events/vscp_evt_measurement64.h | 2 +- src/framework/events/vscp_evt_measurezone.c | 2 +- src/framework/events/vscp_evt_measurezone.h | 2 +- src/framework/events/vscp_evt_multimedia.c | 2 +- src/framework/events/vscp_evt_multimedia.h | 2 +- src/framework/events/vscp_evt_phone.c | 2 +- src/framework/events/vscp_evt_phone.h | 2 +- src/framework/events/vscp_evt_protocol.c | 2 +- src/framework/events/vscp_evt_protocol.h | 2 +- src/framework/events/vscp_evt_security.c | 2 +- src/framework/events/vscp_evt_security.h | 2 +- src/framework/events/vscp_evt_setvaluezone.c | 2 +- src/framework/events/vscp_evt_setvaluezone.h | 2 +- src/framework/events/vscp_evt_weather.c | 2 +- src/framework/events/vscp_evt_weather.h | 2 +- src/framework/events/vscp_evt_weather_forecast.c | 2 +- src/framework/events/vscp_evt_weather_forecast.h | 2 +- src/framework/events/vscp_evt_wireless.c | 2 +- src/framework/events/vscp_evt_wireless.h | 2 +- src/framework/user/vscp_action.c | 2 +- src/framework/user/vscp_action.h | 2 +- src/framework/user/vscp_app_reg.c | 2 +- src/framework/user/vscp_app_reg.h | 2 +- src/framework/user/vscp_config_overwrite.h | 2 +- src/framework/user/vscp_dev_data_config_overwrite.h | 2 +- src/framework/user/vscp_platform.h | 2 +- src/framework/user/vscp_portable.c | 2 +- src/framework/user/vscp_portable.h | 2 +- src/framework/user/vscp_ps_access.c | 2 +- src/framework/user/vscp_ps_access.h | 2 +- src/framework/user/vscp_timer.c | 2 +- src/framework/user/vscp_timer.h | 2 +- src/framework/user/vscp_tp_adapter.c | 2 +- src/framework/user/vscp_tp_adapter.h | 2 +- 122 files changed, 122 insertions(+), 122 deletions(-) diff --git a/LICENSE b/LICENSE index 80121f2..96af6d8 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014 - 2024 Andreas Merkle +Copyright (c) 2014 - 2025 Andreas Merkle http://www.blue-andi.de vscp@blue-andi.de diff --git a/examples/Generic/Generic.ino b/examples/Generic/Generic.ino index 0139b56..377a85d 100644 --- a/examples/Generic/Generic.ino +++ b/examples/Generic/Generic.ino @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024, Andreas Merkle + * Copyright (c) 2014 - 2025, Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/examples/LampAndButtonTest/LampAndButtonTest.ino b/examples/LampAndButtonTest/LampAndButtonTest.ino index 1eb0fac..519196c 100644 --- a/examples/LampAndButtonTest/LampAndButtonTest.ino +++ b/examples/LampAndButtonTest/LampAndButtonTest.ino @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024, Andreas Merkle + * Copyright (c) 2014 - 2025, Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/examples/Seeed-Studio-CAN_BUS_Shield/Seeed-Studio-CAN_BUS_Shield.ino b/examples/Seeed-Studio-CAN_BUS_Shield/Seeed-Studio-CAN_BUS_Shield.ino index ebfece4..9c6b43b 100644 --- a/examples/Seeed-Studio-CAN_BUS_Shield/Seeed-Studio-CAN_BUS_Shield.ino +++ b/examples/Seeed-Studio-CAN_BUS_Shield/Seeed-Studio-CAN_BUS_Shield.ino @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024, Andreas Merkle + * Copyright (c) 2014 - 2025, Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/examples/Sparkfun_CAN-BUS_Shield/Sparkfun_CAN-BUS_Shield.ino b/examples/Sparkfun_CAN-BUS_Shield/Sparkfun_CAN-BUS_Shield.ino index ffc4709..7293cf5 100644 --- a/examples/Sparkfun_CAN-BUS_Shield/Sparkfun_CAN-BUS_Shield.ino +++ b/examples/Sparkfun_CAN-BUS_Shield/Sparkfun_CAN-BUS_Shield.ino @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024, Andreas Merkle + * Copyright (c) 2014 - 2025, Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/mdf_template.xml b/mdf_template.xml index 8018f95..bf18ac0 100644 --- a/mdf_template.xml +++ b/mdf_template.xml @@ -4,7 +4,7 @@ The MIT License (MIT) -Copyright (c) 2014 - 2024 Andreas Merkle +Copyright (c) 2014 - 2025 Andreas Merkle http://www.blue-andi.de vscp@blue-andi.de diff --git a/src/DigInDebounce.h b/src/DigInDebounce.h index a4f3cd1..daabe84 100644 --- a/src/DigInDebounce.h +++ b/src/DigInDebounce.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/SwTimer.h b/src/SwTimer.h index 2b7502d..cc1a892 100644 --- a/src/SwTimer.h +++ b/src/SwTimer.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/VSCP.cpp b/src/VSCP.cpp index a9a2997..7c41893 100644 --- a/src/VSCP.cpp +++ b/src/VSCP.cpp @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024, Andreas Merkle + * Copyright (c) 2014 - 2025, Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/VSCP.h b/src/VSCP.h index bf1768c..b251439 100644 --- a/src/VSCP.h +++ b/src/VSCP.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_class_l1.h b/src/framework/core/vscp_class_l1.h index d605e37..0e8489f 100644 --- a/src/framework/core/vscp_class_l1.h +++ b/src/framework/core/vscp_class_l1.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_class_l1_l2.h b/src/framework/core/vscp_class_l1_l2.h index 8c883f3..b41ebc0 100644 --- a/src/framework/core/vscp_class_l1_l2.h +++ b/src/framework/core/vscp_class_l1_l2.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_config.h b/src/framework/core/vscp_config.h index 3361a3b..29d0d24 100644 --- a/src/framework/core/vscp_config.h +++ b/src/framework/core/vscp_config.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_config_base.h b/src/framework/core/vscp_config_base.h index ba27083..b050899 100644 --- a/src/framework/core/vscp_config_base.h +++ b/src/framework/core/vscp_config_base.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_core.c b/src/framework/core/vscp_core.c index 91df1d5..4d00ae9 100644 --- a/src/framework/core/vscp_core.c +++ b/src/framework/core/vscp_core.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_core.h b/src/framework/core/vscp_core.h index c966d57..dcadf85 100644 --- a/src/framework/core/vscp_core.h +++ b/src/framework/core/vscp_core.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_data_coding.c b/src/framework/core/vscp_data_coding.c index 4108502..7182fe0 100644 --- a/src/framework/core/vscp_data_coding.c +++ b/src/framework/core/vscp_data_coding.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_data_coding.h b/src/framework/core/vscp_data_coding.h index 4d817ab..5198c84 100644 --- a/src/framework/core/vscp_data_coding.h +++ b/src/framework/core/vscp_data_coding.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_dev_data.c b/src/framework/core/vscp_dev_data.c index 56fb582..aa2e111 100644 --- a/src/framework/core/vscp_dev_data.c +++ b/src/framework/core/vscp_dev_data.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_dev_data.h b/src/framework/core/vscp_dev_data.h index f0fadc6..7d5b3c4 100644 --- a/src/framework/core/vscp_dev_data.h +++ b/src/framework/core/vscp_dev_data.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_dev_data_config.h b/src/framework/core/vscp_dev_data_config.h index 2901d07..934c64b 100644 --- a/src/framework/core/vscp_dev_data_config.h +++ b/src/framework/core/vscp_dev_data_config.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_dm.c b/src/framework/core/vscp_dm.c index b4adc5d..7fedfa8 100644 --- a/src/framework/core/vscp_dm.c +++ b/src/framework/core/vscp_dm.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_dm.h b/src/framework/core/vscp_dm.h index bf13ded..6c17753 100644 --- a/src/framework/core/vscp_dm.h +++ b/src/framework/core/vscp_dm.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_dm_ng.c b/src/framework/core/vscp_dm_ng.c index 120c75d..e4df22f 100644 --- a/src/framework/core/vscp_dm_ng.c +++ b/src/framework/core/vscp_dm_ng.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_dm_ng.h b/src/framework/core/vscp_dm_ng.h index 3ba8002..fa5a350 100644 --- a/src/framework/core/vscp_dm_ng.h +++ b/src/framework/core/vscp_dm_ng.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_logger.c b/src/framework/core/vscp_logger.c index bd62543..a8b5715 100644 --- a/src/framework/core/vscp_logger.c +++ b/src/framework/core/vscp_logger.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_logger.h b/src/framework/core/vscp_logger.h index 224bee0..8178534 100644 --- a/src/framework/core/vscp_logger.h +++ b/src/framework/core/vscp_logger.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_ps.c b/src/framework/core/vscp_ps.c index 8ac8564..0ac7646 100644 --- a/src/framework/core/vscp_ps.c +++ b/src/framework/core/vscp_ps.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_ps.h b/src/framework/core/vscp_ps.h index 6cf47b1..9668aee 100644 --- a/src/framework/core/vscp_ps.h +++ b/src/framework/core/vscp_ps.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_transport.c b/src/framework/core/vscp_transport.c index 1f1c7e0..35b439f 100644 --- a/src/framework/core/vscp_transport.c +++ b/src/framework/core/vscp_transport.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_transport.h b/src/framework/core/vscp_transport.h index c6b7b82..ab200d1 100644 --- a/src/framework/core/vscp_transport.h +++ b/src/framework/core/vscp_transport.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_alarm.h b/src/framework/core/vscp_type_alarm.h index f9f52f5..e2337aa 100644 --- a/src/framework/core/vscp_type_alarm.h +++ b/src/framework/core/vscp_type_alarm.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_aol.h b/src/framework/core/vscp_type_aol.h index 7dd644e..f386bb6 100644 --- a/src/framework/core/vscp_type_aol.h +++ b/src/framework/core/vscp_type_aol.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_configuration.h b/src/framework/core/vscp_type_configuration.h index 6c91fb5..cd27cb7 100644 --- a/src/framework/core/vscp_type_configuration.h +++ b/src/framework/core/vscp_type_configuration.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_control.h b/src/framework/core/vscp_type_control.h index 0978020..f101145 100644 --- a/src/framework/core/vscp_type_control.h +++ b/src/framework/core/vscp_type_control.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_data.h b/src/framework/core/vscp_type_data.h index fe9371c..65db9fc 100644 --- a/src/framework/core/vscp_type_data.h +++ b/src/framework/core/vscp_type_data.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_diagnostic.h b/src/framework/core/vscp_type_diagnostic.h index 3f0fbf4..39438d5 100644 --- a/src/framework/core/vscp_type_diagnostic.h +++ b/src/framework/core/vscp_type_diagnostic.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_display.h b/src/framework/core/vscp_type_display.h index ab21a11..1913368 100644 --- a/src/framework/core/vscp_type_display.h +++ b/src/framework/core/vscp_type_display.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_error.h b/src/framework/core/vscp_type_error.h index bf097b4..185c0ad 100644 --- a/src/framework/core/vscp_type_error.h +++ b/src/framework/core/vscp_type_error.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_gnss.h b/src/framework/core/vscp_type_gnss.h index 50ebb3d..baec551 100644 --- a/src/framework/core/vscp_type_gnss.h +++ b/src/framework/core/vscp_type_gnss.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_information.h b/src/framework/core/vscp_type_information.h index 89c2171..91a0410 100644 --- a/src/framework/core/vscp_type_information.h +++ b/src/framework/core/vscp_type_information.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_ir.h b/src/framework/core/vscp_type_ir.h index ec095d1..eb178e1 100644 --- a/src/framework/core/vscp_type_ir.h +++ b/src/framework/core/vscp_type_ir.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_log.h b/src/framework/core/vscp_type_log.h index df908ca..74afa18 100644 --- a/src/framework/core/vscp_type_log.h +++ b/src/framework/core/vscp_type_log.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_measurement.h b/src/framework/core/vscp_type_measurement.h index 5a611dc..3dee68c 100644 --- a/src/framework/core/vscp_type_measurement.h +++ b/src/framework/core/vscp_type_measurement.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_measurement32.h b/src/framework/core/vscp_type_measurement32.h index b356d8c..5429c58 100644 --- a/src/framework/core/vscp_type_measurement32.h +++ b/src/framework/core/vscp_type_measurement32.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_measurement64.h b/src/framework/core/vscp_type_measurement64.h index 3702eff..5158fc7 100644 --- a/src/framework/core/vscp_type_measurement64.h +++ b/src/framework/core/vscp_type_measurement64.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_measurezone.h b/src/framework/core/vscp_type_measurezone.h index 99b0de0..b777d2f 100644 --- a/src/framework/core/vscp_type_measurezone.h +++ b/src/framework/core/vscp_type_measurezone.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_multimedia.h b/src/framework/core/vscp_type_multimedia.h index cf65eee..c094a97 100644 --- a/src/framework/core/vscp_type_multimedia.h +++ b/src/framework/core/vscp_type_multimedia.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_phone.h b/src/framework/core/vscp_type_phone.h index 51c514f..3ee2e91 100644 --- a/src/framework/core/vscp_type_phone.h +++ b/src/framework/core/vscp_type_phone.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_protocol.h b/src/framework/core/vscp_type_protocol.h index 3e366c7..7c29735 100644 --- a/src/framework/core/vscp_type_protocol.h +++ b/src/framework/core/vscp_type_protocol.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_remote.h b/src/framework/core/vscp_type_remote.h index b3f0391..b937f0a 100644 --- a/src/framework/core/vscp_type_remote.h +++ b/src/framework/core/vscp_type_remote.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_security.h b/src/framework/core/vscp_type_security.h index 6083b57..2374fea 100644 --- a/src/framework/core/vscp_type_security.h +++ b/src/framework/core/vscp_type_security.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_setvaluezone.h b/src/framework/core/vscp_type_setvaluezone.h index 8d75b32..bb7896b 100644 --- a/src/framework/core/vscp_type_setvaluezone.h +++ b/src/framework/core/vscp_type_setvaluezone.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_weather.h b/src/framework/core/vscp_type_weather.h index 909ab24..8378565 100644 --- a/src/framework/core/vscp_type_weather.h +++ b/src/framework/core/vscp_type_weather.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_weather_forecast.h b/src/framework/core/vscp_type_weather_forecast.h index d9ab419..e45a398 100644 --- a/src/framework/core/vscp_type_weather_forecast.h +++ b/src/framework/core/vscp_type_weather_forecast.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_type_wireless.h b/src/framework/core/vscp_type_wireless.h index 1a6f9a2..3abd129 100644 --- a/src/framework/core/vscp_type_wireless.h +++ b/src/framework/core/vscp_type_wireless.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_types.h b/src/framework/core/vscp_types.h index b7ec211..b81c43b 100644 --- a/src/framework/core/vscp_types.h +++ b/src/framework/core/vscp_types.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_util.c b/src/framework/core/vscp_util.c index 8c9f495..e63c379 100644 --- a/src/framework/core/vscp_util.c +++ b/src/framework/core/vscp_util.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/core/vscp_util.h b/src/framework/core/vscp_util.h index a8b41b1..a2ee3b8 100644 --- a/src/framework/core/vscp_util.h +++ b/src/framework/core/vscp_util.h @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_alarm.c b/src/framework/events/vscp_evt_alarm.c index 96994b4..ef99ad1 100644 --- a/src/framework/events/vscp_evt_alarm.c +++ b/src/framework/events/vscp_evt_alarm.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_alarm.h b/src/framework/events/vscp_evt_alarm.h index 76c37d9..5c12c44 100644 --- a/src/framework/events/vscp_evt_alarm.h +++ b/src/framework/events/vscp_evt_alarm.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_aol.c b/src/framework/events/vscp_evt_aol.c index a966725..6d75cbd 100644 --- a/src/framework/events/vscp_evt_aol.c +++ b/src/framework/events/vscp_evt_aol.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_aol.h b/src/framework/events/vscp_evt_aol.h index dcaf205..abbfc8c 100644 --- a/src/framework/events/vscp_evt_aol.h +++ b/src/framework/events/vscp_evt_aol.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_configuration.c b/src/framework/events/vscp_evt_configuration.c index 3c2981e..49d2f6f 100644 --- a/src/framework/events/vscp_evt_configuration.c +++ b/src/framework/events/vscp_evt_configuration.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_configuration.h b/src/framework/events/vscp_evt_configuration.h index 01a2f4c..2b68f18 100644 --- a/src/framework/events/vscp_evt_configuration.h +++ b/src/framework/events/vscp_evt_configuration.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_control.c b/src/framework/events/vscp_evt_control.c index e43a0ab..0ed2847 100644 --- a/src/framework/events/vscp_evt_control.c +++ b/src/framework/events/vscp_evt_control.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_control.h b/src/framework/events/vscp_evt_control.h index 99528a3..6307af6 100644 --- a/src/framework/events/vscp_evt_control.h +++ b/src/framework/events/vscp_evt_control.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_data.c b/src/framework/events/vscp_evt_data.c index 393e3b7..1ff0ca0 100644 --- a/src/framework/events/vscp_evt_data.c +++ b/src/framework/events/vscp_evt_data.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_data.h b/src/framework/events/vscp_evt_data.h index bb9af10..ecc4206 100644 --- a/src/framework/events/vscp_evt_data.h +++ b/src/framework/events/vscp_evt_data.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_diagnostic.c b/src/framework/events/vscp_evt_diagnostic.c index 011d9a5..1b1c50b 100644 --- a/src/framework/events/vscp_evt_diagnostic.c +++ b/src/framework/events/vscp_evt_diagnostic.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_diagnostic.h b/src/framework/events/vscp_evt_diagnostic.h index d48392d..7ac56d2 100644 --- a/src/framework/events/vscp_evt_diagnostic.h +++ b/src/framework/events/vscp_evt_diagnostic.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_display.c b/src/framework/events/vscp_evt_display.c index 1657579..fa34df0 100644 --- a/src/framework/events/vscp_evt_display.c +++ b/src/framework/events/vscp_evt_display.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_display.h b/src/framework/events/vscp_evt_display.h index ca12037..937b6ff 100644 --- a/src/framework/events/vscp_evt_display.h +++ b/src/framework/events/vscp_evt_display.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_error.c b/src/framework/events/vscp_evt_error.c index 27f28f4..523dbf3 100644 --- a/src/framework/events/vscp_evt_error.c +++ b/src/framework/events/vscp_evt_error.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_error.h b/src/framework/events/vscp_evt_error.h index 84628d4..736d472 100644 --- a/src/framework/events/vscp_evt_error.h +++ b/src/framework/events/vscp_evt_error.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_gnss.c b/src/framework/events/vscp_evt_gnss.c index 4dddf7c..bc984c1 100644 --- a/src/framework/events/vscp_evt_gnss.c +++ b/src/framework/events/vscp_evt_gnss.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_gnss.h b/src/framework/events/vscp_evt_gnss.h index 844f83e..278e052 100644 --- a/src/framework/events/vscp_evt_gnss.h +++ b/src/framework/events/vscp_evt_gnss.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_information.c b/src/framework/events/vscp_evt_information.c index 25628f2..0a9f91e 100644 --- a/src/framework/events/vscp_evt_information.c +++ b/src/framework/events/vscp_evt_information.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_information.h b/src/framework/events/vscp_evt_information.h index 6cc0fac..084621d 100644 --- a/src/framework/events/vscp_evt_information.h +++ b/src/framework/events/vscp_evt_information.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_ir.c b/src/framework/events/vscp_evt_ir.c index a44b756..633d23d 100644 --- a/src/framework/events/vscp_evt_ir.c +++ b/src/framework/events/vscp_evt_ir.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_ir.h b/src/framework/events/vscp_evt_ir.h index fe7dc7c..e43aeef 100644 --- a/src/framework/events/vscp_evt_ir.h +++ b/src/framework/events/vscp_evt_ir.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_log.c b/src/framework/events/vscp_evt_log.c index be404c2..5ac9b99 100644 --- a/src/framework/events/vscp_evt_log.c +++ b/src/framework/events/vscp_evt_log.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_log.h b/src/framework/events/vscp_evt_log.h index 1b17583..ee27f3b 100644 --- a/src/framework/events/vscp_evt_log.h +++ b/src/framework/events/vscp_evt_log.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_measurement.c b/src/framework/events/vscp_evt_measurement.c index df61fca..3c4999a 100644 --- a/src/framework/events/vscp_evt_measurement.c +++ b/src/framework/events/vscp_evt_measurement.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_measurement.h b/src/framework/events/vscp_evt_measurement.h index 0974152..930cd51 100644 --- a/src/framework/events/vscp_evt_measurement.h +++ b/src/framework/events/vscp_evt_measurement.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_measurement32.c b/src/framework/events/vscp_evt_measurement32.c index 2583d45..713bf46 100644 --- a/src/framework/events/vscp_evt_measurement32.c +++ b/src/framework/events/vscp_evt_measurement32.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_measurement32.h b/src/framework/events/vscp_evt_measurement32.h index 913405f..5308ac8 100644 --- a/src/framework/events/vscp_evt_measurement32.h +++ b/src/framework/events/vscp_evt_measurement32.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_measurement64.c b/src/framework/events/vscp_evt_measurement64.c index b3c520c..d375e74 100644 --- a/src/framework/events/vscp_evt_measurement64.c +++ b/src/framework/events/vscp_evt_measurement64.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_measurement64.h b/src/framework/events/vscp_evt_measurement64.h index f34a768..5d1afe8 100644 --- a/src/framework/events/vscp_evt_measurement64.h +++ b/src/framework/events/vscp_evt_measurement64.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_measurezone.c b/src/framework/events/vscp_evt_measurezone.c index eb8f033..27a79c3 100644 --- a/src/framework/events/vscp_evt_measurezone.c +++ b/src/framework/events/vscp_evt_measurezone.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_measurezone.h b/src/framework/events/vscp_evt_measurezone.h index 23cd92f..6cb2afd 100644 --- a/src/framework/events/vscp_evt_measurezone.h +++ b/src/framework/events/vscp_evt_measurezone.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_multimedia.c b/src/framework/events/vscp_evt_multimedia.c index 48c8872..1772a72 100644 --- a/src/framework/events/vscp_evt_multimedia.c +++ b/src/framework/events/vscp_evt_multimedia.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_multimedia.h b/src/framework/events/vscp_evt_multimedia.h index 20cc704..925b13c 100644 --- a/src/framework/events/vscp_evt_multimedia.h +++ b/src/framework/events/vscp_evt_multimedia.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_phone.c b/src/framework/events/vscp_evt_phone.c index 0d99a0c..c486e77 100644 --- a/src/framework/events/vscp_evt_phone.c +++ b/src/framework/events/vscp_evt_phone.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_phone.h b/src/framework/events/vscp_evt_phone.h index e3cc7c1..14276eb 100644 --- a/src/framework/events/vscp_evt_phone.h +++ b/src/framework/events/vscp_evt_phone.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_protocol.c b/src/framework/events/vscp_evt_protocol.c index 4e0c0f0..76875fe 100644 --- a/src/framework/events/vscp_evt_protocol.c +++ b/src/framework/events/vscp_evt_protocol.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_protocol.h b/src/framework/events/vscp_evt_protocol.h index d15aceb..ceae688 100644 --- a/src/framework/events/vscp_evt_protocol.h +++ b/src/framework/events/vscp_evt_protocol.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_security.c b/src/framework/events/vscp_evt_security.c index cfbf3c3..f332417 100644 --- a/src/framework/events/vscp_evt_security.c +++ b/src/framework/events/vscp_evt_security.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_security.h b/src/framework/events/vscp_evt_security.h index 3bb5dcf..9b42eb8 100644 --- a/src/framework/events/vscp_evt_security.h +++ b/src/framework/events/vscp_evt_security.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_setvaluezone.c b/src/framework/events/vscp_evt_setvaluezone.c index e849d5c..f35baf7 100644 --- a/src/framework/events/vscp_evt_setvaluezone.c +++ b/src/framework/events/vscp_evt_setvaluezone.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_setvaluezone.h b/src/framework/events/vscp_evt_setvaluezone.h index 4c9a862..7e9095b 100644 --- a/src/framework/events/vscp_evt_setvaluezone.h +++ b/src/framework/events/vscp_evt_setvaluezone.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_weather.c b/src/framework/events/vscp_evt_weather.c index 773100d..75ad095 100644 --- a/src/framework/events/vscp_evt_weather.c +++ b/src/framework/events/vscp_evt_weather.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_weather.h b/src/framework/events/vscp_evt_weather.h index 3e5dd51..4861c01 100644 --- a/src/framework/events/vscp_evt_weather.h +++ b/src/framework/events/vscp_evt_weather.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_weather_forecast.c b/src/framework/events/vscp_evt_weather_forecast.c index d5006b4..2c06a45 100644 --- a/src/framework/events/vscp_evt_weather_forecast.c +++ b/src/framework/events/vscp_evt_weather_forecast.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_weather_forecast.h b/src/framework/events/vscp_evt_weather_forecast.h index f7f60d7..386b0b4 100644 --- a/src/framework/events/vscp_evt_weather_forecast.h +++ b/src/framework/events/vscp_evt_weather_forecast.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_wireless.c b/src/framework/events/vscp_evt_wireless.c index 86ad38d..96c7a0d 100644 --- a/src/framework/events/vscp_evt_wireless.c +++ b/src/framework/events/vscp_evt_wireless.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/events/vscp_evt_wireless.h b/src/framework/events/vscp_evt_wireless.h index 1d56e8e..96cb4f8 100644 --- a/src/framework/events/vscp_evt_wireless.h +++ b/src/framework/events/vscp_evt_wireless.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/user/vscp_action.c b/src/framework/user/vscp_action.c index 4c206e4..3bcd50c 100644 --- a/src/framework/user/vscp_action.c +++ b/src/framework/user/vscp_action.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/user/vscp_action.h b/src/framework/user/vscp_action.h index 4b69826..1800624 100644 --- a/src/framework/user/vscp_action.h +++ b/src/framework/user/vscp_action.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/user/vscp_app_reg.c b/src/framework/user/vscp_app_reg.c index f761074..584d6a4 100644 --- a/src/framework/user/vscp_app_reg.c +++ b/src/framework/user/vscp_app_reg.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/user/vscp_app_reg.h b/src/framework/user/vscp_app_reg.h index 7243048..59eacb8 100644 --- a/src/framework/user/vscp_app_reg.h +++ b/src/framework/user/vscp_app_reg.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/user/vscp_config_overwrite.h b/src/framework/user/vscp_config_overwrite.h index 6a7e930..e9393c9 100644 --- a/src/framework/user/vscp_config_overwrite.h +++ b/src/framework/user/vscp_config_overwrite.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/user/vscp_dev_data_config_overwrite.h b/src/framework/user/vscp_dev_data_config_overwrite.h index b8cda95..eada2cc 100644 --- a/src/framework/user/vscp_dev_data_config_overwrite.h +++ b/src/framework/user/vscp_dev_data_config_overwrite.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/user/vscp_platform.h b/src/framework/user/vscp_platform.h index 8299343..76b24b7 100644 --- a/src/framework/user/vscp_platform.h +++ b/src/framework/user/vscp_platform.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/user/vscp_portable.c b/src/framework/user/vscp_portable.c index 0b0888e..65f1843 100644 --- a/src/framework/user/vscp_portable.c +++ b/src/framework/user/vscp_portable.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/user/vscp_portable.h b/src/framework/user/vscp_portable.h index d0e1d22..ee19919 100644 --- a/src/framework/user/vscp_portable.h +++ b/src/framework/user/vscp_portable.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/user/vscp_ps_access.c b/src/framework/user/vscp_ps_access.c index 30ca0cd..6c2d891 100644 --- a/src/framework/user/vscp_ps_access.c +++ b/src/framework/user/vscp_ps_access.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/user/vscp_ps_access.h b/src/framework/user/vscp_ps_access.h index e1fe408..cd14784 100644 --- a/src/framework/user/vscp_ps_access.h +++ b/src/framework/user/vscp_ps_access.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/user/vscp_timer.c b/src/framework/user/vscp_timer.c index 07146bf..566ec2c 100644 --- a/src/framework/user/vscp_timer.c +++ b/src/framework/user/vscp_timer.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/user/vscp_timer.h b/src/framework/user/vscp_timer.h index 8002e33..a46bc74 100644 --- a/src/framework/user/vscp_timer.h +++ b/src/framework/user/vscp_timer.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/user/vscp_tp_adapter.c b/src/framework/user/vscp_tp_adapter.c index 2ada56f..1820cf8 100644 --- a/src/framework/user/vscp_tp_adapter.c +++ b/src/framework/user/vscp_tp_adapter.c @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * diff --git a/src/framework/user/vscp_tp_adapter.h b/src/framework/user/vscp_tp_adapter.h index e030224..bc4488c 100644 --- a/src/framework/user/vscp_tp_adapter.h +++ b/src/framework/user/vscp_tp_adapter.h @@ -1,6 +1,6 @@ /* The MIT License (MIT) * - * Copyright (c) 2014 - 2024 Andreas Merkle + * Copyright (c) 2014 - 2025 Andreas Merkle * http://www.blue-andi.de * vscp@blue-andi.de * From 3a8ad89a3c26c99d9b350b3daba868224929bdba Mon Sep 17 00:00:00 2001 From: BlueAndi Date: Thu, 16 Jan 2025 01:09:36 +0100 Subject: [PATCH 4/6] Updated to be compliant with VSCP v1.15.9 --- src/framework/core/vscp_core.h | 2 +- src/framework/core/vscp_type_measurement.h | 18 ++++++++++-------- src/framework/core/vscp_type_measurement32.h | 18 ++++++++++-------- src/framework/core/vscp_type_measurement64.h | 18 ++++++++++-------- src/framework/core/vscp_type_measurezone.h | 18 ++++++++++-------- src/framework/core/vscp_type_setvaluezone.h | 18 ++++++++++-------- src/framework/events/vscp_evt_control.h | 4 ++-- 7 files changed, 53 insertions(+), 43 deletions(-) diff --git a/src/framework/core/vscp_core.h b/src/framework/core/vscp_core.h index dcadf85..db7ff5f 100644 --- a/src/framework/core/vscp_core.h +++ b/src/framework/core/vscp_core.h @@ -99,7 +99,7 @@ extern "C" #define VSCP_CORE_VERSION_SUB_MINOR (1) /** VSCP specification version string, the framework is compliant to. */ -#define VSCP_CORE_VERSION_STR "v1.15.4" +#define VSCP_CORE_VERSION_STR "v1.15.9" /** VSCP framework version string */ #define VSCP_CORE_FRAMEWORK_VERSION "v2.1.0" diff --git a/src/framework/core/vscp_type_measurement.h b/src/framework/core/vscp_type_measurement.h index 3dee68c..d87619f 100644 --- a/src/framework/core/vscp_type_measurement.h +++ b/src/framework/core/vscp_type_measurement.h @@ -150,14 +150,14 @@ extern "C" /** * Default unit: Joule. - * Optional unit: KWh (1), Wh(2) + * Optional unit: kWh (1), Wh (2), eV (electron volt) (3) * This is a measurement of energy. */ #define VSCP_TYPE_MEASUREMENT_ENERGY 13 /** * Default unit: watt. - * Optional unit: Horse power (1). + * Optional unit: Horse power Metric (1), Horse power Imperial (2). * This is a measurement of power. */ #define VSCP_TYPE_MEASUREMENT_POWER 14 @@ -194,7 +194,7 @@ extern "C" /** * Default unit: amperes per meter (H). - * Optional units: teslas (B) (1) + * Optional units: Oersted (Oe) (1) * This is a measurement of magnetic field strength. */ #define VSCP_TYPE_MEASUREMENT_MAGNETIC_FIELD_STRENGTH 20 @@ -246,8 +246,9 @@ extern "C" /** * Default unit: cubic meter (m³) - * Opt. unit: Liter (dm³) (1), decilitre (100 cm³) (2), centilitre (10 cm³) (3), millilitre (cm³) (4) - * where unit 4 is only available for Level II measurement events where units can hold this value. + * Opt. unit: Liter (dm³) (1), millilitre (cm³) (2), decilitre (100 cm³) (3), centilitre (10 cm³) (4), + * millilitre (cm³) (4) where unit 4 is only available for Level II measurement events where units can + * hold this value. * This is a measurement of volume. */ #define VSCP_TYPE_MEASUREMENT_VOLUME 28 @@ -277,13 +278,13 @@ extern "C" /** * Default unit: Meters per second. - * Optional unit: Kilometers per hour (1) Miles per hour (2) + * Optional unit: Kilometers per hour (1), Miles per hour (2) * This is a measurement of a speed. */ #define VSCP_TYPE_MEASUREMENT_SPEED 32 /** - * Default unit: Meters per second/second (m/s2). + * Default unit: Meter per second squared (m/s²). * This is a measurement of acceleration. */ #define VSCP_TYPE_MEASUREMENT_ACCELERATION 33 @@ -339,7 +340,7 @@ extern "C" #define VSCP_TYPE_MEASUREMENT_SOUND_RESISTANCE 41 /** - * Default unit: daraf (f-1). + * Default unit: daraf (F-1). * This is a measurement of electric elasticity. */ #define VSCP_TYPE_MEASUREMENT_ELECTRIC_ELASTANCE 42 @@ -401,6 +402,7 @@ extern "C" /** * Default unit: square meter (m²) + * Opt. unit: are (1), hectare (2), square kilometer (km²) * Area in square meter. */ #define VSCP_TYPE_MEASUREMENT_AREA 52 diff --git a/src/framework/core/vscp_type_measurement32.h b/src/framework/core/vscp_type_measurement32.h index 5429c58..5b1b38c 100644 --- a/src/framework/core/vscp_type_measurement32.h +++ b/src/framework/core/vscp_type_measurement32.h @@ -149,14 +149,14 @@ extern "C" /** * Default unit: Joule. - * Optional unit: KWh (1) + * Optional unit: kWh (1), Wh (2), eV (electron volt) (3) * This is a measurement of energy. */ #define VSCP_TYPE_MEASUREMENT32_ENERGY 13 /** * Default unit: watt. - * Optional unit: Horse power (1). + * Optional unit: Horse power Metric (1), Horse power Imperial (2). * This is a measurement of power. */ #define VSCP_TYPE_MEASUREMENT32_POWER 14 @@ -193,7 +193,7 @@ extern "C" /** * Default unit: amperes per meter (H). - * Optional units: teslas (B) (1) + * Optional units: Oersted (Oe) (1) * This is a measurement of magnetic field strength. */ #define VSCP_TYPE_MEASUREMENT32_MAGNETIC_FIELD_STRENGTH 20 @@ -245,8 +245,9 @@ extern "C" /** * Default unit: cubic meter (m³) - * Opt. unit: Liter (dm³) (1), decilitre (100 cm³) (2), centilitre (10 cm³) (3), millilitre (cm³) (4) - * where unit 4 is only available for Level II measurement events where units can hold this value. + * Opt. unit: Liter (dm³) (1), millilitre (cm³) (2), decilitre (100 cm³) (3), centilitre (10 cm³) (4), + * millilitre (cm³) (4) where unit 4 is only available for Level II measurement events where units can + * hold this value. * This is a measurement of volume. */ #define VSCP_TYPE_MEASUREMENT32_VOLUME 28 @@ -276,13 +277,13 @@ extern "C" /** * Default unit: Meters per second. - * Optional unit: Kilometers per hour (1) Miles per hour (2) + * Optional unit: Kilometers per hour (1), Miles per hour (2) * This is a measurement of a speed. */ #define VSCP_TYPE_MEASUREMENT32_SPEED 32 /** - * Default unit: Meters per second/second (m/s2). + * Default unit: Meter per second squared (m/s²). * This is a measurement of acceleration. */ #define VSCP_TYPE_MEASUREMENT32_ACCELERATION 33 @@ -338,7 +339,7 @@ extern "C" #define VSCP_TYPE_MEASUREMENT32_SOUND_RESISTANCE 41 /** - * Default unit: daraf (f-1). + * Default unit: daraf (F-1). * This is a measurement of electric elasticity. */ #define VSCP_TYPE_MEASUREMENT32_ELECTRIC_ELASTANCE 42 @@ -400,6 +401,7 @@ extern "C" /** * Default unit: square meter (m²) + * Opt. unit: are (1), hectare (2), square kilometer (km²) * Area in square meter. */ #define VSCP_TYPE_MEASUREMENT32_AREA 52 diff --git a/src/framework/core/vscp_type_measurement64.h b/src/framework/core/vscp_type_measurement64.h index 5158fc7..87d4fe3 100644 --- a/src/framework/core/vscp_type_measurement64.h +++ b/src/framework/core/vscp_type_measurement64.h @@ -149,14 +149,14 @@ extern "C" /** * Default unit: Joule. - * Optional unit: KWh (1) + * Optional unit: kWh (1), Wh (2), eV (electron volt) (3) * This is a measurement of energy. */ #define VSCP_TYPE_MEASUREMENT64_ENERGY 13 /** * Default unit: watt. - * Optional unit: Horse power (1). + * Optional unit: Horse power Metric (1), Horse power Imperial (2). * This is a measurement of power. */ #define VSCP_TYPE_MEASUREMENT64_POWER 14 @@ -193,7 +193,7 @@ extern "C" /** * Default unit: amperes per meter (H). - * Optional units: teslas (B) (1) + * Optional units: Oersted (Oe) (1) * This is a measurement of magnetic field strength. */ #define VSCP_TYPE_MEASUREMENT64_MAGNETIC_FIELD_STRENGTH 20 @@ -245,8 +245,9 @@ extern "C" /** * Default unit: cubic meter (m³) - * Opt. unit: Liter (dm³) (1), decilitre (100 cm³) (2), centilitre (10 cm³) (3), millilitre (cm³) (4) - * where unit 4 is only available for Level II measurement events where units can hold this value. + * Opt. unit: Liter (dm³) (1), millilitre (cm³) (2), decilitre (100 cm³) (3), centilitre (10 cm³) (4), + * millilitre (cm³) (4) where unit 4 is only available for Level II measurement events where units can + * hold this value. * This is a measurement of volume. */ #define VSCP_TYPE_MEASUREMENT64_VOLUME 28 @@ -276,13 +277,13 @@ extern "C" /** * Default unit: Meters per second. - * Optional unit: Kilometers per hour (1) Miles per hour (2) + * Optional unit: Kilometers per hour (1), Miles per hour (2) * This is a measurement of a speed. */ #define VSCP_TYPE_MEASUREMENT64_SPEED 32 /** - * Default unit: Meters per second/second (m/s2). + * Default unit: Meter per second squared (m/s²). * This is a measurement of acceleration. */ #define VSCP_TYPE_MEASUREMENT64_ACCELERATION 33 @@ -338,7 +339,7 @@ extern "C" #define VSCP_TYPE_MEASUREMENT64_SOUND_RESISTANCE 41 /** - * Default unit: daraf (f-1). + * Default unit: daraf (F-1). * This is a measurement of electric elasticity. */ #define VSCP_TYPE_MEASUREMENT64_ELECTRIC_ELASTANCE 42 @@ -400,6 +401,7 @@ extern "C" /** * Default unit: square meter (m²) + * Opt. unit: are (1), hectare (2), square kilometer (km²) * Area in square meter. */ #define VSCP_TYPE_MEASUREMENT64_AREA 52 diff --git a/src/framework/core/vscp_type_measurezone.h b/src/framework/core/vscp_type_measurezone.h index b777d2f..4d24b25 100644 --- a/src/framework/core/vscp_type_measurezone.h +++ b/src/framework/core/vscp_type_measurezone.h @@ -151,14 +151,14 @@ extern "C" /** * Default unit: Joule. - * Optional unit: KWh (1) + * Optional unit: kWh (1), Wh (2), eV (electron volt) (3) * This is a measurement of energy. */ #define VSCP_TYPE_MEASUREZONE_ENERGY 13 /** * Default unit: watt. - * Optional unit: Horse power (1). + * Optional unit: Horse power Metric (1), Horse power Imperial (2). * This is a measurement of power. */ #define VSCP_TYPE_MEASUREZONE_POWER 14 @@ -195,7 +195,7 @@ extern "C" /** * Default unit: amperes per meter (H). - * Optional units: teslas (B) (1) + * Optional units: Oersted (Oe) (1) * This is a measurement of magnetic field strength. */ #define VSCP_TYPE_MEASUREZONE_MAGNETIC_FIELD_STRENGTH 20 @@ -247,8 +247,9 @@ extern "C" /** * Default unit: cubic meter (m³) - * Opt. unit: Liter (dm³) (1), decilitre (100 cm³) (2), centilitre (10 cm³) (3), millilitre (cm³) (4) - * where unit 4 is only available for Level II measurement events where units can hold this value. + * Opt. unit: Liter (dm³) (1), millilitre (cm³) (2), decilitre (100 cm³) (3), centilitre (10 cm³) (4), + * millilitre (cm³) (4) where unit 4 is only available for Level II measurement events where units can + * hold this value. * This is a measurement of volume. */ #define VSCP_TYPE_MEASUREZONE_VOLUME 28 @@ -278,13 +279,13 @@ extern "C" /** * Default unit: Meters per second. - * Optional unit: Kilometers per hour (1) Miles per hour (2) + * Optional unit: Kilometers per hour (1), Miles per hour (2) * This is a measurement of a speed. */ #define VSCP_TYPE_MEASUREZONE_SPEED 32 /** - * Default unit: Meters per second/second (m/s2). + * Default unit: Meter per second squared (m/s²). * This is a measurement of acceleration. */ #define VSCP_TYPE_MEASUREZONE_ACCELERATION 33 @@ -340,7 +341,7 @@ extern "C" #define VSCP_TYPE_MEASUREZONE_SOUND_RESISTANCE 41 /** - * Default unit: daraf (f-1). + * Default unit: daraf (F-1). * This is a measurement of electric elasticity. */ #define VSCP_TYPE_MEASUREZONE_ELECTRIC_ELASTANCE 42 @@ -402,6 +403,7 @@ extern "C" /** * Default unit: square meter (m²) + * Opt. unit: are (1), hectare (2), square kilometer (km²) * Area in square meter. */ #define VSCP_TYPE_MEASUREZONE_AREA 52 diff --git a/src/framework/core/vscp_type_setvaluezone.h b/src/framework/core/vscp_type_setvaluezone.h index bb7896b..b87239e 100644 --- a/src/framework/core/vscp_type_setvaluezone.h +++ b/src/framework/core/vscp_type_setvaluezone.h @@ -149,14 +149,14 @@ extern "C" /** * Default unit: Joule. - * Optional unit: KWh (1) + * Optional unit: kWh (1), Wh (2), eV (electron volt) (3) * This is a measurement of energy. */ #define VSCP_TYPE_SETVALUEZONE_ENERGY 13 /** * Default unit: watt. - * Optional unit: Horse power (1). + * Optional unit: Horse power Metric (1), Horse power Imperial (2). * This is a measurement of power. */ #define VSCP_TYPE_SETVALUEZONE_POWER 14 @@ -193,7 +193,7 @@ extern "C" /** * Default unit: amperes per meter (H). - * Optional units: teslas (B) (1) + * Optional units: Oersted (Oe) (1) * This is a measurement of magnetic field strength. */ #define VSCP_TYPE_SETVALUEZONE_MAGNETIC_FIELD_STRENGTH 20 @@ -246,8 +246,9 @@ extern "C" /** * Default unit: cubic meter (m³) - * Opt. unit: Liter (dm³) (1), decilitre (100 cm³) (2), centilitre (10 cm³) (3), millilitre (cm³) (4) - * where unit 4 is only available for Level II measurement events where units can hold this value. + * Opt. unit: Liter (dm³) (1), millilitre (cm³) (2), decilitre (100 cm³) (3), centilitre (10 cm³) (4), + * millilitre (cm³) (4) where unit 4 is only available for Level II measurement events where units can + * hold this value. * This is a measurement of volume. */ #define VSCP_TYPE_SETVALUEZONE_VOLUME 28 @@ -277,13 +278,13 @@ extern "C" /** * Default unit: Meters per second. - * Optional unit: Kilometers per hour (1) Miles per hour (2) + * Optional unit: Kilometers per hour (1), Miles per hour (2) * This is a measurement of a speed. */ #define VSCP_TYPE_SETVALUEZONE_SPEED 32 /** - * Default unit: Meters per second/second (m/s2). + * Default unit: Meter per second squared (m/s²). * This is a measurement of acceleration. */ #define VSCP_TYPE_SETVALUEZONE_ACCELERATION 33 @@ -339,7 +340,7 @@ extern "C" #define VSCP_TYPE_SETVALUEZONE_SOUND_RESISTANCE 41 /** - * Default unit: daraf (f-1). + * Default unit: daraf (F-1). * This is a measurement of electric elasticity. */ #define VSCP_TYPE_SETVALUEZONE_ELECTRIC_ELASTANCE 42 @@ -401,6 +402,7 @@ extern "C" /** * Default unit: square meter (m²) + * Opt. unit: are (1), hectare (2), square kilometer (km²) * Area in square meter. */ #define VSCP_TYPE_SETVALUEZONE_AREA 52 diff --git a/src/framework/events/vscp_evt_control.h b/src/framework/events/vscp_evt_control.h index 6307af6..0ae886b 100644 --- a/src/framework/events/vscp_evt_control.h +++ b/src/framework/events/vscp_evt_control.h @@ -626,8 +626,8 @@ extern BOOL vscp_evt_control_sendSetSecurityPin(uint8_t reserved, uint8_t zone, * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. * @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones. * @param[in] securityPassword Security password. This password can be 1-5 bytes and length of event - * is set accordingly. It should be interpreted as an UTF-8 string with a length set bt event data - * length - 3 (array[5]) + * is set accordingly. It should be interpreted as a UTF-8 string of length equal to the event data + * length minus 3 bytes (array[5]) * @param[in] securityPasswordsize Size in byte. * * @return If event is sent, it will return TRUE otherwise FALSE. From edf7c05b05083ee0d0cc18e90be7310291ec588b Mon Sep 17 00:00:00 2001 From: BlueAndi Date: Fri, 17 Jan 2025 18:29:25 +0100 Subject: [PATCH 5/6] Update to VSCP framework v2.1.0 --- CHANGELOG.md | 4 ++++ library.json | 2 +- library.properties | 2 +- src/framework/core/vscp_core.h | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d41f6ed..7e2d5b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.1 + +- Update to VSCP framework v2.1.0, please see the ![changelog](https://github.com/BlueAndi/vscp-framework/releases/tag/v2.1.0) there. + ## 2.0.4 - Fixed problem with backslashes in include paths. diff --git a/library.json b/library.json index 3635301..91780c9 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "vscp-arduino", - "version": "2.0.4", + "version": "2.1.0", "keywords": "vscp, arduino-library, vscp-arduino, automation, home automation", "description": "Very Simple Control Procotol (VSCP) Level 1 Library for the arduino IDE.", "repository": { diff --git a/library.properties b/library.properties index 36fb81a..5e6fcf5 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=VSCP -version=2.0.4 +version=2.1.0 author=Andreas Merkle maintainer=Andreas Merkle sentence=Very Simple Control Protocol L1 framework for all Arduino boards. diff --git a/src/framework/core/vscp_core.h b/src/framework/core/vscp_core.h index db7ff5f..87ab8cd 100644 --- a/src/framework/core/vscp_core.h +++ b/src/framework/core/vscp_core.h @@ -93,10 +93,10 @@ extern "C" #define VSCP_CORE_VERSION_MAJOR (1) /** VSCP specification minor version number, the framework is compliant to. */ -#define VSCP_CORE_VERSION_MINOR (13) +#define VSCP_CORE_VERSION_MINOR (15) /** VSCP specification sub-minor version number, the framework is compliant to. */ -#define VSCP_CORE_VERSION_SUB_MINOR (1) +#define VSCP_CORE_VERSION_SUB_MINOR (9) /** VSCP specification version string, the framework is compliant to. */ #define VSCP_CORE_VERSION_STR "v1.15.9" From b79bc88382355a4d587f4eb470965d0aae0ab61d Mon Sep 17 00:00:00 2001 From: BlueAndi Date: Fri, 17 Jan 2025 18:31:08 +0100 Subject: [PATCH 6/6] Changelog fixed. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e2d5b2..50f943d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 2.0.1 +## 2.1.0 - Update to VSCP framework v2.1.0, please see the ![changelog](https://github.com/BlueAndi/vscp-framework/releases/tag/v2.1.0) there.