Update fields.cpp

Apply patch from: matthijskooijman#36 (comment)

src/dsmr/fields.cpp

@@ -54,209 +54,311 @@ constexpr char units::MJ[];
 
 constexpr ObisId identification::id;
 constexpr char identification::name_progmem[];
-// REMOVED constexpr const __FlashStringHelper *identification::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::identification> identification::name;
 
 constexpr ObisId p1_version::id;
 constexpr char p1_version::name_progmem[];
-constexpr const __FlashStringHelper *p1_version::name;
+//constexpr const __FlashStringHelper *p1_version::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::p1_version> p1_version::name;
+
 
 constexpr ObisId timestamp::id;
 constexpr char timestamp::name_progmem[];
-constexpr const __FlashStringHelper *timestamp::name;
+//constexpr const __FlashStringHelper *timestamp::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::timestamp> timestamp::name;
+
 
 constexpr ObisId equipment_id::id;
 constexpr char equipment_id::name_progmem[];
-constexpr const __FlashStringHelper *equipment_id::name;
+//constexpr const __FlashStringHelper *equipment_id::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::equipment_id> equipment_id::name;
+
 
 constexpr ObisId energy_delivered_tariff1::id;
 constexpr char energy_delivered_tariff1::name_progmem[];
-constexpr const __FlashStringHelper *energy_delivered_tariff1::name;
+//constexpr const __FlashStringHelper *energy_delivered_tariff1::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::energy_delivered_tariff1> energy_delivered_tariff1::name;
+
 
 constexpr ObisId energy_delivered_tariff2::id;
 constexpr char energy_delivered_tariff2::name_progmem[];
-constexpr const __FlashStringHelper *energy_delivered_tariff2::name;
+//constexpr const __FlashStringHelper *energy_delivered_tariff2::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::energy_delivered_tariff2> energy_delivered_tariff2::name;
+
 
 constexpr ObisId energy_returned_tariff1::id;
 constexpr char energy_returned_tariff1::name_progmem[];
-constexpr const __FlashStringHelper *energy_returned_tariff1::name;
+//constexpr const __FlashStringHelper *energy_returned_tariff1::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::energy_returned_tariff1> energy_returned_tariff1::name;
+
 
 constexpr ObisId energy_returned_tariff2::id;
 constexpr char energy_returned_tariff2::name_progmem[];
-constexpr const __FlashStringHelper *energy_returned_tariff2::name;
+//constexpr const __FlashStringHelper *energy_returned_tariff2::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::energy_returned_tariff2> energy_returned_tariff2::name;
+
 
 constexpr ObisId electricity_tariff::id;
 constexpr char electricity_tariff::name_progmem[];
-constexpr const __FlashStringHelper *electricity_tariff::name;
+//constexpr const __FlashStringHelper *electricity_tariff::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::electricity_tariff> electricity_tariff::name;
+
 
 constexpr ObisId power_delivered::id;
 constexpr char power_delivered::name_progmem[];
-constexpr const __FlashStringHelper *power_delivered::name;
+//constexpr const __FlashStringHelper *power_delivered::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::power_delivered> power_delivered::name;
+
 
 constexpr ObisId power_returned::id;
 constexpr char power_returned::name_progmem[];
-constexpr const __FlashStringHelper *power_returned::name;
+//constexpr const __FlashStringHelper *power_returned::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::power_returned> power_returned::name;
+
 
 constexpr ObisId electricity_threshold::id;
 constexpr char electricity_threshold::name_progmem[];
-constexpr const __FlashStringHelper *electricity_threshold::name;
+//constexpr const __FlashStringHelper *electricity_threshold::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::electricity_threshold> electricity_threshold::name;
+
 
 constexpr ObisId electricity_switch_position::id;
 constexpr char electricity_switch_position::name_progmem[];
