updated upnp/basic_dev.cgi accordingly.

jens-maus · Jun 25, 2018 · d75c599 · d75c599
1 parent 92713ca
commit d75c599
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 72 deletions.
diff --git a/buildroot-external/package/recovery-system/external/overlay/www/upnp/basic_dev.cgi b/buildroot-external/package/recovery-system/external/overlay/www/upnp/basic_dev.cgi
diff --git a/buildroot-external/patches/occu/0020-WebUI-Fix-BasicDevCGI.patch b/buildroot-external/patches/occu/0020-WebUI-Fix-BasicDevCGI.patch
@@ -1,37 +1,35 @@
 --- occu/WebUI/www/upnp/basic_dev.cgi.orig
 +++ occu/WebUI/www/upnp/basic_dev.cgi
-@@ -14,7 +14,7 @@
+@@ -14,7 +14,14 @@
  }
 
  proc get_serial_number {} {
 -    return [exec cat /sys/module/plat_eq3ccu2/parameters/board_serial]
-+    return [exec cat /var/board_serial]
++    set serial [exec cat /var/board_sgtin]
++    if { "$serial" == "" } {
++      set serial [exec cat /var/board_serial]
++    }
++    if { "$serial" == "" } {
++      set serial [exec cat /sys/module/plat_eq3ccu2/parameters/board_serial]
++    }
++    return $serial
  }
 
  proc get_hostname {} {
-@@ -22,19 +22,19 @@
+@@ -22,10 +29,14 @@
  }
 
  set hostname "[get_hostname]"
 -if { "$hostname" == "homematic-ccu2" } {
--    set RESOURCE(TITLE) "HomeMatic Central CCU2"
-+if { "$hostname" == "homematic-raspi" } {
-+    set RESOURCE(TITLE) "RaspberryMatic CCU"
++if { "$hostname" == "homematic-ccu3" } {
++    set RESOURCE(TITLE) "HomeMatic Central CCU3"
++} elseif { "$hostname" == "homematic-raspi" } {
++    set RESOURCE(TITLE) "HomeMatic Central RaspberryMatic"
++} elseif { "$hostname" == "homematic-ccu2" } {
+     set RESOURCE(TITLE) "HomeMatic Central CCU2"
  } else {
-     set RESOURCE(TITLE) "$hostname"
+-    set RESOURCE(TITLE) "$hostname"
++    set RESOURCE(TITLE) "HomeMatic Central - $hostname"
  }
 
  set RESOURCE(MANUFACTURER) "EQ3"
- set RESOURCE(MANUFACTURER_URL) "http://www.homematic.com"
--set RESOURCE(PRESENTATION_URL) ""
-+set RESOURCE(PRESENTATION_URL) "http://$hostname/"
- set RESOURCE(DESCRIPTION) "HomeMatic Central [get_serial_number]"
--set RESOURCE(MODEL_NAME) "HomeMatic Central"
--set RESOURCE(MODEL_NUMBER) "HomeMatic Central"
--set RESOURCE(MODEL_URL) $RESOURCE(MANUFACTURER_URL)
-+set RESOURCE(MODEL_NAME) "RaspberryMatic"
-+set RESOURCE(MODEL_NUMBER) "RaspberryMatic"
-+set RESOURCE(MODEL_URL) "https://github.com/jens-maus/RaspberryMatic"
- set RESOURCE(SERIAL_NUMBER) "[get_serial_number]"
- set RESOURCE(UUID) "upnp-BasicDevice-1_0-$RESOURCE(SERIAL_NUMBER)"
- set RESOURCE(UPC) "123456789002"
diff --git a/buildroot-external/patches/occu/0020-WebUI-Fix-BasicDevCGI/occu/WebUI/www/upnp/basic_dev.cgi b/buildroot-external/patches/occu/0020-WebUI-Fix-BasicDevCGI/occu/WebUI/www/upnp/basic_dev.cgi
@@ -14,27 +14,38 @@ proc get_ip_address {} {
 }
 
 proc get_serial_number {} {
-    return [exec cat /var/board_serial]
+    set serial [exec cat /var/board_sgtin]
+    if { "$serial" == "" } {
+      set serial [exec cat /var/board_serial]
+    }
+    if { "$serial" == "" } {
+      set serial [exec cat /sys/module/plat_eq3ccu2/parameters/board_serial]
+    }
+    return $serial
 }
 
 proc get_hostname {} {
     return [exec hostname]
 }
 
 set hostname "[get_hostname]"
-if { "$hostname" == "homematic-raspi" } {
-    set RESOURCE(TITLE) "RaspberryMatic CCU"
+if { "$hostname" == "homematic-ccu3" } {
+    set RESOURCE(TITLE) "HomeMatic Central CCU3"
+} elseif { "$hostname" == "homematic-raspi" } {
+    set RESOURCE(TITLE) "HomeMatic Central RaspberryMatic"
+} elseif { "$hostname" == "homematic-ccu2" } {
+    set RESOURCE(TITLE) "HomeMatic Central CCU2"
 } else {
-    set RESOURCE(TITLE) "$hostname"
+    set RESOURCE(TITLE) "HomeMatic Central - $hostname"
 }
 
 set RESOURCE(MANUFACTURER) "EQ3"
 set RESOURCE(MANUFACTURER_URL) "http://www.homematic.com"
-set RESOURCE(PRESENTATION_URL) "http://$hostname/"
+set RESOURCE(PRESENTATION_URL) ""
 set RESOURCE(DESCRIPTION) "HomeMatic Central [get_serial_number]"
-set RESOURCE(MODEL_NAME) "RaspberryMatic"
-set RESOURCE(MODEL_NUMBER) "RaspberryMatic"
-set RESOURCE(MODEL_URL) "https://github.com/jens-maus/RaspberryMatic"
+set RESOURCE(MODEL_NAME) "HomeMatic Central"
+set RESOURCE(MODEL_NUMBER) "HomeMatic Central"
+set RESOURCE(MODEL_URL) $RESOURCE(MANUFACTURER_URL)
 set RESOURCE(SERIAL_NUMBER) "[get_serial_number]"
 set RESOURCE(UUID) "upnp-BasicDevice-1_0-$RESOURCE(SERIAL_NUMBER)"
 set RESOURCE(UPC) "123456789002"