Some final changes

v2.2

.github/FUNDING.yml

@@ -1 +1 @@
-custom: ["https://paypal.me/gskjold"]
+custom: ["https://amsleser.no"]

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
   - name: Meter configuration
-    url: https://github.com/gskjold/AmsToMqttBridge/wiki/Known-hardware-configurations
+    url: https://github.com/UtilitechAS/amsreader-firmware/wiki/Known-hardware-configurations
     about: Please check your meter configuration here first.
   - name: Frequently asked questions
-    url: https://github.com/gskjold/AmsToMqttBridge/wiki/FAQ
+    url: https://github.com/UtilitechAS/amsreader-firmware/wiki/FAQ
     about: Please check frequently asked questions first.

README.md

@@ -1,12 +1,12 @@
-# AMS MQTT Bridge
+# AMS Reader
 This code is designed to decode data from electric smart meters installed in many countries in Europe these days. The data is presented in a graphical web interface and can also send the data to a MQTT broker which makes it suitable for home automation project. Originally it was only designed to work with Norwegian meters, but has since been adapter to read any IEC-62056-7-5 or IEC-62056-21 compliant meters.
 
-Later development have added Energy usage graph for both day and month, as well as future energy price (Prices only  available for ESP32). The code can run on any ESP8266 or ESP32 hardware which you can read more about in the [WiKi](https://github.com/gskjold/AmsToMqttBridge/wiki). If you don't have the knowledge to set up a ESP device yourself, have a look at the shop at [amsleser.no](https://amsleser.no/).
+Later development have added Energy usage graph for both day and month, as well as future energy price. The code can run on any ESP8266 or ESP32 hardware which you can read more about in the [WiKi](https://github.com/UtilitechAS/amsreader-firmware/wiki). If you don't have the knowledge to set up a ESP device yourself, have a look at the shop at [amsleser.no](https://amsleser.no/).
 
 
-<img src="webui.png">
+<img src="images/dashboard.png">
 
-Go to the [WiKi](https://github.com/gskjold/AmsToMqttBridge/wiki) for information on how to get your own device! And find the latest prebuilt firmware file at the [release section](https://github.com/gskjold/AmsToMqttBridge/releases).
+Go to the [WiKi](https://github.com/UtilitechAS/amsreader-firmware/wiki) for information on how to get your own device! And find the latest prebuilt firmware file at the [release section](https://github.com/UtilitechAS/amsreader-firmware/releases).
 
 ## Building this project with PlatformIO
 To build this project, you need [PlatformIO](https://platformio.org/) installed.

hardware/README.md

@@ -1 +1 @@
-[See Hardware page in Wiki](https://github.com/gskjold/AmsToMqttBridge/wiki)
+[See Hardware page in Wiki](https://github.com/UtilitechAS/amsreader-firmware/wiki)

hardware/v1/kicad/HAN_ESP_TSS721.kicad_prl

@@ -0,0 +1,76 @@
+{
+  "board": {
+    "active_layer": 0,
+    "active_layer_preset": "",
+    "auto_track_width": true,
+    "hidden_nets": [],
+    "high_contrast_mode": 0,
+    "net_color_mode": 1,
+    "opacity": {
+      "pads": 1.0,
+      "tracks": 1.0,
+      "vias": 1.0,
+      "zones": 0.6
+    },
+    "ratsnest_display_mode": 0,
+    "selection_filter": {
+      "dimensions": true,
+      "footprints": true,
+      "graphics": true,
+      "keepouts": true,
+      "lockedItems": true,
+      "otherItems": true,
+      "pads": true,
+      "text": true,
+      "tracks": true,
+      "vias": true,
+      "zones": true
+    },
+    "visible_items": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      7,
+      8,
+      9,
+      10,
+      11,
+      12,
+      13,
+      14,
+      15,
+      16,
+      17,
+      18,
+      19,
+      20,
+      21,
+      22,
+      23,
+      24,
+      25,
+      26,
+      27,
+      28,
+      29,
+      30,
+      32,
+      33,
+      34,
+      35,
+      36
+    ],
+    "visible_layers": "fffffff_ffffffff",
+    "zone_display_mode": 0
+  },
+  "meta": {
+    "filename": "HAN_ESP_TSS721.kicad_prl",
+    "version": 3
+  },
+  "project": {
+    "files": []
+  }
+}

hardware/v1/kicad/HAN_ESP_TSS721.kicad_pro

@@ -0,0 +1,440 @@
+{
+  "board": {
+    "design_settings": {
+      "defaults": {
+        "board_outline_line_width": 0.15,
+        "copper_line_width": 0.19999999999999998,
+        "copper_text_italic": false,
+        "copper_text_size_h": 1.5,
+        "copper_text_size_v": 1.5,
+        "copper_text_thickness": 0.3,
+        "copper_text_upright": false,
+        "courtyard_line_width": 0.049999999999999996,
+        "dimension_precision": 4,
+        "dimension_units": 3,
+        "dimensions": {
+          "arrow_length": 1270000,
+          "extension_offset": 500000,
+          "keep_text_aligned": true,
+          "suppress_zeroes": false,
+          "text_position": 0,
+          "units_format": 1
+        },
+        "fab_line_width": 0.09999999999999999,
+        "fab_text_italic": false,
+        "fab_text_size_h": 1.0,
+        "fab_text_size_v": 1.0,
+        "fab_text_thickness": 0.15,
+        "fab_text_upright": false,
+        "other_line_width": 0.09999999999999999,
+        "other_text_italic": false,
+        "other_text_size_h": 1.0,
+        "other_text_size_v": 1.0,
+        "other_text_thickness": 0.15,
+        "other_text_upright": false,
+        "pads": {
+          "drill": 0.762,
+          "height": 1.524,
+          "width": 1.524
+        },
+        "silk_line_width": 0.15,
+        "silk_text_italic": false,
+        "silk_text_size_h": 1.0,
+        "silk_text_size_v": 1.0,
+        "silk_text_thickness": 0.15,
+        "silk_text_upright": false,
+        "zones": {
+          "45_degree_only": true,
+          "min_clearance": 0.508
+        }
+      },
+      "diff_pair_dimensions": [],
+      "drc_exclusions": [],
+      "meta": {
+        "filename": "board_design_settings.json",
+        "version": 2
+      },
+      "rule_severities": {
+        "annular_width": "error",
+        "clearance": "error",
+        "copper_edge_clearance": "error",
+        "courtyards_overlap": "error",
+        "diff_pair_gap_out_of_range": "error",
+        "diff_pair_uncoupled_length_too_long": "error",
+        "drill_out_of_range": "error",
+        "duplicate_footprints": "warning",
+        "extra_footprint": "warning",
+        "footprint_type_mismatch": "error",
+        "hole_clearance": "error",
+        "hole_near_hole": "error",
+        "invalid_outline": "error",
+        "item_on_disabled_layer": "error",
+        "items_not_allowed": "error",
+        "length_out_of_range": "error",
+        "malformed_courtyard": "error",
+        "microvia_drill_out_of_range": "error",
+        "missing_courtyard": "ignore",
+        "missing_footprint": "warning",
+        "net_conflict": "warning",
+        "npth_inside_courtyard": "ignore",
+        "padstack": "error",
+        "pth_inside_courtyard": "ignore",
+        "shorting_items": "error",
+        "silk_over_copper": "warning",
+        "silk_overlap": "warning",
+        "skew_out_of_range": "error",
+        "through_hole_pad_without_hole": "error",
+        "too_many_vias": "error",
+        "track_dangling": "warning",
+        "track_width": "error",
+        "tracks_crossing": "error",
+        "unconnected_items": "error",
+        "unresolved_variable": "error",
+        "via_dangling": "warning",
+        "zone_has_empty_net": "error",
+        "zones_intersect": "error"
+      },
+      "rules": {
+        "allow_blind_buried_vias": false,
+        "allow_microvias": false,
+        "max_error": 0.005,
+        "min_clearance": 0.0,
+        "min_copper_edge_clearance": 0.075,
+        "min_hole_clearance": 0.25,
+        "min_hole_to_hole": 0.25,
+        "min_microvia_diameter": 0.19999999999999998,
+        "min_microvia_drill": 0.09999999999999999,
+        "min_silk_clearance": 0.0,
+        "min_through_hole_diameter": 0.3,
+        "min_track_width": 0.19999999999999998,
+        "min_via_annular_width": 0.049999999999999996,
+        "min_via_diameter": 0.39999999999999997,
+        "use_height_for_length_calcs": true
+      },
+      "track_widths": [
+        0.0,
+        0.2,
+        0.4,
+        0.6,
+        1.0
+      ],
+      "via_dimensions": [],
+      "zones_allow_external_fillets": false,
+      "zones_use_no_outline": true
+    },
+    "layer_presets": []
+  },
+  "boards": [],
+  "cvpcb": {
+    "equivalence_files": []
+  },
+  "erc": {
+    "erc_exclusions": [],
+    "meta": {
+      "version": 0
+    },
+    "pin_map": [
+      [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        2
+      ],
+      [
+        0,
+        2,
+        0,
+        1,
+        0,
+        0,
+        1,
+        0,
+        2,
+        2,
+        2,
+        2
+      ],
+      [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+        1,
+        0,
+        1,
+        2
+      ],
+      [
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        2,
+        1,
+        1,
+        2
+      ],
+      [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        2
+      ],
+      [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        2
+      ],
+      [
+        1,
+        1,
+        1,
+        1,
+        1,
+        0,
+        1,
+        1,
+        1,
+        1,
+        1,
+        2
+      ],
+      [
+        0,
+        0,
+        0,
+        1,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        2
+      ],
+      [
+        0,
+        2,
+        1,
+        2,
+        0,
+        0,
+        1,
+        0,
+        2,
+        2,
+        2,
+        2
+      ],
+      [
+        0,
+        2,
+        0,
+        1,
+        0,
+        0,
+        1,
+        0,
+        2,
+        0,
+        0,
+        2
+      ],
+      [
+        0,
+        2,
+        1,
+        1,
+        0,
+        0,
+        1,
+        0,
+        2,
+        0,
+        0,
+        2
+      ],
+      [
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2
+      ]
+    ],
+    "rule_severities": {
+      "bus_definition_conflict": "error",
+      "bus_entry_needed": "error",
+      "bus_label_syntax": "error",
+      "bus_to_bus_conflict": "error",
+      "bus_to_net_conflict": "error",
+      "different_unit_footprint": "error",
+      "different_unit_net": "error",
+      "duplicate_reference": "error",
+      "duplicate_sheet_names": "error",
+      "extra_units": "error",
+      "global_label_dangling": "warning",
+      "hier_label_mismatch": "error",
+      "label_dangling": "error",
+      "lib_symbol_issues": "warning",
+      "multiple_net_names": "warning",
+      "net_not_bus_member": "warning",
+      "no_connect_connected": "warning",
+      "no_connect_dangling": "warning",
+      "pin_not_connected": "error",
+      "pin_not_driven": "error",
+      "pin_to_pin": "warning",
+      "power_pin_not_driven": "error",
+      "similar_labels": "warning",
+      "unannotated": "error",
+      "unit_value_mismatch": "error",
+      "unresolved_variable": "error",
+      "wire_dangling": "error"
+    }
+  },
+  "libraries": {
+    "pinned_footprint_libs": [],
+    "pinned_symbol_libs": []
+  },
+  "meta": {
+    "filename": "HAN_ESP_TSS721.kicad_pro",
+    "version": 1
+  },
+  "net_settings": {
+    "classes": [
+      {
+        "bus_width": 12.0,
+        "clearance": 0.2,
+        "diff_pair_gap": 0.25,
+        "diff_pair_via_gap": 0.25,
+        "diff_pair_width": 0.2,
+        "line_style": 0,
+        "microvia_diameter": 0.3,
+        "microvia_drill": 0.1,
+        "name": "Default",
+        "pcb_color": "rgba(0, 0, 0, 0.000)",
+        "schematic_color": "rgba(0, 0, 0, 0.000)",
+        "track_width": 0.25,
+        "via_diameter": 0.6,
+        "via_drill": 0.4,
+        "wire_width": 6.0
+      },
+      {
+        "bus_width": 12.0,
+        "clearance": 0.5,
+        "diff_pair_gap": 0.25,
+        "diff_pair_via_gap": 0.25,
+        "diff_pair_width": 0.2,
+        "line_style": 0,
+        "microvia_diameter": 0.5,
+        "microvia_drill": 0.2,
+        "name": "PWR",
+        "nets": [
+          "+3V3"
+        ],
+        "pcb_color": "rgba(0, 0, 0, 0.000)",
+        "schematic_color": "rgba(0, 0, 0, 0.000)",
+        "track_width": 0.5,
+        "via_diameter": 0.8,
+        "via_drill": 0.6,
+        "wire_width": 6.0
+      }
+    ],
+    "meta": {
+      "version": 2
+    },
+    "net_colors": null
+  },
+  "pcbnew": {
+    "last_paths": {
+      "gencad": "",
+      "idf": "",
+      "netlist": "",
+      "specctra_dsn": "",
+      "step": "",
+      "vrml": ""
+    },
+    "page_layout_descr_file": ""
+  },
+  "schematic": {
+    "annotate_start_num": 0,
+    "drawing": {
+      "default_line_thickness": 6.0,
+      "default_text_size": 50.0,
+      "field_names": [],
+      "intersheets_ref_own_page": false,
+      "intersheets_ref_prefix": "",
+      "intersheets_ref_short": false,
+      "intersheets_ref_show": false,
+      "intersheets_ref_suffix": "",
+      "junction_size_choice": 3,
+      "label_size_ratio": 0.25,
+      "pin_symbol_size": 0.0,
+      "text_offset_ratio": 0.08
+    },
+    "legacy_lib_dir": "",
+    "legacy_lib_list": [],
+    "meta": {
+      "version": 1
+    },
+    "net_format_name": "",
+    "ngspice": {
+      "fix_include_paths": true,
+      "fix_passive_vals": false,
+      "meta": {
+        "version": 0
+      },
+      "model_mode": 0,
+      "workbook_filename": ""
+    },
+    "page_layout_descr_file": "",
+    "plot_directory": "",
+    "spice_adjust_passive_values": false,
+    "spice_external_command": "spice \"%I\"",
+    "subpart_first_id": 65,
+    "subpart_id_separator": 0
+  },
+  "sheets": [],
+  "text_variables": {}
+}

hardware/v1/kicad/fp-info-cache

@@ -0,0 +1 @@
+0

hardware/wemos_mbus_shield/kicad/d1_mini_shield-rescue.dcm

@@ -0,0 +1,3 @@
+EESchema-DOCLIB  Version 2.0
+#
+#End Doc Library

hardware/wemos_mbus_shield/kicad/d1_mini_shield-rescue.lib

@@ -1,6 +1,21 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
+# +3.3V-power
+#
+DEF +3.3V-power #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+3.3V-power" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +3V3 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
 # CONN_01X08
 #
 DEF CONN_01X08 P 0 40 Y N 1 F N
@@ -35,4 +50,23 @@ X P8 8 -200 -350 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Jumper-Device
+#
+DEF Jumper-Device JP 0 30 Y N 1 F N
+F0 "JP" 0 150 50 H V C CNN
+F1 "Jumper-Device" 0 -80 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SolderJumper*
+$ENDFPLIST
+DRAW
+C -100 0 35 0 1 0 N
+A 0 -26 125 375 1422 0 1 0 N 99 50 -98 50
+C 100 0 35 0 1 0 N
+X 1 1 -300 0 165 R 50 50 0 1 P
+X 2 2 300 0 165 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
 #End Library

hardware/wemos_mbus_shield/kicad/d1_mini_shield.kicad_prl

@@ -0,0 +1,75 @@
+{
+  "board": {
+    "active_layer": 0,
+    "active_layer_preset": "",
+    "auto_track_width": true,
+    "hidden_nets": [],
+    "high_contrast_mode": 0,
+    "net_color_mode": 1,
+    "opacity": {
+      "pads": 1.0,
+      "tracks": 1.0,
+      "vias": 1.0,
+      "zones": 0.6
+    },
+    "ratsnest_display_mode": 0,
+    "selection_filter": {
+      "dimensions": true,
+      "footprints": true,
+      "graphics": true,
+      "keepouts": true,
+      "lockedItems": true,
+      "otherItems": true,
+      "pads": true,
+      "text": true,
+      "tracks": true,
+      "vias": true,
+      "zones": true
+    },
+    "visible_items": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      8,
+      9,
+      10,
+      11,
+      12,
+      13,
+      14,
+      15,
+      16,
+      17,
+      18,
+      19,
+      20,
+      21,
+      22,
+      23,
+      24,
+      25,
+      26,
+      27,
+      28,
+      29,
+      30,
+      32,
+      33,
+      34,
+      35,
+      36
+    ],
+    "visible_layers": "fffffff_ffffffff",
+    "zone_display_mode": 0
+  },
+  "meta": {
+    "filename": "d1_mini_shield.kicad_prl",
+    "version": 3
+  },
+  "project": {
+    "files": []
+  }
+}

hardware/wemos_mbus_shield/kicad/d1_mini_shield.kicad_pro

@@ -0,0 +1,356 @@
+{
+  "board": {
+    "design_settings": {
+      "defaults": {
+        "board_outline_line_width": 0.15,
+        "copper_line_width": 0.2,
+        "copper_text_italic": false,
+        "copper_text_size_h": 1.5,
+        "copper_text_size_v": 1.5,
+        "copper_text_thickness": 0.3,
+        "copper_text_upright": true,
+        "courtyard_line_width": 0.05,
+        "other_line_width": 0.15,
+        "other_text_italic": false,
+        "other_text_size_h": 1.0,
+        "other_text_size_v": 1.0,
+        "other_text_thickness": 0.15,
+        "other_text_upright": true,
+        "silk_line_width": 0.15,
+        "silk_text_italic": false,
+        "silk_text_size_h": 1.0,
+        "silk_text_size_v": 1.0,
+        "silk_text_thickness": 0.15,
+        "silk_text_upright": true
+      },
+      "diff_pair_dimensions": [
+        {
+          "gap": 0.25,
+          "via_gap": 0.25,
+          "width": 0.2
+        }
+      ],
+      "drc_exclusions": [],
+      "rule_severitieslegacy_courtyards_overlap": true,
+      "rule_severitieslegacy_no_courtyard_defined": false,
+      "rules": {
+        "allow_blind_buried_vias": false,
+        "allow_microvias": false,
+        "min_hole_to_hole": 0.25,
+        "min_microvia_diameter": 0.2,
+        "min_microvia_drill": 0.09999999999999999,
+        "min_through_hole_diameter": 0.3,
+        "min_track_width": 0.2,
+        "min_via_diameter": 0.4,
+        "solder_mask_clearance": 0.2,
+        "solder_mask_min_width": 0.0,
+        "solder_paste_clearance": 0.0,
+        "solder_paste_margin_ratio": -0.0
+      },
+      "track_widths": [
+        0.25,
+        0.5
+      ],
+      "via_dimensions": [
+        {
+          "diameter": 0.6,
+          "drill": 0.4
+        }
+      ]
+    },
+    "layer_presets": []
+  },
+  "boards": [],
+  "cvpcb": {
+    "equivalence_files": []
+  },
+  "erc": {
+    "erc_exclusions": [],
+    "meta": {
+      "version": 0
+    },
+    "pin_map": [
+      [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        2
+      ],
+      [
+        0,
+        2,
+        0,
+        1,
+        0,
+        0,
+        1,
+        0,
+        2,
+        2,
+        2,
+        2
+      ],
+      [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+        1,
+        0,
+        1,
+        2
+      ],
+      [
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        2,
+        1,
+        1,
+        2
+      ],
+      [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        2
+      ],
+      [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        2
+      ],
+      [
+        1,
+        1,
+        1,
+        1,
+        1,
+        0,
+        1,
+        1,
+        1,
+        1,
+        1,
+        2
+      ],
+      [
+        0,
+        0,
+        0,
+        1,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        2
+      ],
+      [
+        0,
+        2,
+        1,
+        2,
+        0,
+        0,
+        1,
+        0,
+        2,
+        2,
+        2,
+        2
+      ],
+      [
+        0,
+        2,
+        0,
+        1,
+        0,
+        0,
+        1,
+        0,
+        2,
+        0,
+        0,
+        2
+      ],
+      [
+        0,
+        2,
+        1,
+        1,
+        0,
+        0,
+        1,
+        0,
+        2,
+        0,
+        0,
+        2
+      ],
+      [
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2
+      ]
+    ],
+    "rule_severities": {
+      "bus_definition_conflict": "error",
+      "bus_entry_needed": "error",
+      "bus_label_syntax": "error",
+      "bus_to_bus_conflict": "error",
+      "bus_to_net_conflict": "error",
+      "different_unit_footprint": "error",
+      "different_unit_net": "error",
+      "duplicate_reference": "error",
+      "duplicate_sheet_names": "error",
+      "extra_units": "error",
+      "global_label_dangling": "warning",
+      "hier_label_mismatch": "error",
+      "label_dangling": "error",
+      "lib_symbol_issues": "warning",
+      "multiple_net_names": "warning",
+      "net_not_bus_member": "warning",
+      "no_connect_connected": "warning",
+      "no_connect_dangling": "warning",
+      "pin_not_connected": "error",
+      "pin_not_driven": "error",
+      "pin_to_pin": "warning",
+      "power_pin_not_driven": "error",
+      "similar_labels": "warning",
+      "unannotated": "error",
+      "unit_value_mismatch": "error",
+      "unresolved_variable": "error",
+      "wire_dangling": "error"
+    }
+  },
+  "libraries": {
+    "pinned_footprint_libs": [],
+    "pinned_symbol_libs": []
+  },
+  "meta": {
+    "filename": "d1_mini_shield.kicad_pro",
+    "version": 1
+  },
+  "net_settings": {
+    "classes": [
+      {
+        "bus_width": 12.0,
+        "clearance": 0.2,
+        "diff_pair_gap": 0.25,
+        "diff_pair_via_gap": 0.25,
+        "diff_pair_width": 0.2,
+        "line_style": 0,
+        "microvia_diameter": 0.3,
+        "microvia_drill": 0.1,
+        "name": "Default",
+        "pcb_color": "rgba(0, 0, 0, 0.000)",
+        "schematic_color": "rgba(0, 0, 0, 0.000)",
+        "track_width": 0.25,
+        "via_diameter": 0.8,
+        "via_drill": 0.4,
+        "wire_width": 6.0
+      }
+    ],
+    "meta": {
+      "version": 2
+    },
+    "net_colors": null
+  },
+  "pcbnew": {
+    "last_paths": {
+      "gencad": "",
+      "idf": "",
+      "netlist": "d1_mini_shield.net",
+      "specctra_dsn": "",
+      "step": "",
+      "vrml": ""
+    },
+    "page_layout_descr_file": ""
+  },
+  "schematic": {
+    "annotate_start_num": 0,
+    "drawing": {
+      "default_line_thickness": 6.0,
+      "default_text_size": 50.0,
+      "field_names": [],
+      "intersheets_ref_own_page": false,
+      "intersheets_ref_prefix": "",
+      "intersheets_ref_short": false,
+      "intersheets_ref_show": false,
+      "intersheets_ref_suffix": "",
+      "junction_size_choice": 3,
+      "label_size_ratio": 0.25,
+      "pin_symbol_size": 0.0,
+      "text_offset_ratio": 0.08
+    },
+    "legacy_lib_dir": "",
+    "legacy_lib_list": [],
+    "meta": {
+      "version": 1
+    },
+    "net_format_name": "Pcbnew",
+    "ngspice": {
+      "fix_include_paths": true,
+      "fix_passive_vals": false,
+      "meta": {
+        "version": 0
+      },
+      "model_mode": 0,
+      "workbook_filename": ""
+    },
+    "page_layout_descr_file": "",
+    "plot_directory": "",
+    "spice_adjust_passive_values": false,
+    "spice_external_command": "spice \"%I\"",
+    "subpart_first_id": 65,
+    "subpart_id_separator": 0
+  },
+  "sheets": [],
+  "text_variables": {}
+}

lib/AmsConfiguration/include/AmsConfiguration.h

@@ -34,8 +34,8 @@ struct SystemConfig {
 	bool vendorConfigured;
 	bool userConfigured;
 	uint8_t dataCollectionConsent; // 0 = unknown, 1 = accepted, 2 = declined
-	char country[2];
+	char country[3];
-}; // 6
+}; // 7
 
 struct WiFiConfig91 {
 	char ssid[32];

lib/AmsConfiguration/include/hexutils.h

@@ -7,5 +7,6 @@
 String toHex(uint8_t* in);
 String toHex(uint8_t* in, uint16_t size);
 void fromHex(uint8_t *out, String in, uint16_t size);
+void stripNonAscii(uint8_t* in, uint16_t size);
 
 #endif

lib/AmsConfiguration/src/AmsConfiguration.cpp

@@ -1,4 +1,5 @@
 #include "AmsConfiguration.h"
+#include "hexutils.h"
 
 bool AmsConfiguration::getSystemConfig(SystemConfig& config) {
 	EEPROM.begin(EEPROM_SIZE);
@@ -19,6 +20,7 @@ bool AmsConfiguration::getSystemConfig(SystemConfig& config) {
 
 bool AmsConfiguration::setSystemConfig(SystemConfig& config) {
 	EEPROM.begin(EEPROM_SIZE);
+	stripNonAscii((uint8_t*) config.country, 2);
 	EEPROM.put(CONFIG_SYSTEM_START, config);
 	bool ret = EEPROM.commit();
 	EEPROM.end();
@@ -59,6 +61,16 @@ bool AmsConfiguration::setWiFiConfig(WiFiConfig& config) {
 	} else {
 		wifiChanged = true;
 	}
+	
+	stripNonAscii((uint8_t*) config.ssid, 32);
+	stripNonAscii((uint8_t*) config.psk, 64);
+	stripNonAscii((uint8_t*) config.ip, 16);
+	stripNonAscii((uint8_t*) config.gateway, 16);
+	stripNonAscii((uint8_t*) config.subnet, 16);
+	stripNonAscii((uint8_t*) config.dns1, 16);
+	stripNonAscii((uint8_t*) config.dns2, 16);
+	stripNonAscii((uint8_t*) config.hostname, 32);
+
 	EEPROM.begin(EEPROM_SIZE);
 	EEPROM.put(CONFIG_WIFI_START, config);
 	bool ret = EEPROM.commit();
@@ -127,6 +139,14 @@ bool AmsConfiguration::setMqttConfig(MqttConfig& config) {
 	} else {
 		mqttChanged = true;
 	}
+
+	stripNonAscii((uint8_t*) config.host, 128);
+	stripNonAscii((uint8_t*) config.clientId, 32);
+	stripNonAscii((uint8_t*) config.publishTopic, 64);
+	stripNonAscii((uint8_t*) config.subscribeTopic, 64);
+	stripNonAscii((uint8_t*) config.username, 128);
+	stripNonAscii((uint8_t*) config.password, 256);
+
 	EEPROM.begin(EEPROM_SIZE);
 	EEPROM.put(CONFIG_MQTT_START, config);
 	bool ret = EEPROM.commit();
@@ -171,6 +191,10 @@ bool AmsConfiguration::getWebConfig(WebConfig& config) {
 }
 
 bool AmsConfiguration::setWebConfig(WebConfig& config) {
+
+	stripNonAscii((uint8_t*) config.username, 64);
+	stripNonAscii((uint8_t*) config.password, 64);
+
 	EEPROM.begin(EEPROM_SIZE);
 	EEPROM.put(CONFIG_WEB_START, config);
 	bool ret = EEPROM.commit();
@@ -221,8 +245,8 @@ void AmsConfiguration::clearMeter(MeterConfig& config) {
 	config.baud = 0;
 	config.parity = 0;
 	config.invert = false;
-	config.distributionSystem = 0;
+	config.distributionSystem = 2;
-	config.mainFuse = 0;
+	config.mainFuse = 40;
 	config.productionCapacity = 0;
 	memset(config.encryptionKey, 0, 16);
 	memset(config.authenticationKey, 0, 16);
@@ -445,6 +469,10 @@ bool AmsConfiguration::setNtpConfig(NtpConfig& config) {
 	} else {
 		ntpChanged = true;
 	}
+
+	stripNonAscii((uint8_t*) config.server, 64);
+	stripNonAscii((uint8_t*) config.timezone, 32);
+
 	EEPROM.begin(EEPROM_SIZE);
 	EEPROM.put(CONFIG_NTP_START, config);
 	bool ret = EEPROM.commit();
@@ -492,6 +520,11 @@ bool AmsConfiguration::setEntsoeConfig(EntsoeConfig& config) {
 	} else {
 		entsoeChanged = true;
 	}
+
+	stripNonAscii((uint8_t*) config.token, 37);
+	stripNonAscii((uint8_t*) config.area, 17);
+	stripNonAscii((uint8_t*) config.currency, 4);
+
 	EEPROM.begin(EEPROM_SIZE);
 	EEPROM.put(CONFIG_ENTSOE_START, config);
 	bool ret = EEPROM.commit();
@@ -504,6 +537,7 @@ void AmsConfiguration::clearEntsoe(EntsoeConfig& config) {
 	strcpy(config.area, "");
 	strcpy(config.currency, "");
 	config.multiplier = 1000;
+	config.enabled = false;
 }
 
 bool AmsConfiguration::isEntsoeChanged() {

lib/AmsConfiguration/src/hexutils.cpp

@@ -20,4 +20,17 @@ void fromHex(uint8_t *out, String in, uint16_t size) {
 	for(int i = 0; i < size*2; i += 2) {
 		out[i/2] = strtol(in.substring(i, i+2).c_str(), 0, 16);
 	}
+}
+
+void stripNonAscii(uint8_t* in, uint16_t size) {
+	for(uint16_t i = 0; i < size; i++) {
+		if(in[i] == 0) { // Clear the rest with null-terminator
+			memset(in+i, 0, size-i);
+			break;
+		}
+		if(in[i] < 32 || in[i] > 126) {
+			memset(in+i, ' ', 1);
+		}
+	}
+	memset(in+size-1, 0, 1); // Make sure the last character is null-terminator
 }

lib/ClassicUi/html/head.html

@@ -48,7 +48,7 @@
 <main role="main" class="container">
     <header class="navbar navbar-expand navbar-dark flex-column flex-lg-row rounded shadow mt-2 mb-3" style="background-color: var(--purple);">
         <a href="/" class="">
-            <h6 class="navbar-brand">AMS reader <small id="swVersion" data-url="https://api.github.com/repos/gskjold/AmsToMqttBridge/releases">${version}</small></h6>
+            <h6 class="navbar-brand">AMS reader <small id="swVersion" data-url="https://api.github.com/repos/UtilitechAS/amsreader-firmware/releases">${version}</small></h6>
         </a>
         <div class="navbar-nav-scroll">
             <ul class="navbar-nav bd-navbar-nav flex-row">
@@ -66,7 +66,7 @@
                             <a class="dropdown-item" href="/ntp">NTP</a>
                             <a class="dropdown-item" href="/priceapi">Price API</a>
                             <div class="dropdown-divider"></div>
-                            <a class="dropdown-item" href="https://github.com/gskjold/AmsToMqttBridge/wiki" target="_blank">Documentation</a>
+                            <a class="dropdown-item" href="https://github.com/UtilitechAS/amsreader-firmware/wiki" target="_blank">Documentation</a>
                         </div>
                     </div>
                 </li>
@@ -96,7 +96,7 @@
         </div>
         <ul class="navbar-nav flex-row ml-md-auto d-none d-lg-flex">
             <li class="nav-item">
-                <a class="nav-link p-2" href="https://github.com/gskjold/AmsToMqttBridge" target="_blank" rel="noopener" aria-label="GitHub">
+                <a class="nav-link p-2" href="https://github.com/UtilitechAS/amsreader-firmware" target="_blank" rel="noopener" aria-label="GitHub">
                     <img class="d-inline-block align-text-top" style="width: 2rem; height: 2rem;" src="github.svg"/>
                 </a>
             </li>

lib/ClassicUi/html/meter.html

@@ -65,7 +65,7 @@
                 </div>
             </div>
             <div class="col-lg-4 col-sm-8">
-                <a href="https://github.com/gskjold/AmsToMqttBridge/wiki/Known-hardware-configurations" target="_blank">Known hardware configurations</a>
+                <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki/Known-hardware-configurations" target="_blank">Known hardware configurations</a>
             </div>
         </div>
         <div class="row">

lib/ClassicUi/html/restartwait.html

@@ -12,7 +12,7 @@
         <a href="/" class=""><h6 class="navbar-brand">AMS reader <small>${version}</small></h6></a>
         <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
             <li class="nav-item">
-                <a class="nav-link p-2" href="https://github.com/gskjold/AmsToMqttBridge" target="_blank" rel="noopener" aria-label="GitHub">
+                <a class="nav-link p-2" href="https://github.com/UtilitechAS/amsreader-firmware" target="_blank" rel="noopener" aria-label="GitHub">
                     <img class="d-inline-block align-text-top" style="width: 2rem; height: 2rem;" src="github.svg"/>
                 </a>
             </li>

lib/ClassicUi/html/setup.html

@@ -12,7 +12,7 @@
         <a href="/" class=""><h6 class="navbar-brand">AMS reader <small>${version}</small></h6></a>
         <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
             <li class="nav-item">
-                <a class="nav-link p-2" href="https://github.com/gskjold/AmsToMqttBridge" target="_blank" rel="noopener" aria-label="GitHub">
+                <a class="nav-link p-2" href="https://github.com/UtilitechAS/amsreader-firmware" target="_blank" rel="noopener" aria-label="GitHub">
                     <img style="width: 2rem; height: 2rem;" src="github.svg"/>
                 </a>
             </li>

lib/ClassicUi/src/AmsWebServer.cpp

@@ -1028,6 +1028,7 @@ void AmsWebServer::handleSetup() {
 
 		switch(sys.boardType) {
 			case 0: // roarfred
+				config->clearGpio(*gpioConfig);
 				gpioConfig->hanPin = 3;
 				gpioConfig->apPin = 0;
 				gpioConfig->ledPin = 2;
@@ -1035,6 +1036,7 @@ void AmsWebServer::handleSetup() {
 				gpioConfig->tempSensorPin = 5;
 				break;
 			case 1: // Arnio Kamstrup
+				config->clearGpio(*gpioConfig);
 				gpioConfig->hanPin = 3;
 				gpioConfig->apPin = 0;
 				gpioConfig->ledPin = 2;
@@ -1044,6 +1046,7 @@ void AmsWebServer::handleSetup() {
 				gpioConfig->ledRgbInverted = true;
 				break;
 			case 2: // spenceme
+				config->clearGpio(*gpioConfig);
 				gpioConfig->hanPin = 3;
 				gpioConfig->apPin = 0;
 				gpioConfig->ledPin = 2;
@@ -1053,6 +1056,7 @@ void AmsWebServer::handleSetup() {
 				wifi.sleep = 1;
 				break;
 			case 3: // Pow UART0
+				config->clearGpio(*gpioConfig);
 				gpioConfig->hanPin = 3;
 				gpioConfig->apPin = 0;
 				gpioConfig->ledPin = 2;
@@ -1063,6 +1067,7 @@ void AmsWebServer::handleSetup() {
 				wifi.sleep = 1;
 				break;
 			case 4: // Pow GPIO12
+				config->clearGpio(*gpioConfig);
 				gpioConfig->hanPin = 12;
 				gpioConfig->apPin = 0;
 				gpioConfig->ledPin = 2;
@@ -1073,6 +1078,7 @@ void AmsWebServer::handleSetup() {
 				wifi.sleep = 1;
 				break;
 			case 5: // Pow-K+ UART2
+				config->clearGpio(*gpioConfig);
 				gpioConfig->hanPin = 16;
 				gpioConfig->apPin = 0;
 				gpioConfig->ledPinRed = 13;
@@ -1084,6 +1090,7 @@ void AmsWebServer::handleSetup() {
 				wifi.sleep = 1;
 				break;
 			case 6: // Pow-P1
+				config->clearGpio(*gpioConfig);
 				gpioConfig->hanPin = 16;
 				gpioConfig->apPin = 0;
 				gpioConfig->ledPinRed = 13;
@@ -1094,6 +1101,7 @@ void AmsWebServer::handleSetup() {
 				gpioConfig->vccResistorVcc = 33;
 				break;
 			case 7: // Pow-U+
+				config->clearGpio(*gpioConfig);
 				gpioConfig->hanPin = 16;
 				gpioConfig->apPin = 0;
 				gpioConfig->ledPinRed = 13;
@@ -1827,7 +1835,7 @@ void AmsWebServer::restartWaitHtml() {
 		performRestart = false;
 	} else if(performUpgrade) {
 		WiFiClient client;
-		String url = customFirmwareUrl.isEmpty() || !customFirmwareUrl.startsWith(F("http")) ? F("http://ams2mqtt.rewiredinvent.no/hub/firmware/update") : customFirmwareUrl;
+		String url = customFirmwareUrl.isEmpty() || !customFirmwareUrl.startsWith(F("http")) ? F("http://hub.amsleser.no/hub/firmware/update") : customFirmwareUrl;
 		#if defined(ESP8266)
 			String chipType = F("esp8266");
 		#elif defined(CONFIG_IDF_TARGET_ESP32S2)

lib/EntsoePriceApi/src/EntsoeApi.cpp

@@ -308,7 +308,7 @@ PricesContainer* EntsoeApi::fetchPrices(time_t t) {
     } else if(hub) {
         String data;
         snprintf(buf, BufferSize, "%s/%s/%d/%d/%d?currency=%s",
-            "http://ams2mqtt.rewiredinvent.no/hub/price",
+            "http://hub.amsleser.no/hub/price",
             config->area,
             tm.Year+1970,
             tm.Month,

lib/HomeAssistantMqttHandler/include/HomeAssistantMqttHandler.h

@@ -31,6 +31,5 @@ private:
     String clientId;
     String topic;
     HwTools* hw;
-    uint8_t sequence = 0, listType = 0;
 };
 #endif

lib/HomeAssistantMqttHandler/include/HomeAssistantStatic.h

@@ -17,7 +17,7 @@ const uint8_t HA_SENSOR_COUNT PROGMEM = 60;
 HomeAssistantSensor HA_SENSORS[HA_SENSOR_COUNT] PROGMEM = {
     {"Status",                     "/state",   "rssi",              "dBm",  "signal_strength", "\"measurement\""},
     {"Supply volt",                "/state",   "vcc",               "V",    "voltage",         "\"measurement\""},
-    {"Temperature",                "/state",   "temp",              "C",    "temperature",     "\"measurement\""},
+    {"Temperature",                "/state",   "temp",              "°C",   "temperature",     "\"measurement\""},
     {"Active import",              "/power",   "P",                 "W",    "power",           "\"measurement\""},
     {"L1 active import",           "/power",   "P1",                "W",    "power",           "\"measurement\""},
     {"L2 active import",           "/power",   "P2",                "W",    "power",           "\"measurement\""},

lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp

@@ -16,7 +16,6 @@ bool HomeAssistantMqttHandler::publish(AmsData* data, AmsData* previousState, En
 	if(topic.isEmpty() || !mqtt->connected())
 		return false;
 
-    listType = data->getListType(); // for discovery stuff in publishSystem()
     if(data->getListType() >= 3) { // publish energy counts
         snprintf_P(json, BufferSize, HA2_JSON,
             data->getActiveImportCounter(),
@@ -192,6 +191,7 @@ bool HomeAssistantMqttHandler::publishPrices(EntsoeApi* eapi) {
 	}
 
 	char ts1hr[24];
+    memset(ts1hr, 0, 24);
 	if(min1hrIdx > -1) {
         time_t ts = now + (SECS_PER_HOUR * min1hrIdx);
         //Serial.printf("1hr: %d %lu\n", min1hrIdx, ts);
@@ -200,6 +200,7 @@ bool HomeAssistantMqttHandler::publishPrices(EntsoeApi* eapi) {
 		sprintf(ts1hr, "%04d-%02d-%02dT%02d:00:00Z", tm.Year+1970, tm.Month, tm.Day, tm.Hour);
 	}
 	char ts3hr[24];
+    memset(ts3hr, 0, 24);
 	if(min3hrIdx > -1) {
         time_t ts = now + (SECS_PER_HOUR * min3hrIdx);
         //Serial.printf("3hr: %d %lu\n", min3hrIdx, ts);
@@ -208,6 +209,7 @@ bool HomeAssistantMqttHandler::publishPrices(EntsoeApi* eapi) {
 		sprintf(ts3hr, "%04d-%02d-%02dT%02d:00:00Z", tm.Year+1970, tm.Month, tm.Day, tm.Hour);
 	}
 	char ts6hr[24];
+    memset(ts6hr, 0, 24);
 	if(min6hrIdx > -1) {
         time_t ts = now + (SECS_PER_HOUR * min6hrIdx);
         //Serial.printf("6hr: %d %lu\n", min6hrIdx, ts);
@@ -240,23 +242,19 @@ bool HomeAssistantMqttHandler::publishPrices(EntsoeApi* eapi) {
 }
 
 bool HomeAssistantMqttHandler::publishSystem(HwTools* hw, EntsoeApi* eapi, EnergyAccounting* ea) {
-	if(topic.isEmpty() || !mqtt->connected()){
+	if(topic.isEmpty() || !mqtt->connected())
-        sequence = 0;
 		return false;
-    }
 
-    if(sequence % 3 == 0){
+    snprintf_P(json, BufferSize, JSONSYS_JSON,
-        snprintf_P(json, BufferSize, JSONSYS_JSON,
+        WiFi.macAddress().c_str(),
-            WiFi.macAddress().c_str(),
+        clientId.c_str(),
-            clientId.c_str(),
+        (uint32_t) (millis64()/1000),
-            (uint32_t) (millis64()/1000),
+        hw->getVcc(),
-            hw->getVcc(),
+        hw->getWifiRssi(),
-            hw->getWifiRssi(),
+        hw->getTemperature(),
-            hw->getTemperature(),
+        VERSION
-            VERSION
+    );
-        );
+    mqtt->publish(topic + "/state", json);
-        mqtt->publish(topic + "/state", json);
-    }
 
     if(!autodiscoverInit) {
         #if defined(ESP8266)
@@ -315,6 +313,5 @@ bool HomeAssistantMqttHandler::publishSystem(HwTools* hw, EntsoeApi* eapi, Energ
 
         autodiscoverInit = true;
     }
-    if(listType>0) sequence++;
     return true;
 }

lib/JsonMqttHandler/include/JsonMqttHandler.h

@@ -19,6 +19,5 @@ private:
     String clientId;
     String topic;
     HwTools* hw;
-    bool init = false;
 };
 #endif

lib/JsonMqttHandler/src/JsonMqttHandler.cpp

@@ -231,6 +231,7 @@ bool JsonMqttHandler::publishPrices(EntsoeApi* eapi) {
 	}
 
 	char ts1hr[24];
+    memset(ts1hr, 0, 24);
 	if(min1hrIdx > -1) {
         time_t ts = now + (SECS_PER_HOUR * min1hrIdx);
         //Serial.printf("1hr: %d %lu\n", min1hrIdx, ts);
@@ -239,6 +240,7 @@ bool JsonMqttHandler::publishPrices(EntsoeApi* eapi) {
 		sprintf(ts1hr, "%04d-%02d-%02dT%02d:00:00Z", tm.Year+1970, tm.Month, tm.Day, tm.Hour);
 	}
 	char ts3hr[24];
+    memset(ts3hr, 0, 24);
 	if(min3hrIdx > -1) {
         time_t ts = now + (SECS_PER_HOUR * min3hrIdx);
         //Serial.printf("3hr: %d %lu\n", min3hrIdx, ts);
@@ -247,6 +249,7 @@ bool JsonMqttHandler::publishPrices(EntsoeApi* eapi) {
 		sprintf(ts3hr, "%04d-%02d-%02dT%02d:00:00Z", tm.Year+1970, tm.Month, tm.Day, tm.Hour);
 	}
 	char ts6hr[24];
+    memset(ts6hr, 0, 24);
 	if(min6hrIdx > -1) {
         time_t ts = now + (SECS_PER_HOUR * min6hrIdx);
         //Serial.printf("6hr: %d %lu\n", min6hrIdx, ts);
@@ -279,7 +282,7 @@ bool JsonMqttHandler::publishPrices(EntsoeApi* eapi) {
 }
 
 bool JsonMqttHandler::publishSystem(HwTools* hw, EntsoeApi* eapi, EnergyAccounting* ea) {
-	if(init || topic.isEmpty() || !mqtt->connected())
+	if(topic.isEmpty() || !mqtt->connected())
 		return false;
 
     snprintf_P(json, BufferSize, JSONSYS_JSON,
@@ -291,6 +294,5 @@ bool JsonMqttHandler::publishSystem(HwTools* hw, EntsoeApi* eapi, EnergyAccounti
         hw->getTemperature(),
         VERSION
     );
-    init = mqtt->publish(topic, json);
+    return mqtt->publish(topic, json);
-    return init;
 }

lib/SvelteUi/app/src/lib/ConfigurationPanel.svelte

@@ -135,12 +135,13 @@
     <div class="grid xl:grid-cols-4 lg:grid-cols-2 md:grid-cols-2">
         <div class="cnt">
             <strong class="text-sm">General</strong>
+            <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki/General-configuration" target="_blank" class="float-right"><HelpIcon/></a>
             <input type="hidden" name="g" value="true"/>
             <div class="my-1">
                 <div class="flex">
                     <div>
                         Hostname<br/>
-                        <input name="gh" bind:value={configuration.g.h} type="text" class="in-f w-full"/>
+                        <input name="gh" bind:value={configuration.g.h} type="text" class="in-f w-full" pattern="[A-Za-z0-9-]+"/>
                     </div>
                     <div>
                         Time zone<br/>
@@ -230,7 +231,7 @@
         </div>
         <div class="cnt">
             <strong class="text-sm">Meter</strong>
-            <a href="https://github.com/gskjold/AmsToMqttBridge/wiki/Meter-configuration" target="_blank" class="float-right"><HelpIcon/></a>
+            <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki/Meter-configuration" target="_blank" class="float-right"><HelpIcon/></a>
             <input type="hidden" name="m" value="true"/>
             <div class="my-1">
                 <span>Serial configuration</span>
@@ -259,9 +260,8 @@
             <div class="my-1">
                 Voltage<br/>
                 <select name="md" bind:value={configuration.m.d} class="in-s">
-                    <option value={0}></option>
-                    <option value={1}>230V (IT/TT)</option>
                     <option value={2}>400V (TN)</option>
+                    <option value={1}>230V (IT/TT)</option>
                 </select>
             </div>
             <div class="my-1 flex">
@@ -320,7 +320,7 @@
         </div>
         <div class="cnt">
             <strong class="text-sm">WiFi</strong>
-            <a href="https://github.com/gskjold/AmsToMqttBridge/wiki/WiFi-configuration" target="_blank" class="float-right"><HelpIcon/></a>
+            <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki/WiFi-configuration" target="_blank" class="float-right"><HelpIcon/></a>
             <input type="hidden" name="w" value="true"/>
             <div class="my-1">
                 SSID<br/>
@@ -354,7 +354,7 @@
         </div>
         <div class="cnt">
             <strong class="text-sm">Network</strong>
-            <a href="https://github.com/gskjold/AmsToMqttBridge/wiki/Network-configuration" target="_blank" class="float-right"><HelpIcon/></a>
+            <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki/Network-configuration" target="_blank" class="float-right"><HelpIcon/></a>
             <div class="my-1">
                 IP<br/>
                 <div class="flex">
@@ -396,7 +396,7 @@
         </div>
         <div class="cnt">
             <strong class="text-sm">MQTT</strong>
-            <a href="https://github.com/gskjold/AmsToMqttBridge/wiki/MQTT-configuration" target="_blank" class="float-right"><HelpIcon/></a>
+            <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki/MQTT-configuration" target="_blank" class="float-right"><HelpIcon/></a>
             <input type="hidden" name="q" value="true"/>
             <div class="my-1">
                 Server
@@ -471,7 +471,7 @@
         {#if configuration.q.m == 3}
         <div class="cnt">
             <strong class="text-sm">Domoticz</strong>
-            <a href="https://github.com/gskjold/AmsToMqttBridge/wiki/MQTT-configuration#domoticz" target="_blank" class="float-right"><HelpIcon/></a>
+            <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki/MQTT-configuration#domoticz" target="_blank" class="float-right"><HelpIcon/></a>
             <input type="hidden" name="o" value="true"/>
             <div class="my-1 flex">
                 <div class="w-1/2">
@@ -488,7 +488,7 @@
                 <div class="flex">
                     <input name="ou1" bind:value={configuration.o.u1} type="text" class="in-f tr w-1/3"/>
                     <input name="ou2" bind:value={configuration.o.u2} type="text" class="in-m tr w-1/3"/>
-                    <input name="ou2" bind:value={configuration.o.u3} type="text" class="in-l tr w-1/3"/>
+                    <input name="ou3" bind:value={configuration.o.u3} type="text" class="in-l tr w-1/3"/>
                 </div>
             </div>
         </div>
@@ -496,7 +496,7 @@
         {#if configuration.p.r.startsWith("10YNO") || configuration.p.r == '10Y1001A1001A48H'}
         <div class="cnt">
             <strong class="text-sm">Tariff thresholds</strong>
-            <a href="https://github.com/gskjold/AmsToMqttBridge/wiki/Threshold-configuration" target="_blank" class="float-right"><HelpIcon/></a>
+            <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki/Threshold-configuration" target="_blank" class="float-right"><HelpIcon/></a>
             <input type="hidden" name="t" value="true"/>
             <div class="flex flex-wrap my-1">
                 <label class="flex w-40 m-1">
@@ -554,6 +554,7 @@
         {/if}
         <div class="cnt">
             <strong class="text-sm">User interface</strong>
+            <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki/User-interface" target="_blank" class="float-right"><HelpIcon/></a>
             <input type="hidden" name="u" value="true"/>
             <div class="flex flex-wrap">
                 <div class="w-1/2">
@@ -649,7 +650,7 @@
         {#if sysinfo.board > 20 || sysinfo.chip == 'esp8266'}
         <div class="cnt">
             <strong class="text-sm">Hardware</strong>
-            <a href="https://github.com/gskjold/AmsToMqttBridge/wiki/GPIO-configuration" target="_blank" class="float-right"><HelpIcon/></a>
+            <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki/GPIO-configuration" target="_blank" class="float-right"><HelpIcon/></a>
             {#if sysinfo.board > 20}
             <input type="hidden" name="i" value="true"/>
             <div class="flex flex-wrap">

lib/SvelteUi/app/src/lib/ConsentComponent.svelte

@@ -41,7 +41,7 @@
             <hr/>
             <div class="my-3">
                 Enable one-click upgrade? (implies data collection)<br/>
-                <a href="https://github.com/gskjold/AmsToMqttBridge/wiki/Data-collection-on-one-click-firmware-upgrade" target="_blank" class="text-blue-600 hover:text-blue-800">Read more</a><br/>
+                <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki/Data-collection-on-one-click-firmware-upgrade" target="_blank" class="text-blue-600 hover:text-blue-800">Read more</a><br/>
                 <label><input type="radio" name="sf" value={1} checked={sysinfo.fwconsent === 1} class="rounded m-2" required/> Yes</label><label><input type="radio" name="sf" value={2} checked={sysinfo.fwconsent === 2} class="rounded m-2" required/> No</label><br/>
             </div>
             <div class="my-3">

lib/SvelteUi/app/src/lib/DataStores.js

@@ -177,7 +177,7 @@ let releases = [];
 export const gitHubReleaseStore = writable(releases);
 
 export async function getGitHubReleases() {
-    const response = await fetchWithTimeout("https://api.github.com/repos/gskjold/AmsToMqttBridge/releases");
+    const response = await fetchWithTimeout("https://api.github.com/repos/UtilitechAS/amsreader-firmware/releases");
     releases = (await response.json())
     gitHubReleaseStore.set(releases);
 };

lib/SvelteUi/app/src/lib/Header.svelte

@@ -70,7 +70,7 @@
         {/if}
       <div class="flex-auto p-2 flex flex-row-reverse flex-wrap">
           <div class="flex-none">
-            <a class="float-right" href='https://github.com/gskjold/AmsToMqttBridge' target='_blank' rel="noreferrer" aria-label="GitHub"><img class="gh-logo" src={GitHubLogo} alt="GitHub repo"/></a>
+            <a class="float-right" href='https://github.com/UtilitechAS/amsreader-firmware' target='_blank' rel="noreferrer" aria-label="GitHub"><img class="gh-logo" src={GitHubLogo} alt="GitHub repo"/></a>
           </div>
           <div class="flex-none my-auto px-2">
             <Clock timestamp={ data.c ? new Date(data.c * 1000) : new Date(0) } />
@@ -84,7 +84,7 @@
           </div>
           {/if}
           <div class="flex-none px-1 mt-1" title="Documentation">
-            <a href="https://github.com/gskjold/AmsToMqttBridge/wiki" target='_blank' rel="noreferrer"><HelpIcon/></a>
+            <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki" target='_blank' rel="noreferrer"><HelpIcon/></a>
           </div>
           {#if sysinfo.fwconsent === 1 && nextVersion}
           <div class="flex-none mr-3 text-yellow-500" title="New version: {nextVersion.tag_name}">

lib/SvelteUi/app/src/lib/Helpers.js

@@ -1,15 +1,10 @@
 export let monthnames = ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
 
-export function voltcol(pct) {
+export function voltcol(volt) {
-    if(pct > 85) return '#d90000';
+    if(volt > 218 && volt < 242) return '#32d900';
-    else if(pct > 75) return'#e32100';
+    if(volt > 212 && volt < 248) return '#b1d900';
-    else if(pct > 70) return '#ffb800';
+    if(volt > 208 && volt < 252) return '#ffb800';
-    else if(pct > 65) return '#dcd800';
+    return '#d90000';
-    else if(pct > 35) return '#32d900';
-    else if(pct > 25) return '#dcd800';
-    else if(pct > 20) return '#ffb800';
-    else if(pct > 15) return'#e32100';
-    else return '#d90000';
 };
 
 export function ampcol(pct) {

lib/SvelteUi/app/src/lib/SetupPanel.svelte

@@ -70,7 +70,7 @@
 
 <div class="grid xl:grid-cols-4 lg:grid-cols-3 md:grid-cols-2">
     <div class="cnt">
-        <form on:submit|preventDefault={handleSubmit} autocomplete="off">
+        <form on:submit|preventDefault={handleSubmit}>
             <input type="hidden" name="s" value="true"/>
             <strong class="text-sm">Setup</strong>
             <div class="my-3">
@@ -79,11 +79,11 @@
             </div>
             <div class="my-3">
                 PSK<br/>
-                <input name="sp" type="password" class="in-s"/>
+                <input name="sp" type="password" class="in-s" autocomplete="off"/>
             </div>
             <div>
                 Hostname:
-                <input name="sh" bind:value={sysinfo.hostname} type="text" class="in-s" maxlength="32" pattern="[a-z0-9_-]+" placeholder="Optional, ex.: ams-reader"/>
+                <input name="sh" bind:value={sysinfo.hostname} type="text" class="in-s" maxlength="32" pattern="[a-z0-9_-]+" placeholder="Optional, ex.: ams-reader" autocomplete="off"/>
             </div>
             <div class="my-3">
                 <label><input type="checkbox" name="sm" value="static" class="rounded mb-1" bind:checked={staticIp} /> Static IP</label>

lib/SvelteUi/app/src/lib/VoltPlot.svelte

@@ -19,7 +19,7 @@
             points.push({
                 label: u1 ? u1.toFixed(0) + 'V' : '-', 
                 value: u1 ? u1 : 0, 
-                color: voltcol(u1 ? (u1-min)/(max-min)*100 : 0) 
+                color: voltcol(u1 ? u1 : 0) 
             });
         }
         if(u2 > 0) {
@@ -27,7 +27,7 @@
             points.push({ 
                 label: u2 ? u2.toFixed(0) + 'V' : '-', 
                 value: u2 ? u2 : 0, 
-                color: voltcol(u2 ? (u2-min)/(max-min)*100 : 0) 
+                color: voltcol(u2 ? u2 : 0) 
             });
         }
         if(u3 > 0) {
@@ -35,7 +35,7 @@
             points.push({ 
                 label: u3 ? u3.toFixed(0) + 'V' : '-', 
                 value: u3 ? u3 : 0, 
-                color: voltcol(u3 ? (u3-min)/(max-min)*100 : 0) 
+                color: voltcol(u3 ? u3 : 0) 
             });
         }
         config = {

lib/SvelteUi/app/vite.config.js

@@ -17,18 +17,18 @@ export default defineConfig({
   plugins: [svelte()],
   server: {
     proxy: {
-      "/data.json": "http://192.168.233.229",
+      "/data.json": "http://192.168.233.244",
-      "/energyprice.json": "http://192.168.233.229",
+      "/energyprice.json": "http://192.168.233.244",
-      "/dayplot.json": "http://192.168.233.229",
+      "/dayplot.json": "http://192.168.233.244",
-      "/monthplot.json": "http://192.168.233.229",
+      "/monthplot.json": "http://192.168.233.244",
-      "/temperature.json": "http://192.168.233.229",
+      "/temperature.json": "http://192.168.233.244",
-      "/sysinfo.json": "http://192.168.233.229",
+      "/sysinfo.json": "http://192.168.233.244",
-      "/configuration.json": "http://192.168.233.229",
+      "/configuration.json": "http://192.168.233.244",
-      "/tariff.json": "http://192.168.233.229",
+      "/tariff.json": "http://192.168.233.244",
-      "/save": "http://192.168.233.229",
+      "/save": "http://192.168.233.244",
-      "/reboot": "http://192.168.233.229",
+      "/reboot": "http://192.168.233.244",
-      "/configfile": "http://192.168.233.229",
+      "/configfile": "http://192.168.233.244",
-      "/upgrade": "http://192.168.233.229"
+      "/upgrade": "http://192.168.233.244"
     }
   }
 })

lib/SvelteUi/json/firmware.html

@@ -1,11 +1,29 @@
 <html>
-    <form action="/firmware" enctype="multipart/form-data" method="post" autocomplete="off">
+    <body>
-        File: <input name="file" type="file" accept=".bin">
+        <fieldset>
-        <button type="submit" class="">Upload</button>
+            <legend>Firmware install</legend>
-    </form>
+            <form action="/firmware" enctype="multipart/form-data" method="post" autocomplete="off">
-    or<br/><br/>
+                File: <input name="file" type="file" accept=".bin">
-    <form action="/firmware" method="post" autocomplete="off">
+                <button type="submit">Upload</button>
-        URL: <input name="url" type="text"/>
+            </form>
-        <button type="submit" class="">Install</button>
+            or<br/><br/>
-    </form>
+            <form action="/firmware" method="post" autocomplete="off">
+                URL: <input name="url" type="text"/>
+                <button type="submit">Install</button>
+            </form>
+        </fieldset>
+        <fieldset>
+            <legend>Configuration upload</legend>
+            <form action="/configfile" enctype="multipart/form-data" method="post">
+                File: <input name="file" type="file" accept=".cfg">
+                <button type="submit">Upload</button>
+            </form>
+        </fieldset>
+        <fieldset>
+            <legend>Factory reset</legend>
+            <form action="/reset" method="post">
+                <button type="submit" name="perform" value="true">Perform factory reset</button>
+            </form>
+        </fieldset>
+    </body>
 </html>

lib/SvelteUi/src/AmsWebServer.cpp

@@ -240,7 +240,7 @@ void AmsWebServer::sysinfoJson() {
 	UiConfig ui;
 	config->getUiConfig(ui);
 
-	snprintf_P(buf, BufferSize, SYSINFO_JSON,
+	int size = snprintf_P(buf, BufferSize, SYSINFO_JSON,
 		VERSION,
 		#if defined(CONFIG_IDF_TARGET_ESP32S2)
 		"esp32s2",
@@ -288,6 +288,8 @@ void AmsWebServer::sysinfoJson() {
 		webConfig.security
 	);
 
+	stripNonAscii((uint8_t*) buf, size+1);
+
 	server.sendHeader(HEADER_CACHE_CONTROL, CACHE_CONTROL_NO_CACHE);
 	server.sendHeader(HEADER_PRAGMA, PRAGMA_NO_CACHE);
 	server.sendHeader(HEADER_EXPIRES, EXPIRES_OFF);
@@ -981,7 +983,7 @@ void AmsWebServer::handleSave() {
 			switch(boardType) {
 				case 2: // spenceme
 					config->clearGpio(*gpioConfig);
-					gpioConfig->vccBootLimit = 33;
+					gpioConfig->vccBootLimit = 32;
 					gpioConfig->hanPin = 3;
 					gpioConfig->apPin = 0;
 					gpioConfig->ledPin = 2;
@@ -1435,7 +1437,7 @@ void AmsWebServer::upgrade() {
 			customFirmwareUrl = server.arg(F("url"));
 		}
 
-		String url = customFirmwareUrl.isEmpty() || !customFirmwareUrl.startsWith(F("http")) ? F("http://ams2mqtt.rewiredinvent.no/hub/firmware/update") : customFirmwareUrl;
+		String url = customFirmwareUrl.isEmpty() || !customFirmwareUrl.startsWith(F("http")) ? F("http://hub.amsleser.no/hub/firmware/update") : customFirmwareUrl;
 
 		if(server.hasArg(F("version"))) {
 			url += "/" + server.arg(F("version"));

platformio-user.ini-example

@@ -2,19 +2,16 @@
 default_envs = dev
 
 [env:dev]
-platform = espressif8266
+platform = espressif8266@3.2.0
+framework = arduino
 board = esp12e
 board_build.ldscript = eagle.flash.4m2m.ld
-framework = arduino
+build_flags = ${common.build_flags} -D DEBUG_MODE=1
-lib_deps = ${common.lib_deps}
+lib_ldf_mode = off
-lib_ignore = ${common.lib_ignore}
 lib_compat_mode = off
-build_flags =
+lib_deps = ESP8266WiFi, ESP8266mDNS, ESP8266WebServer, ESP8266HTTPClient, ESP8266httpUpdate, ${common.lib_deps}
-    -D WEBSOCKET_DISABLED=1
+lib_ignore = ${common.lib_ignore}
-    -D DEBUG_MODE=1
+extra_scripts = ${common.extra_scripts}
-extra_scripts =
-    pre:scripts/addversion.py
-    scripts/makeweb.py
 monitor_speed = 115200 ; If serial port is shared with HAN, use baud and parity configured for meter
 monitor_flags = 
     --parity

scripts/esp32c3/flash.sh

@@ -0,0 +1,40 @@
+#!/bin/sh
+
+if [ -z "$1" ];then
+    echo "Usage: "
+    echo "  Flashing first time            :   $0 flash /dev/ttyUSB0"
+    echo "  When upgrading to new version  :   $0 upgrade /dev/ttyUSB0"
+    echo "    NOTE: Replace /dev/ttyUSB0 with correct port"
+    exit 1
+fi
+
+if [ -z "$2" ];then
+    echo "Please specify port"
+    exit 1
+fi
+
+esptool=`which esptool`
+if [ -z "$esptool" ];then
+    esptool=`which esptool.py`
+fi
+if [ -z "$esptool" ];then
+    if [ -f esptool.py ];then
+        esptool="esptool.py"
+    fi
+fi
+if [ -z "$esptool" ];then
+    echo "esptool.py not available to run following command: "
+    esptool="echo esptool.py"
+fi
+
+if [ "$1" = "flash" ];then
+    $esptool --chip esp32c3 --port $2 --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect \
+    0x1000 bootloader_qio_40m.bin \
+    0x8000 partitions.bin \
+    0xe000 boot_app0.bin \
+    0x10000 firmware.bin
+    exit $?
+elif [ "$1" = "upgrade" ];then
+    $esptool --chip esp32c3 --port $2 --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x10000 firmware.bin
+    exit $?
+fi

scripts/esp32c3/mkzip.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+env="esp32c3"
+build_dir=".pio/build/$env/"
+
+if [ ! -d $build_dir ];then
+    echo "No build directory"
+    exit 1
+fi
+
+cp ~/.platformio/packages/framework-arduinoespressif32/tools/sdk/$env/bin/bootloader_qio_40m.bin $build_dir
+cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin $build_dir
+chmod +x scripts/$env/flash.sh
+zip -j $env.zip $build_dir/*.bin scripts/$env/flash.sh

src/AmsToMqttBridge.ino

@@ -123,44 +123,7 @@ void setup() {
 	Serial.begin(115200);
 
 	if(!config.getGpioConfig(gpioConfig)) {
-		#if HW_ROARFRED
+		config.clearGpio(gpioConfig);
-			gpioConfig.hanPin = 3;
-			gpioConfig.apPin = 0;
-			gpioConfig.ledPin = 2;
-			gpioConfig.ledInverted = true;
-			gpioConfig.tempSensorPin = 5;
-		#elif defined(ARDUINO_ESP8266_WEMOS_D1MINI)
-			gpioConfig.hanPin = 5;
-			gpioConfig.apPin = 4;
-			gpioConfig.ledPin = 2;
-			gpioConfig.ledInverted = true;
-			gpioConfig.tempSensorPin = 14;
-			gpioConfig.vccMultiplier = 1100;
-		#elif defined(ARDUINO_LOLIN_D32)
-			gpioConfig.hanPin = 16;
-			gpioConfig.ledPin = 5;
-			gpioConfig.ledInverted = true;
-			gpioConfig.tempSensorPin = 14;
-		#elif defined(ARDUINO_FEATHER_ESP32)
-			gpioConfig.hanPin = 16;
-			gpioConfig.ledPin = 2;
-			gpioConfig.tempSensorPin = 14;
-		#elif defined(ARDUINO_ESP32_DEV)
-			gpioConfig.hanPin = 16;
-			gpioConfig.ledPin = 2;
-			gpioConfig.ledInverted = true;
-		#elif defined(ESP8266)
-			gpioConfig.hanPin = 3;
-			gpioConfig.ledPin = 2;
-			gpioConfig.ledInverted = true;
-		#elif defined(CONFIG_IDF_TARGET_ESP32S2)
-			gpioConfig.hanPin = 18;
-		#elif defined(ESP32)
-			gpioConfig.hanPin = 16;
-			gpioConfig.ledPin = 2;
-			gpioConfig.ledInverted = true;
-			gpioConfig.tempSensorPin = 14;
-		#endif
 	}
 
 	delay(1);
@@ -253,7 +216,7 @@ void setup() {
 		debugI("Voltage: %.2fV", vcc);
 	}
 
-	float vccBootLimit = gpioConfig.vccBootLimit == 0 ? 0 : gpioConfig.vccBootLimit / 10.0;
+	float vccBootLimit = gpioConfig.vccBootLimit == 0 ? 0 : min(3.29, gpioConfig.vccBootLimit / 10.0); // Make sure it is never above 3.3v
 	if(vccBootLimit > 2.5 && vccBootLimit < 3.3 && (gpioConfig.apPin == 0xFF || digitalRead(gpioConfig.apPin) == HIGH)) { // Skip if user is holding AP button while booting (HIGH = button is released)
 		if (vcc < vccBootLimit) {
 			if(Debug.isActive(RemoteDebug::INFO)) {
@@ -622,7 +585,7 @@ void loop() {
 				}
 				debugD("Used %ld ms to update temperature", millis()-start);
 			}
-			if(now - lastSysupdate > 10000) {
+			if(now - lastSysupdate > 60000) {
 				if(mqtt != NULL && mqttHandler != NULL && WiFi.getMode() != WIFI_AP && WiFi.status() == WL_CONNECTED && mqtt->connected() && !topic.isEmpty()) {
 					mqttHandler->publishSystem(&hw, eapi, &ea);
 				}
@@ -1484,7 +1447,7 @@ void MQTT_connect() {
 		if (strlen(mqttConfig.subscribeTopic) > 0) {
             mqtt->onMessage(mqttMessageReceived);
 			mqtt->subscribe(String(mqttConfig.subscribeTopic) + "/#");
-			debugI("  Subscribing to [%s]\r\n", mqttConfig.subscribeTopic);
+			debugI("  Subscribing to [%s]\n", mqttConfig.subscribeTopic);
 		}
 	} else {
 		if (Debug.isActive(RemoteDebug::ERROR)) {