-constexpr const __FlashStringHelper *electricity_switch_position::name;
+//constexpr const __FlashStringHelper *electricity_switch_position::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::electricity_switch_position> electricity_switch_position::name;
+
 
 constexpr ObisId electricity_failures::id;
 constexpr char electricity_failures::name_progmem[];
-constexpr const __FlashStringHelper *electricity_failures::name;
+//constexpr const __FlashStringHelper *electricity_failures::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::electricity_failures> electricity_failures::name;
+
 
 constexpr ObisId electricity_long_failures::id;
 constexpr char electricity_long_failures::name_progmem[];
-constexpr const __FlashStringHelper *electricity_long_failures::name;
+//constexpr const __FlashStringHelper *electricity_long_failures::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::electricity_long_failures> electricity_long_failures::name;
+
 
 constexpr ObisId electricity_failure_log::id;
 constexpr char electricity_failure_log::name_progmem[];
-constexpr const __FlashStringHelper *electricity_failure_log::name;
+//constexpr const __FlashStringHelper *electricity_failure_log::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::electricity_failure_log> electricity_failure_log::name;
+
 
 constexpr ObisId electricity_sags_l1::id;
 constexpr char electricity_sags_l1::name_progmem[];
-constexpr const __FlashStringHelper *electricity_sags_l1::name;
+//constexpr const __FlashStringHelper *electricity_sags_l1::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::electricity_sags_l1> electricity_sags_l1::name;
+
 
 constexpr ObisId electricity_sags_l2::id;
 constexpr char electricity_sags_l2::name_progmem[];
-constexpr const __FlashStringHelper *electricity_sags_l2::name;
+//constexpr const __FlashStringHelper *electricity_sags_l2::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::electricity_sags_l2> electricity_sags_l2::name;
+
 
 constexpr ObisId electricity_sags_l3::id;
 constexpr char electricity_sags_l3::name_progmem[];
-constexpr const __FlashStringHelper *electricity_sags_l3::name;
+//constexpr const __FlashStringHelper *electricity_sags_l3::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::electricity_sags_l3> electricity_sags_l3::name;
+
 
 constexpr ObisId electricity_swells_l1::id;
 constexpr char electricity_swells_l1::name_progmem[];
-constexpr const __FlashStringHelper *electricity_swells_l1::name;
+//constexpr const __FlashStringHelper *electricity_swells_l1::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::electricity_swells_l1> electricity_swells_l1::name;
+
 
 constexpr ObisId electricity_swells_l2::id;
 constexpr char electricity_swells_l2::name_progmem[];
-constexpr const __FlashStringHelper *electricity_swells_l2::name;
+//constexpr const __FlashStringHelper *electricity_swells_l2::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::electricity_swells_l2> electricity_swells_l2::name;
+
 
 constexpr ObisId electricity_swells_l3::id;
 constexpr char electricity_swells_l3::name_progmem[];
-constexpr const __FlashStringHelper *electricity_swells_l3::name;
+//constexpr const __FlashStringHelper *electricity_swells_l3::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::electricity_swells_l3> electricity_swells_l3::name;
+
 
 constexpr ObisId message_short::id;
 constexpr char message_short::name_progmem[];
-constexpr const __FlashStringHelper *message_short::name;
+//constexpr const __FlashStringHelper *message_short::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::message_short> message_short::name;
+
 
 constexpr ObisId message_long::id;
 constexpr char message_long::name_progmem[];
-constexpr const __FlashStringHelper *message_long::name;
+//constexpr const __FlashStringHelper *message_long::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::message_long> message_long::name;
+
 
 constexpr ObisId voltage_l1::id;
 constexpr char voltage_l1::name_progmem[];
-constexpr const __FlashStringHelper *voltage_l1::name;
+//constexpr const __FlashStringHelper *voltage_l1::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::voltage_l1> voltage_l1::name;
+
 
 constexpr ObisId voltage_l2::id;
 constexpr char voltage_l2::name_progmem[];
