Add support for services with different ECC in FIG0/9

2 files changed, 20 insertions, 12 deletions

diff --git a/doc/advanced.mux b/doc/advanced.mux
index 375bef0..f6e59fe 100644
--- a/doc/advanced.mux
+++ b/doc/advanced.mux
@@ -55,8 +55,9 @@ remotecontrol {
 
 ; Some ensemble parameters
 ensemble {
+    ; Example for Switzerland, with country id=4 and ECC=E1
     id 0x4fff ; you can also use decimal if you want
-    ecc 0xec ; Extended Country Code
+    ecc 0xe1 ; Extended Country Code
 
     local-time-offset auto  ; autmatically calculate from system local time
                             ; or
@@ -91,7 +92,7 @@ services {
     ; Each service has it's own unique identifier, that is
     ; used throughout the configuration file and for the RC.
     srv-fu {
-        id 0x8daa
+        id 0x4daa
         label "Funk"
         shortlabel "Fu"
 
@@ -127,16 +128,18 @@ services {
             clusters "1,2"
         }
     }
-    srv-lu {
-        id 0x8dab
-        label "Luschtig"
-        ; pty, language, shortlabel and id can be omitted, and will take default values
-    }
     srv-ri {
-        id 0x8dac
+        ; If your ensemble contains a service from another country,
+        ; specify its ECC here. Example is for Italy, country id=5, ECC=E0
+        id 0x5dab
+        ecc 0xe0
         label "rick"
     }
-
+    srv-lu {
+        id 0x4dac
+        label "Lu"
+        ; pty, language, shortlabel and id can be omitted, and will take default values
+    }
 }
 
 ; The subchannels are defined in the corresponding section.
diff --git a/doc/example.mux b/doc/example.mux
index 632772d..7bd9e3e 100644
--- a/doc/example.mux
+++ b/doc/example.mux
@@ -70,8 +70,10 @@ ensemble {
     ; A unique 16-bit id is allocated to the ensemble and allows unambiguous
     ; identification of the ensemble when associated with the ensemble ECC.
     ; The id normally starts with the coutry id. (See ETSI TS 101 756)
+
+    ; Example for Switzerland, with country id=4 and ECC=E1
     id 0x4fff ; you can also use decimal if you want
-    ecc 0xec ; Extended Country Code
+    ecc 0xe1 ; Extended Country Code
 
     local-time-offset auto  ; autmatically calculate from system local time
                             ; or
@@ -99,12 +101,15 @@ services {
     ; Each service has it's own unique identifier, that is
     ; used throughout the configuration file and for the RC.
     srv-fu {
-        id 0x8daa
+        id 0x4daa
         label "Fünk"
         ; You can define a shortlabel too.
     }
     srv-ri {
-        id 0x8dab
+        ; If your ensemble contains a service from another country,
+        ; specify its ECC here. Example is for Italy, country id=5, ECC=E0
+        id 0x5dab
+        ecc 0xe0
         label "Rick"
     }
 }