Reverting more local changes

jagheterfredrik · Dec 18, 2023 · 4001681 · 4001681
1 parent 37553dc
commit 4001681
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 104 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/rego1000.yaml b/rego1000.yaml
@@ -27,14 +27,13 @@ external_components:
   - source: components
 
 web_server:
-  port: 80
 
 canbus:
   - platform: esp32_can
     id: can0
     can_id: 0
-    tx_pin: GPIO5
-    rx_pin: GPIO35
+    tx_pin: GPIO23
+    rx_pin: GPIO22
     bit_rate: 125kbps
 
 climate:

diff --git a/rego1000dump.yaml b/rego1000dump.yaml
@@ -4,20 +4,20 @@ esphome:
     - regovardump.h
 
 esp32:
-  board: esp32-evb
+  board: nodemcu-32s
   framework:
     type: arduino
 
-ethernet:
-  type: LAN8720
-  mdc_pin: GPIO23
-  mdio_pin: GPIO18
-  clk_mode: GPIO17_OUT
-  phy_addr: 0
-  manual_ip:
-    static_ip: 192.168.0.21
-    gateway: 192.168.0.1
-    subnet: 255.255.255.0
+wifi:
+  ssid: !secret wifi_ssid
+  password: !secret wifi_password
+
+  # Enable fallback hotspot (captive portal) in case wifi connection fails
+  ap:
+    ssid: "esp-rego1000"
+    password: !secret fallback_password
+
+captive_portal:
 
 # Enable logging
 logger:
@@ -26,8 +26,7 @@ logger:
 
 # Enable Home Assistant API
 api:
-  encryption:
-    key: !secret ha_api_encryption_key
+  password: !secret hass_api_password
 
 ota:
   password: !secret ota_password

diff --git a/regovardump.h b/regovardump.h
@@ -48,7 +48,7 @@ class RegoReader : public Component {
 
     static RegoReader *getInstance() {
       if (!instance) {
-        instance = new RegoReader(GPIO_NUM_5, GPIO_NUM_35);
+        instance = new RegoReader(GPIO_NUM_23, GPIO_NUM_22);
       }
       return instance;
     }