From fb5fccc38bf11e7abd71a55b49b2f2f0c9a8ecc9 Mon Sep 17 00:00:00 2001 From: Vinicius de Jesus Date: Thu, 24 Dec 2015 08:34:45 -0200 Subject: Add Algo parameter related with Speaker mode Signed-off-by: Ted Trask --- config/templates/algo8180-template.lua | 1 + provisioning-scripts.lua | 7 +++++++ upgradeprovisioning | 16 ++++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/config/templates/algo8180-template.lua b/config/templates/algo8180-template.lua index 1c6a02f..7811373 100644 --- a/config/templates/algo8180-template.lua +++ b/config/templates/algo8180-template.lua @@ -40,6 +40,7 @@ set_elem("net.time", values.device.sntpserver) set_elem("sip.proxy", values.device.registrar) set_elem("audio.ring.vol", values.device.algoringvol) set_elem("audio.page.vol", values.device.algopagevol) +set_elem("audio.spk.mode", values.device.algospkmode) for pg, pg_t in pairs(values) do -- Is it of the form regX ? local num = string.match(pg, 'reg(%d+)') diff --git a/provisioning-scripts.lua b/provisioning-scripts.lua index bb8fd14..ba0be9c 100644 --- a/provisioning-scripts.lua +++ b/provisioning-scripts.lua @@ -478,6 +478,7 @@ mymodule.param_groups_to_params = { "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Algo 8180 Device'), (SELECT param_id FROM provisioning_params WHERE name='adminpassword'), null, false)", "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Algo 8180 Device'), (SELECT param_id FROM provisioning_params WHERE name='algoringvol'), null, true)", "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Algo 8180 Device'), (SELECT param_id FROM provisioning_params WHERE name='algopagevol'), null, true)", + "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Algo 8180 Device'), (SELECT param_id FROM provisioning_params WHERE name='algospkmode'), null, true)"; "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='CyberData Device'), (SELECT param_id FROM provisioning_params WHERE name='template'), '/etc/provisioning/templates/cyberdata-template.lua', 'f')", "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='CyberData Device'), (SELECT param_id FROM provisioning_params WHERE name='mac'), null, true)", "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='CyberData Device'), (SELECT param_id FROM provisioning_params WHERE name='registrar'), null, true)", @@ -1104,6 +1105,7 @@ mymodule.provisioning_params = { "INSERT INTO provisioning_params VALUES(default, 'displaylang', 'select', 'Display screen language', 'Check if your phone supports the selected language', '', '15', '', null)", "INSERT INTO provisioning_params VALUES(default, 'algoringvol', 'select', 'Ring Volume (Algo)', '', '5', '16', '', null)", "INSERT INTO provisioning_params VALUES(default, 'algopagevol', 'select', 'Page Volume (Algo)', '', '5', '17', '', null)", + "INSERT INTO provisioning_params values(default, 'algospkmode', 'select', 'Speaker Mode (Algo)', '', '0', '18', '', null)"; "INSERT INTO provisioning_params VALUES(default, 'extension', 'text', 'Extension', '', '', '101', '^%d*$', null)", "INSERT INTO provisioning_params VALUES(default, 'password', 'text', 'Password', '', '', '102', '', null)", @@ -1277,6 +1279,11 @@ mymodule.provisioning_options = { "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algopagevol'), '8', '8', '8')", "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algopagevol'), '9', '9', '9')", "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algopagevol'), '10', '10', '10')", + "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algospkmode'), 'Auto', '0', '0')", + "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algospkmode'), 'External', '1', '1')", + "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algospkmode'), 'Internal', '2', '2')", + "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algospkmode'), 'Disabled', '3', '3')", + } -- List of getfile requests diff --git a/upgradeprovisioning b/upgradeprovisioning index e338ba9..da1dd66 100755 --- a/upgradeprovisioning +++ b/upgradeprovisioning @@ -536,4 +536,20 @@ if [ "$version" -lt "6" ]; then psql -U postgres -c "UPDATE provisioning_params SET value='6' WHERE name='databaseversion'" provisioning fi +if [ "$version" -lt "7" ]; then + echo "Upgrading to database version 7" + + psql -U postgres -c "INSERT INTO provisioning_params values(default, 'algospkmode', 'select', 'Speaker Mode (Algo)', '', '0', '18', '', null)" provisioning + + psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Algo 8180 Device'), (SELECT param_id FROM provisioning_params WHERE name='algospkmode'), null, true)" provisioning + + psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algospkmode'), 'Auto', '0', '0')" provisioning + psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algospkmode'), 'External', '1', '1')" provisioning + psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algospkmode'), 'Internal', '2', '2')" provisioning + psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algospkmode'), 'Disabled', '3', '3')" provisioning + + # database + psql -U postgres -c "UPDATE provisioning_params SET value='7' WHERE name='databaseversion'" provisioning +fi + exit 0 -- cgit v1.2.3