Release v1.0

budulinek · Apr 24, 2023 · cfae383 · cfae383
1 parent a63593b
commit cfae383
Show file tree

Hide file tree

Showing 8 changed files with 551 additions and 399 deletions.
diff --git a/Payload-data-read.md b/Payload-data-read.md
diff --git a/README.md b/README.md
diff --git a/arduino-altherma-controller/advanced_settings.h b/arduino-altherma-controller/advanced_settings.h
@@ -46,7 +46,7 @@ const unsigned int WEB_IDLE_TIMEOUT = 400;       // Time (ms) from last client d
 const unsigned int TCP_DISCON_TIMEOUT = 500;     // Timeout (ms) for client DISCON socket command, non-blocking alternative to https://www.arduino.cc/reference/en/libraries/ethernet/client.setconnectiontimeout/
 //const unsigned int TCP_RETRANSMISSION_TIMEOUT = 50;  // Ethernet controller’s timeout (ms), blocking (see https://www.arduino.cc/reference/en/libraries/ethernet/ethernet.setretransmissiontimeout/)
 //const byte TCP_RETRANSMISSION_COUNT = 3;             // Number of transmission attempts the Ethernet controller will make before giving up (see https://www.arduino.cc/reference/en/libraries/ethernet/ethernet.setretransmissioncount/)
-const unsigned int TCP_RETRANSMISSION_TIMEOUT = 10;  // Ethernet controller’s timeout (ms), blocking (see https://www.arduino.cc/reference/en/libraries/ethernet/ethernet.setretransmissiontimeout/)
+const unsigned int TCP_RETRANSMISSION_TIMEOUT = 50;  // Ethernet controller’s timeout (ms), blocking (see https://www.arduino.cc/reference/en/libraries/ethernet/ethernet.setretransmissiontimeout/)
 const byte TCP_RETRANSMISSION_COUNT = 3;             // Number of transmission attempts the Ethernet controller will make before giving up (see https://www.arduino.cc/reference/en/libraries/ethernet/ethernet.setretransmissioncount/)
 const int FETCH_INTERVAL = 2000;                     // Fetch API interval (ms) for the Modbus Status webpage to renew data from JSON served by Arduino
 

diff --git a/arduino-altherma-controller/arduino-altherma-controller.ino b/arduino-altherma-controller/arduino-altherma-controller.ino
@@ -1,21 +1,11 @@
-/* Altherma UDP Controller: Monitors and controls Daikin E-Series (Altherma) through P1/P2 bus.
+/* Altherma UDP Controller: Monitors and controls Daikin E-Series (Altherma) het pumps through P1/P2 bus.
 
   Version history
   v0.1 2020-11-30 Initial commit, save history of selected packets, settings
   v0.2 2020-12-05 Hysteresis, vertify commands sent to P1P2
   v0.3 2020-12-09 More effective and reliable writing to P1P2 bus
   v0.4 2020-12-10 Minor tweaks
-  v1.0 2023-XX-XX Major upgrade: web interface, store settings in EEPROM, P1P2 error counters
-
-changes:
-- only Daikin E* heat pumps (Altherma)
-- no SW_SCOPE
-- no error budget 
-- no write budget (Write Cycles can are displayed via web UI)
-- use single queue for all write packets (0x3X, counter requests, daikin restart, etc.)
-- write all packets after 0x30 (disable #define KLICDA writing after 0x12 packet)
-- write any packets (incl. counter requests, restarts, etc.) only if connected as controller
-- if the main controller sends request to our auxiliary controller, always respond
+  v1.0 2023-04-18 Major upgrade: web interface, store settings in EEPROM, P1P2 error counters
 
  */
 
@@ -42,10 +32,6 @@ enum first_last : byte {
   LAST
 };
 
-
-
-/****** DEFAULT FACTORY SETTINGS ******/
-
 enum status : byte {
   PACKET_SEEN,  // Packet Type was detected on P1P2 bus
   PACKET_SENT,  // Packet is sent via UDP

diff --git a/arduino-altherma-controller/src/P1P2Serial_mod/P1P2Serial_mod.cpp b/arduino-altherma-controller/src/P1P2Serial_mod/P1P2Serial_mod.cpp
@@ -75,7 +75,7 @@
 
 #ifdef __AVR_ATmega2560__
 
-#error ATmega2560 code has not been tested, use with caution.
+#warning ATmega2560 code has not been tested, use with caution.
 
 // RW using timer5
 #define INPUT_CAPTURE_PIN               48 // PL1

diff --git a/pics/loxone10.png b/pics/loxone10.png
diff --git a/pics/loxone8.png b/pics/loxone8.png
diff --git a/pics/loxone9.png b/pics/loxone9.png