Addition OBIS values used in Lithuania smart meeters. (matthijskooijm…

…an#17)

* Addition OBIS values used in Lithuania smart meeters.

* Fixed error's

* Add more fealds for active-apparent-reactive eneergy import/export

src/dsmr/fields.cpp

@@ -42,8 +42,10 @@ constexpr char units::kWh[];
 constexpr char units::Wh[];
 constexpr char units::kW[];
 constexpr char units::W[];
+constexpr char units::kV[];
 constexpr char units::V[];
 constexpr char units::mV[];
+constexpr char units::kA[];
 constexpr char units::A[];
 constexpr char units::mA[];
 constexpr char units::m3[];
@@ -52,6 +54,11 @@ constexpr char units::GJ[];
 constexpr char units::MJ[];
 constexpr char units::kvar[];
 constexpr char units::kvarh[];
+constexpr char units::kVA[];
+constexpr char units::VA[];
+constexpr char units::s[];
+constexpr char units::Hz[];
+constexpr char units::kHz[];
 
 constexpr ObisId identification::id;
 constexpr char identification::name[];
@@ -79,6 +86,24 @@ constexpr char energy_delivered_tariff1::name[];
 constexpr ObisId energy_delivered_tariff2::id;
 constexpr char energy_delivered_tariff2::name[];
 
+constexpr ObisId energy_delivered_tariff3::id;
+constexpr char energy_delivered_tariff3::name[];
+
+constexpr ObisId energy_delivered_tariff4::id;
+constexpr char energy_delivered_tariff4::name[];
+
+constexpr ObisId reactive_energy_delivered_tariff1::id;
+constexpr char reactive_energy_delivered_tariff1::name[];
+
+constexpr ObisId reactive_energy_delivered_tariff2::id;
+constexpr char reactive_energy_delivered_tariff2::name[];
+
+constexpr ObisId reactive_energy_delivered_tariff3::id;
+constexpr char reactive_energy_delivered_tariff3::name[];
+
+constexpr ObisId reactive_energy_delivered_tariff4::id;
+constexpr char reactive_energy_delivered_tariff4::name[];
+
 /* extra for Lux */
 constexpr ObisId energy_returned_lux::id;
 constexpr char energy_returned_lux::name[];
@@ -89,6 +114,24 @@ constexpr char energy_returned_tariff1::name[];
 constexpr ObisId energy_returned_tariff2::id;
 constexpr char energy_returned_tariff2::name[];
 
+constexpr ObisId energy_returned_tariff3::id;
+constexpr char energy_returned_tariff3::name[];
+
+constexpr ObisId energy_returned_tariff4::id;
+constexpr char energy_returned_tariff4::name[];
+
+constexpr ObisId reactive_energy_returned_tariff1::id;
+constexpr char reactive_energy_returned_tariff1::name[];
+
+constexpr ObisId reactive_energy_returned_tariff2::id;
+constexpr char reactive_energy_returned_tariff2::name[];
+
+constexpr ObisId reactive_energy_returned_tariff3::id;
+constexpr char reactive_energy_returned_tariff3::name[];
+
+constexpr ObisId reactive_energy_returned_tariff4::id;
+constexpr char reactive_energy_returned_tariff4::name[];
+
 /* extra for Lux */
 constexpr ObisId total_imported_energy::id;
 constexpr char total_imported_energy::name[];
@@ -138,6 +181,24 @@ constexpr char electricity_sags_l2::name[];
 constexpr ObisId electricity_sags_l3::id;
 constexpr char electricity_sags_l3::name[];
 
+constexpr ObisId voltage_sag_time_l1::id;
+constexpr char voltage_sag_time_l1::name[];
+
+constexpr ObisId voltage_sag_time_l2::id;
+constexpr char voltage_sag_time_l2::name[];
+
+constexpr ObisId voltage_sag_time_l3::id;
+constexpr char voltage_sag_time_l3::name[];
+
+constexpr ObisId voltage_sag_l1::id;
+constexpr char voltage_sag_l1::name[];
+
+constexpr ObisId voltage_sag_l2::id;
+constexpr char voltage_sag_l2::name[];
+
+constexpr ObisId voltage_sag_l3::id;
+constexpr char voltage_sag_l3::name[];
+
 constexpr ObisId electricity_swells_l1::id;
 constexpr char electricity_swells_l1::name[];
 
@@ -147,12 +208,33 @@ constexpr char electricity_swells_l2::name[];
 constexpr ObisId electricity_swells_l3::id;
 constexpr char electricity_swells_l3::name[];
 
+constexpr ObisId voltage_swell_time_l1::id;
+constexpr char voltage_swell_time_l1::name[];
+
+constexpr ObisId voltage_swell_time_l2::id;
+constexpr char voltage_swell_time_l2::name[];
+
+constexpr ObisId voltage_swell_time_l3::id;
+constexpr char voltage_swell_time_l3::name[];
+
+constexpr ObisId voltage_swell_l1::id;
+constexpr char voltage_swell_l1::name[];
+
+constexpr ObisId voltage_swell_l2::id;
+constexpr char voltage_swell_l2::name[];
+
+constexpr ObisId voltage_swell_l3::id;
+constexpr char voltage_swell_l3::name[];
+
 constexpr ObisId message_short::id;
 constexpr char message_short::name[];
 
 constexpr ObisId message_long::id;
 constexpr char message_long::name[];
 
+constexpr ObisId voltage::id;
+constexpr char voltage::name[];
+
 constexpr ObisId voltage_l1::id;
 constexpr char voltage_l1::name[];
 
@@ -162,6 +244,15 @@ constexpr char voltage_l2::name[];
 constexpr ObisId voltage_l3::id;
 constexpr char voltage_l3::name[];
 
+constexpr ObisId voltage_avg_l1::id;
+constexpr char voltage_avg_l1::name[];
+
+constexpr ObisId voltage_avg_l2::id;
+constexpr char voltage_avg_l2::name[];
+
+constexpr ObisId voltage_avg_l3::id;
+constexpr char voltage_avg_l3::name[];
+
 constexpr ObisId current_l1::id;
 constexpr char current_l1::name[];
 
@@ -171,6 +262,24 @@ constexpr char current_l2::name[];
 constexpr ObisId current_l3::id;
 constexpr char current_l3::name[];
 
+constexpr ObisId current_fuse_l1::id;
+constexpr char current_fuse_l1::name[];
+
+constexpr ObisId current_fuse_l2::id;
+constexpr char current_fuse_l2::name[];
+
+constexpr ObisId current_fuse_l3::id;
+constexpr char current_fuse_l3::name[];
+
+constexpr ObisId current::id;
+constexpr char current::name[];
+
+constexpr ObisId current_n::id;
+constexpr char current_n::name[];
+
+constexpr ObisId current_sum::id;
+constexpr char current_sum::name[];
+
 constexpr ObisId power_delivered_l1::id;
 constexpr char power_delivered_l1::name[];
 
@@ -189,6 +298,39 @@ constexpr char power_returned_l2::name[];
 constexpr ObisId power_returned_l3::id;
 constexpr char power_returned_l3::name[];
 
+constexpr ObisId apparent_delivery_power::id;
+constexpr char apparent_delivery_power::name[];
+
+constexpr ObisId apparent_delivery_power_l1::id;
+constexpr char apparent_delivery_power_l1::name[];
+
+constexpr ObisId apparent_delivery_power_l2::id;
+constexpr char apparent_delivery_power_l2::name[];
+
+constexpr ObisId apparent_delivery_power_l3::id;
+constexpr char apparent_delivery_power_l3::name[];
+
+constexpr ObisId apparent_return_power::id;
+constexpr char apparent_return_power::name[];
+
+constexpr ObisId apparent_return_power_l1::id;
+constexpr char apparent_return_power_l1::name[];
+
+constexpr ObisId apparent_return_power_l2::id;
+constexpr char apparent_return_power_l2::name[];
+
+constexpr ObisId apparent_return_power_l3::id;
+constexpr char apparent_return_power_l3::name[];
+
+constexpr ObisId active_demand_power::id;
+constexpr char active_demand_power::name[];
+
+//constexpr ObisId active_demand_net::id;
+//constexpr char active_demand_net::name[];
+
+constexpr ObisId active_demand_abs::id;
+constexpr char active_demand_abs::name[];
+
 /* LUX */
 constexpr ObisId reactive_power_delivered_l1::id;
 constexpr char reactive_power_delivered_l1::name[];
@@ -272,8 +414,47 @@ constexpr char sub_delivered::name[];
 constexpr ObisId active_energy_import_current_average_demand::id;
 constexpr char active_energy_import_current_average_demand::name[];
 
+constexpr ObisId active_energy_export_current_average_demand::id;
+constexpr char active_energy_export_current_average_demand::name[];
+
+constexpr ObisId apparent_energy_import_current_average_demand::id;
+constexpr char apparent_energy_import_current_average_demand::name[];
+
+constexpr ObisId apparent_energy_export_current_average_demand::id;
+constexpr char apparent_energy_export_current_average_demand::name[];
+
+constexpr ObisId active_energy_import_last_completed_demand::id;
+constexpr char active_energy_import_last_completed_demand::name[];
+
+constexpr ObisId active_energy_export_last_completed_demand::id;
+constexpr char active_energy_export_last_completed_demand::name[];
+
+constexpr ObisId reactive_energy_import_last_completed_demand::id;
+constexpr char reactive_energy_import_last_completed_demand::name[];
+
+constexpr ObisId reactive_energy_export_last_completed_demand::id;
+constexpr char reactive_energy_export_last_completed_demand::name[];
+
+constexpr ObisId apparent_energy_import_last_completed_demand::id;
+constexpr char apparent_energy_import_last_completed_demand::name[];
+
+constexpr ObisId apparent_energy_export_last_completed_demand::id;
+constexpr char apparent_energy_export_last_completed_demand::name[];
+
 constexpr ObisId active_energy_import_maximum_demand_running_month::id;
 constexpr char active_energy_import_maximum_demand_running_month::name[];
 
 constexpr ObisId active_energy_import_maximum_demand_last_13_months::id;
 constexpr char active_energy_import_maximum_demand_last_13_months::name[];
+
+constexpr ObisId fw_core_version::id;
+constexpr char fw_core_version::name[];
+
+constexpr ObisId fw_core_checksum::id;
+constexpr char fw_core_checksum::name[];
+
+constexpr ObisId fw_module_version::id;
+constexpr char fw_module_version::name[];
+
+constexpr ObisId fw_module_checksum::id;
+constexpr char fw_module_checksum::name[];