-constexpr const __FlashStringHelper *voltage_l2::name;
+//constexpr const __FlashStringHelper *voltage_l2::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::voltage_l2> voltage_l2::name;
+
 
 constexpr ObisId voltage_l3::id;
 constexpr char voltage_l3::name_progmem[];
-constexpr const __FlashStringHelper *voltage_l3::name;
+//constexpr const __FlashStringHelper *voltage_l3::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::voltage_l3> voltage_l3::name;
+
 
 constexpr ObisId current_l1::id;
 constexpr char current_l1::name_progmem[];
-constexpr const __FlashStringHelper *current_l1::name;
+//constexpr const __FlashStringHelper *current_l1::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::current_l1> current_l1::name;
+
 
 constexpr ObisId current_l2::id;
 constexpr char current_l2::name_progmem[];
-constexpr const __FlashStringHelper *current_l2::name;
+//constexpr const __FlashStringHelper *current_l2::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::current_l2> current_l2::name;
+
 
 constexpr ObisId current_l3::id;
 constexpr char current_l3::name_progmem[];
-constexpr const __FlashStringHelper *current_l3::name;
+//constexpr const __FlashStringHelper *current_l3::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::current_l3> current_l3::name;
+
 
 constexpr ObisId power_delivered_l1::id;
 constexpr char power_delivered_l1::name_progmem[];
-constexpr const __FlashStringHelper *power_delivered_l1::name;
+//constexpr const __FlashStringHelper *power_delivered_l1::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::power_delivered_l1> power_delivered_l1::name;
+
 
 constexpr ObisId power_delivered_l2::id;
 constexpr char power_delivered_l2::name_progmem[];
-constexpr const __FlashStringHelper *power_delivered_l2::name;
+//constexpr const __FlashStringHelper *power_delivered_l2::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::power_delivered_l2> power_delivered_l2::name;
+
 
 constexpr ObisId power_delivered_l3::id;
 constexpr char power_delivered_l3::name_progmem[];
-constexpr const __FlashStringHelper *power_delivered_l3::name;
+//constexpr const __FlashStringHelper *power_delivered_l3::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::power_delivered_l3> power_delivered_l3::name;
+
 
 constexpr ObisId power_returned_l1::id;
 constexpr char power_returned_l1::name_progmem[];
-constexpr const __FlashStringHelper *power_returned_l1::name;
+//constexpr const __FlashStringHelper *power_returned_l1::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::power_returned_l1> power_returned_l1::name;
+
 
 constexpr ObisId power_returned_l2::id;
 constexpr char power_returned_l2::name_progmem[];
-constexpr const __FlashStringHelper *power_returned_l2::name;
+//constexpr const __FlashStringHelper *power_returned_l2::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::power_returned_l2> power_returned_l2::name;
+
 
 constexpr ObisId power_returned_l3::id;
 constexpr char power_returned_l3::name_progmem[];
-constexpr const __FlashStringHelper *power_returned_l3::name;
+//constexpr const __FlashStringHelper *power_returned_l3::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::power_returned_l3> power_returned_l3::name;
+
 
 constexpr ObisId gas_device_type::id;
 constexpr char gas_device_type::name_progmem[];
-constexpr const __FlashStringHelper *gas_device_type::name;
+//constexpr const __FlashStringHelper *gas_device_type::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::gas_device_type> gas_device_type::name;
+
 
 constexpr ObisId gas_equipment_id::id;
 constexpr char gas_equipment_id::name_progmem[];
-constexpr const __FlashStringHelper *gas_equipment_id::name;
+//constexpr const __FlashStringHelper *gas_equipment_id::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::gas_equipment_id> gas_equipment_id::name;
+
 
 constexpr ObisId gas_valve_position::id;
 constexpr char gas_valve_position::name_progmem[];
-constexpr const __FlashStringHelper *gas_valve_position::name;
+//constexpr const __FlashStringHelper *gas_valve_position::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::gas_valve_position> gas_valve_position::name;
+
 
 constexpr ObisId gas_delivered::id;
 constexpr char gas_delivered::name_progmem[];
