From efbd3c687de59bcd31c0f628e69c0662dbef9b09 Mon Sep 17 00:00:00 2001
From: lejubila <david.bigagli@gmail.com>
Date: Wed, 30 Aug 2017 23:13:34 +0200
Subject: [PATCH] driver spb16ch: modificato mappatura rele e script python da
 lanciare per l'apertura/chiusura dei rele

---
 drv/spb16ch/config.include.sh | 32 ++++++++++++++++----------------
 drv/spb16ch/rele.include.sh   |  8 ++++----
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/drv/spb16ch/config.include.sh b/drv/spb16ch/config.include.sh
index 022427e..3eaad28 100644
--- a/drv/spb16ch/config.include.sh
+++ b/drv/spb16ch/config.include.sh
@@ -2,19 +2,19 @@
 # Mapping rele spb16ch: l'indice indica il relè, ogni elemento deve essere lungo quattro caratteri, 
 # i primi due indicano il mux channel, mentre gli ultimi due caratteri indicano il numero del rele sul canale
 #
-SPB16CH_RELE_MAP[1]=" 0 1"
-SPB16CH_RELE_MAP[2]=" 0 2"
-SPB16CH_RELE_MAP[3]=" 0 3"
-SPB16CH_RELE_MAP[4]=" 0 4"
-SPB16CH_RELE_MAP[5]=" 0 5"
-SPB16CH_RELE_MAP[6]=" 0 6"
-SPB16CH_RELE_MAP[7]=" 0 7"
-SPB16CH_RELE_MAP[8]=" 0 8"
-SPB16CH_RELE_MAP[9]=" 1 1"
-SPB16CH_RELE_MAP[10]=" 1 2"
-SPB16CH_RELE_MAP[11]=" 1 3"
-SPB16CH_RELE_MAP[12]=" 1 4"
-SPB16CH_RELE_MAP[13]=" 1 5"
-SPB16CH_RELE_MAP[14]=" 1 6"
-SPB16CH_RELE_MAP[15]=" 1 7"
-SPB16CH_RELE_MAP[16]=" 1 8"
+SPB16CH_RELE_MAP[1]=" 0  1"
+SPB16CH_RELE_MAP[2]=" 0  2"
+SPB16CH_RELE_MAP[3]=" 0  4"
+SPB16CH_RELE_MAP[4]=" 0  8"
+SPB16CH_RELE_MAP[5]=" 0 16"
+SPB16CH_RELE_MAP[6]=" 0 32"
+SPB16CH_RELE_MAP[7]=" 0 64"
+SPB16CH_RELE_MAP[8]=" 0128"
+SPB16CH_RELE_MAP[9]=" 1  1"
+SPB16CH_RELE_MAP[10]=" 1  2"
+SPB16CH_RELE_MAP[11]=" 1  4"
+SPB16CH_RELE_MAP[12]=" 1  8"
+SPB16CH_RELE_MAP[13]=" 1 16"
+SPB16CH_RELE_MAP[14]=" 1 32"
+SPB16CH_RELE_MAP[15]=" 1 64"
+SPB16CH_RELE_MAP[16]=" 1128"
diff --git a/drv/spb16ch/rele.include.sh b/drv/spb16ch/rele.include.sh
index b6bfa90..cdcefd9 100644
--- a/drv/spb16ch/rele.include.sh
+++ b/drv/spb16ch/rele.include.sh
@@ -23,12 +23,12 @@ function drv_spb16ch_rele_open {
 		message_write "warning" "$message"
 	fi
 	local channel_num=${rele_data:0:2}
-	local rele_num=${rele_data:2:2}
+	local rele_num=${rele_data:2:3}
 
 	echo channel_num=$channel_num
 	echo rele_num=$rele_num
 	$DIR_SCRIPT/drv/spb16ch/scripts/mux_channel.py 72 $channel_num
-	$DIR_SCRIPT/drv/spb16ch/scripts/gpo_active.py 72 $rele_num 0
+	$DIR_SCRIPT/drv/spb16ch/scripts/gpo_init.py 72 $rele_num 0
 
 }
 
@@ -47,12 +47,12 @@ function drv_spb16ch_rele_close {
 		message_write "warning" "$message"
 	fi
 	local channel_num=${rele_data:0:2}
-	local rele_num=${rele_data:2:2}
+	local rele_num=${rele_data:2:3}
 
 	echo channel_num=$channel_num
 	echo rele_num=$rele_num
 	$DIR_SCRIPT/drv/spb16ch/scripts/mux_channel.py 72 $channel_num
-	$DIR_SCRIPT/drv/spb16ch/scripts/gpo_active.py 72 $rele_num 1
+	$DIR_SCRIPT/drv/spb16ch/scripts/gpo_init.py 72 $rele_num 1
 
 }