-constexpr const __FlashStringHelper *gas_delivered::name;
+//constexpr const __FlashStringHelper *gas_delivered::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::gas_delivered> gas_delivered::name;
+
 
 constexpr ObisId thermal_device_type::id;
 constexpr char thermal_device_type::name_progmem[];
-constexpr const __FlashStringHelper *thermal_device_type::name;
+//constexpr const __FlashStringHelper *thermal_device_type::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::thermal_device_type> thermal_device_type::name;
+
 
 constexpr ObisId thermal_equipment_id::id;
 constexpr char thermal_equipment_id::name_progmem[];
-constexpr const __FlashStringHelper *thermal_equipment_id::name;
+//constexpr const __FlashStringHelper *thermal_equipment_id::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::thermal_equipment_id> thermal_equipment_id::name;
+
 
 constexpr ObisId thermal_valve_position::id;
 constexpr char thermal_valve_position::name_progmem[];
-constexpr const __FlashStringHelper *thermal_valve_position::name;
+//constexpr const __FlashStringHelper *thermal_valve_position::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::thermal_valve_position> thermal_valve_position::name;
+
 
 constexpr ObisId thermal_delivered::id;
 constexpr char thermal_delivered::name_progmem[];
-constexpr const __FlashStringHelper *thermal_delivered::name;
+//constexpr const __FlashStringHelper *thermal_delivered::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::thermal_delivered> thermal_delivered::name;
+
 
 constexpr ObisId water_device_type::id;
 constexpr char water_device_type::name_progmem[];
-constexpr const __FlashStringHelper *water_device_type::name;
+//constexpr const __FlashStringHelper *water_device_type::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::water_device_type> water_device_type::name;
+
 
 constexpr ObisId water_equipment_id::id;
 constexpr char water_equipment_id::name_progmem[];
-constexpr const __FlashStringHelper *water_equipment_id::name;
+//constexpr const __FlashStringHelper *water_equipment_id::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::water_equipment_id> water_equipment_id::name;
+
 
 constexpr ObisId water_valve_position::id;
 constexpr char water_valve_position::name_progmem[];
-constexpr const __FlashStringHelper *water_valve_position::name;
+//constexpr const __FlashStringHelper *water_valve_position::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::water_valve_position> water_valve_position::name;
+
 
 constexpr ObisId water_delivered::id;
 constexpr char water_delivered::name_progmem[];
-constexpr const __FlashStringHelper *water_delivered::name;
+//constexpr const __FlashStringHelper *water_delivered::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::water_delivered> water_delivered::name;
+
 
 constexpr ObisId slave_device_type::id;
 constexpr char slave_device_type::name_progmem[];
-constexpr const __FlashStringHelper *slave_device_type::name;
+//constexpr const __FlashStringHelper *slave_device_type::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::slave_device_type> slave_device_type::name;
+
 
 constexpr ObisId slave_equipment_id::id;
 constexpr char slave_equipment_id::name_progmem[];
-constexpr const __FlashStringHelper *slave_equipment_id::name;
+//constexpr const __FlashStringHelper *slave_equipment_id::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::slave_equipment_id> slave_equipment_id::name;
+
 
 constexpr ObisId slave_valve_position::id;
 constexpr char slave_valve_position::name_progmem[];
-constexpr const __FlashStringHelper *slave_valve_position::name;
+//constexpr const __FlashStringHelper *slave_valve_position::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::slave_valve_position> slave_valve_position::name;
+
 
 constexpr ObisId slave_delivered::id;
 constexpr char slave_delivered::name_progmem[];
-constexpr const __FlashStringHelper *slave_delivered::name;
+//constexpr const __FlashStringHelper *slave_delivered::name;
+constexpr const dsmr::fields::NameConverter<dsmr::fields::slave_delivered> slave_delivered::name;
+