pari: branch pari/dahdi_support r4441 - in /team/pari/dahdi_support/config: ....
SVN commits to the Asterisk-GUI project
asterisk-gui-commits at lists.digium.com
Fri Jan 16 13:34:47 CST 2009
Author: pari
Date: Fri Jan 16 13:34:47 2009
New Revision: 4441
URL: http://svn.digium.com/svn-view/asterisk-gui?view=rev&rev=4441
Log:
getting rid of some AA50-Analog settings
Modified:
team/pari/dahdi_support/config/hardware.html
team/pari/dahdi_support/config/hardware_dahdi.html
team/pari/dahdi_support/config/js/hardware_dahdi.js
Modified: team/pari/dahdi_support/config/hardware.html
URL: http://svn.digium.com/svn-view/asterisk-gui/team/pari/dahdi_support/config/hardware.html?view=diff&rev=4441&r1=4440&r2=4441
==============================================================================
--- team/pari/dahdi_support/config/hardware.html (original)
+++ team/pari/dahdi_support/config/hardware.html Fri Jan 16 13:34:47 2009
@@ -99,7 +99,7 @@
<body bgcolor="#EFEFEF">
<div class="iframeTitleBar">
- <span id='iframeTitleBar_title'> Digital Card Configuration Wizard </span>
+ <span id='iframeTitleBar_title'> Hardware Configuration</span>
<span class='refresh_icon' onclick="window.location.reload();" > <img src="images/refresh.png" title=" Refresh " border=0 > </span>
</div>
Modified: team/pari/dahdi_support/config/hardware_dahdi.html
URL: http://svn.digium.com/svn-view/asterisk-gui/team/pari/dahdi_support/config/hardware_dahdi.html?view=diff&rev=4441&r1=4440&r2=4441
==============================================================================
--- team/pari/dahdi_support/config/hardware_dahdi.html (original)
+++ team/pari/dahdi_support/config/hardware_dahdi.html Fri Jan 16 13:34:47 2009
@@ -3,7 +3,7 @@
*
* Digital Card Setup / Detection
*
- * Copyright (C) 2007-2008, Digium, Inc.
+ * Copyright (C) 2007-2009, Digium, Inc.
*
* Brandon Kruse <bkruse at digium.com>
* Pari Nannapaneni <pari at digium.com>
@@ -99,7 +99,7 @@
<body bgcolor="#EFEFEF">
<div class="iframeTitleBar">
- <span id='iframeTitleBar_title'> Digital Card Configuration Wizard </span>
+ <span id='iframeTitleBar_title'> Hardware Configuration</span>
<span class='refresh_icon' onclick="window.location.reload();" > <img src="images/refresh.png" title=" Refresh " border=0 > </span>
</div>
@@ -177,171 +177,6 @@
</table>
</div>
-
- <div class="pageheading">Advanced Settings</div>
-
- <table align=center>
- <tr> <td align=right>Module Name : </td>
- <td> <input id="zap_moduleName" dfalt='wctdm24xxp' size=10></td>
- </tr>
- <tr><td align=right>Opermode <img src="images/tooltip_info.gif" tip="en,opermode_settings,0" class='tooltipinfo'> : </td>
- <td>
- <input type='checkbox' id='enable_disable_checkbox_opermode'>
- <select id="opermode" dfalt='USA'>
- <option value="USA">USA</option>
- <option value="ARGENTINA">ARGENTINA</option>
- <option value="AUSTRALIA">AUSTRALIA</option>
- <option value="AUSTRIA">AUSTRIA</option>
- <option value="BAHRAIN">BAHRAIN</option>
- <option value="BELGIUM">BELGIUM</option>
- <option value="BRAZIL">BRAZIL</option>
- <option value="BULGARIA">BULGARIA</option>
- <option value="CANADA">CANADA</option>
- <option value="CHILE">CHILE</option>
- <option value="CHINA">CHINA</option>
- <option value="COLUMBIA">COLUMBIA</option>
- <option value="CROATIA">CROATIA</option>
- <option value="CYRPUS">CYRPUS</option>
- <option value="CZECH">CZECH</option>
- <option value="DENMARK">DENMARK</option>
- <option value="ECUADOR">ECUADOR</option>
- <option value="EGYPT">EGYPT</option>
- <option value="ELSALVADOR">ELSALVADOR</option>
- <option value="FCC">FCC</option>
- <option value="FINLAND">FINLAND</option>
- <option value="FRANCE">FRANCE</option>
- <option value="GERMANY">GERMANY</option>
- <option value="GREECE">GREECE</option>
- <option value="GUAM">GUAM</option>
- <option value="HONGKONG">HONGKONG</option>
- <option value="HUNGARY">HUNGARY</option>
- <option value="ICELAND">ICELAND</option>
- <option value="INDIA">INDIA</option>
- <option value="INDONESIA">INDONESIA</option>
- <option value="IRELAND">IRELAND</option>
- <option value="ISRAEL">ISRAEL</option>
- <option value="ITALY">ITALY</option>
- <option value="JAPAN">JAPAN</option>
- <option value="JORDAN">JORDAN</option>
- <option value="KAZAKHSTAN">KAZAKHSTAN</option>
- <option value="KUWAIT">KUWAIT</option>
- <option value="LATVIA">LATVIA</option>
- <option value="LEBANON">LEBANON</option>
- <option value="LUXEMBOURG">LUXEMBOURG</option>
- <option value="MACAO">MACAO</option>
- <option value="MALAYSIA">MALAYSIA</option>
- <option value="MALTA">MALTA</option>
- <option value="MEXICO">MEXICO</option>
- <option value="MOROCCO">MOROCCO</option>
- <option value="NETHERLANDS">NETHERLANDS</option>
- <option value="NEWZEALAND">NEWZEALAND</option>
- <option value="NIGERIA">NIGERIA</option>
- <option value="NORWAY">NORWAY</option>
- <option value="OMAN">OMAN</option>
- <option value="PAKISTAN">PAKISTAN</option>
- <option value="PERU">PERU</option>
- <option value="PHILIPPINES">PHILIPPINES</option>
- <option value="POLAND">POLAND</option>
- <option value="PORTUGAL">PORTUGAL</option>
- <option value="ROMANIA">ROMANIA</option>
- <option value="RUSSIA">RUSSIA</option>
- <option value="SAUDIARABIA">SAUDIARABIA</option>
- <option value="SINGAPORE">SINGAPORE</option>
- <option value="SLOVAKIA">SLOVAKIA</option>
- <option value="SLOVENIA">SLOVENIA</option>
- <option value="SOUTHAFRICA">SOUTHAFRICA</option>
- <option value="SOUTHKOREA">SOUTHKOREA</option>
- <option value="SPAIN">SPAIN</option>
- <option value="SWEDEN">SWEDEN</option>
- <option value="SWITZERLAND">SWITZERLAND</option>
- <option value="SYRIA">SYRIA</option>
- <option value="TAIWAN">TAIWAN</option>
- <option value="TBR21">TBR21</option>
- <option value="THAILAND">THAILAND</option>
- <option value="UAE">UAE</option>
- <option value="UK">UK</option>
- <option value="YEMEN">YEMEN</option>
- </select>
- </td>
- </tr>
-
- <tr><td align=right>a-law override <img src="images/tooltip_info.gif" tip="en,opermode_settings,1" class='tooltipinfo'> : </td>
- <td>
- <input type='checkbox' id='enable_disable_checkbox_alawoverride'>
- <select id="alawoverride" dfalt='0'>
- <option value="0">ulaw</option>
- <option value="1">alaw</option>
- </select>
- </td>
- </tr>
- <tr><td align=right>fxs honor mode <img src="images/tooltip_info.gif" tip="en,opermode_settings,2" class='tooltipinfo'> : </td>
- <td>
- <input type='checkbox' id='enable_disable_checkbox_fxshonormode'>
- <select id="fxshonormode" dfalt='0'>
- <option value="0">apply opermode to fxo modules only </option>
- <option value="1">apply opermode to fxs and fxo modules</option>
- </select>
- </td>
- </tr>
-
- <tr><td align=right>boostringer <img src="images/tooltip_info.gif" tip="en,opermode_settings,3" class='tooltipinfo'> : </td>
- <td>
- <input type='checkbox' id='enable_disable_checkbox_boostringer'>
- <select id="boostringer" dfalt='0'>
- <option value="0">normal</option>
- <option value="1">peak(89V)</option>
- </select>
- </td>
- </tr>
- <tr><td align=right>fastringer <img src="images/tooltip_info.gif" tip="en,opermode_settings,5" class='tooltipinfo'> : </td>
- <td>
- <input type='checkbox' id='enable_disable_checkbox_fastringer'>
- <select id="fastringer" dfalt='0'>
- <option value="0">normal</option>
- <option value="1">fast ringer (25hz) </option>
- </select>
- </td>
- </tr>
- <tr><td align=right>lowpower <img src="images/tooltip_info.gif" tip="en,opermode_settings,4" class='tooltipinfo'> : </td>
- <td>
- <input type='checkbox' id='enable_disable_checkbox_lowpower'>
- <select id="lowpower" dfalt='0'>
- <option value="0">normal</option>
- <option value="1">fast ringer to 50V peak</option>
- </select>
- </td>
- </tr>
- <tr> <td align=right>ring detect <img src="images/tooltip_info.gif" tip="en,opermode_settings,6" class='tooltipinfo'> : </td>
- <td>
- <input type='checkbox' id='enable_disable_checkbox_fwringdetect'>
- <select id="fwringdetect" dfalt='0'>
- <option value='0'>standard</option>
- <option value='1'>full wave</option>
- </select>
- </td>
- </tr>
- <tr> <td align=right>MWI mode <img src="images/tooltip_info.gif" tip="en,opermode_settings,7" class='tooltipinfo'> : </td>
- <td>
- <input type='checkbox' id='enable_disable_checkbox_mwimode'>
- <select id="mwimode" dfalt='none'>
- <option value='none'>None</option>
- <option value='FSK'>FSK</option>
- <option value='NEON'>NEON</option>
- </select>
- </td>
- </tr>
-
- <tr class='neon_settings' style='display:none'>
- <td align=right>Neon MWI voltage Level :</td>
- <td> <input id="neonmwi_level" size=2></td>
- </tr>
-
- <tr class='neon_settings' style='display:none'>
- <td align=right>Neon MWI off Limit (ms) :</td>
- <td> <input id="neonmwi_offlimit" size=4></td>
- </tr>
- </table>
-
<div style="overflow:auto;left:40">
<table cellpadding=5 cellspacing=1 align=center border=0>
<tr> <td height=50 valign='bottom'>
@@ -351,6 +186,7 @@
</tr>
</table>
</div>
+
</div>
<div id="errmsg" style="display:none"></div>
Modified: team/pari/dahdi_support/config/js/hardware_dahdi.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/pari/dahdi_support/config/js/hardware_dahdi.js?view=diff&rev=4441&r1=4440&r2=4441
==============================================================================
--- team/pari/dahdi_support/config/js/hardware_dahdi.js (original)
+++ team/pari/dahdi_support/config/js/hardware_dahdi.js Fri Jan 16 13:34:47 2009
@@ -3,7 +3,7 @@
*
* hardware.html functions
*
- * Copyright (C) 2006-2008, Digium, Inc.
+ * Copyright (C) 2006-2009, Digium, Inc.
*
* Pari Nannapaneni <pari at digium.com>
*
@@ -18,8 +18,8 @@
* at the top of the source tree.
*
*/
-var MODULE_NAME = 'wctdm24xxp';
-var DRIVERS_LIST = [ 'tor2','wcb4xxp', 'wcfxo', 'wct1xxp', 'wct4xxp', 'wctc4xxp', 'wctdm24xxp', 'wctdm', 'wcte11xp', 'wcte12xp', 'wcusb', 'xpp_usb' ];
+/////// var MODULE_NAME = 'wctdm24xxp';
+/////// var DRIVERS_LIST = [ 'tor2','wcb4xxp', 'wcfxo', 'wct1xxp', 'wct4xxp', 'wctc4xxp', 'wctdm24xxp', 'wctdm', 'wcte11xp', 'wcte12xp', 'wcusb', 'xpp_usb' ];
var SPANS = {};
@@ -761,93 +761,8 @@
u.clearActions();
ASTGUI.dialog.waitWhile('updating modprobe.conf ...');
- var cmd1 = "cp /etc/asterisk/modprobe_default /etc/modprobe.conf";
- var params = "options " + ASTGUI.getFieldValue('zap_moduleName') ;
-
- if( _$('enable_disable_checkbox_opermode').checked ){
- var h = ASTGUI.getFieldValue('opermode') ;
- if(h){ params += " opermode=" + h; }
- }
-
- if( _$('enable_disable_checkbox_alawoverride').checked ){
- h = ASTGUI.getFieldValue('alawoverride') ;
- if(h){ params += " alawoverride=" + h; }
- }
-
- if( _$('enable_disable_checkbox_fxshonormode').checked ){
- h = ASTGUI.getFieldValue('fxshonormode') ;
- if(h){ params += " fxshonormode=" + h; }
- }
-
- if( _$('enable_disable_checkbox_boostringer').checked ){
- h = ASTGUI.getFieldValue('boostringer') ;
- if(h){ params += " boostringer=" + h; }
- }
-
- if( _$('enable_disable_checkbox_lowpower').checked ){
- h = ASTGUI.getFieldValue('lowpower') ;
- if(h){ params += " lowpower=" + h; }
- }
-
- if( _$('enable_disable_checkbox_fastringer').checked ){
- h = ASTGUI.getFieldValue('fastringer') ;
- if(h){ params += " fastringer=" + h; }
- }
-
- if( _$('enable_disable_checkbox_fwringdetect').checked ){
- h = ASTGUI.getFieldValue('fwringdetect') ;
- if(h == '1'){ params += " fwringdetect=" + h; }
- }
-
- if( _$('enable_disable_checkbox_mwimode').checked ){
- if( ASTGUI.getFieldValue('mwimode') == 'NEON'){
- params += " neonmwi_monitor=1";
- var h = ASTGUI.getFieldValue('neonmwi_level');
- if(h){ params += ' neonmwi_level=' + h ; }
- var h = ASTGUI.getFieldValue('neonmwi_offlimit');
- if(h){ params += ' neonmwi_offlimit=' + h ; }
- }else{
- params += " neonmwi_monitor=0";
- }
- }
- var cmd2 = "echo \"" + params + "\" >> /etc/modprobe.conf ";
-
- var update_usersConf = function(){
- // update MWI settings in users.conf
- var u = new listOfSynActions('users.conf');
- if( _$('enable_disable_checkbox_mwimode').checked ){
- if( ASTGUI.getFieldValue('mwimode') == 'FSK'){
- u.new_action('update', 'general' , 'mwimonitor', 'fsk');
- u.new_action('update', 'general' , 'mwilevel', '512');
- u.new_action('update', 'general' , 'mwimonitornotify', '__builtin__');
- }
- if( ASTGUI.getFieldValue('mwimode') == 'NEON'){
- u.new_action('delete', 'general' , 'mwilevel', '','');
- u.new_action('update', 'general' , 'mwimonitor', 'neon');
- u.new_action('update', 'general' , 'mwimonitornotify', '__builtin__');
- }
- }
- u.callActions();
- ASTGUI.dialog.hide();
- ASTGUI.feedback( { msg:"updated settings !!", showfor: 3 });
-
- storeDetectedHardware();
- };
-
- if( !ASTGUI.getFieldValue('zap_moduleName') ){
- ASTGUI.dialog.hide();
- ASTGUI.feedback( { msg:"updated settings !!", showfor: 3 });
- storeDetectedHardware();
- return;
- }
-
- ASTGUI.systemCmd( cmd1, function(){
- ASTGUI.systemCmd( cmd2, function(){
- ASTGUI.dialog.waitWhile('updating Analog Trunks with MWI settings ...');
- update_usersConf();
- });
- });
+ storeDetectedHardware();
},
generate_zaptel: function(){
@@ -1057,8 +972,8 @@
})();
}
- x.new_action('append', context, 'loadzone', _$('loadZone').value);
- x.new_action('append', context, 'defaultzone', _$('loadZone').value);
+ x.new_action('append', context, 'loadzone', _$('loadZone').value );
+ x.new_action('append', context, 'defaultzone', _$('loadZone').value );
x.callActions( applySettings.cleanUsersConf );
}
};
@@ -1077,33 +992,8 @@
ASTGUI.Log.Debug("Starting Loading Page digital.html .. start function: window.onload()");
portsSignalling = ASTGUI.cloneObject(parent.sessionData.PORTS_SIGNALLING);
- ASTGUI.domActions.enableDisableByCheckBox ('enable_disable_checkbox_opermode', 'opermode') ;
- ASTGUI.domActions.enableDisableByCheckBox ('enable_disable_checkbox_mwimode', 'mwimode') ;
- ASTGUI.domActions.enableDisableByCheckBox ('enable_disable_checkbox_fwringdetect', 'fwringdetect') ;
- ASTGUI.domActions.enableDisableByCheckBox ('enable_disable_checkbox_lowpower', 'lowpower') ;
- ASTGUI.domActions.enableDisableByCheckBox ('enable_disable_checkbox_fastringer', 'fastringer') ;
- ASTGUI.domActions.enableDisableByCheckBox ('enable_disable_checkbox_boostringer', 'boostringer') ;
- ASTGUI.domActions.enableDisableByCheckBox ('enable_disable_checkbox_fxshonormode', 'fxshonormode') ;
- ASTGUI.domActions.enableDisableByCheckBox ('enable_disable_checkbox_alawoverride', 'alawoverride') ;
-
- ASTGUI.COMBOBOX.call( _$('zap_moduleName') , DRIVERS_LIST , 195 );
-
- if( parent.sessionData.PLATFORM.isAA50 ){
- (function(){
- var t = [
- {url:'#', desc:'Hardware Configuration', selected:true } ,
- {url:'modprobe_settings.html', desc:'Operation Mode'}
- ];
- ASTGUI.tabbedOptions( _$('tabbedMenu') , t);
- $('#tabbedMenu_container').show();
- })();
- ASTGUI.dialog.waitWhile('Detecting Hardware ...');
- top.document.title = "Analog Hardware Setup & Configuration";
- _$('iframeTitleBar_title').innerHTML = 'Analog Hardware Setup & Configuration';
- }else{
- ASTGUI.dialog.waitWhile('Detecting Analog/Digital Hardware ...');
- top.document.title = "Analog & Digital Cards(T1/E1) Setup & Configuration";
- }
+ ASTGUI.dialog.waitWhile('Detecting Analog/Digital Hardware ...');
+ top.document.title = "Analog & Digital Cards(T1/E1/BRI) Setup & Configuration";
if(!parent.sessionData.FXS_PORTS_DETECTED.length && !parent.sessionData.FXO_PORTS_DETECTED.length ){
var newRow = _$('FXSFXO_ports_td').insertRow(-1) ;
@@ -1165,65 +1055,7 @@
};
ASTGUI.events.add( _$('edit_DefinedChans'), "change", edit_DefinedChans_changed );
-
ASTGUI.Log.Debug("end of function: window.onload()");
-
- (function(){ // load modprobe settings
- var c = context2json ({ filename: ASTGUI.globals.configfile , context: 'general', usf: 1 });
-
- ASTGUI.updateFieldToValue( 'zap_moduleName' , c.getProperty('ZAPMODULE_NAME') );
-
- ASTGUI.updateFieldToValue( 'opermode' , c.getProperty('opermode') );
- _$('enable_disable_checkbox_opermode').checked = (c.getProperty('opermode')) ? true : false ;
- _$('enable_disable_checkbox_opermode').updateStatus();
-
- ASTGUI.updateFieldToValue( 'alawoverride' , c.getProperty('alawoverride') );
- _$('enable_disable_checkbox_alawoverride').checked = (c.getProperty('alawoverride')) ? true : false ;
- _$('enable_disable_checkbox_alawoverride').updateStatus();
-
- ASTGUI.updateFieldToValue( 'fxshonormode' , c.getProperty('fxshonormode') );
- _$('enable_disable_checkbox_fxshonormode').checked = (c.getProperty('fxshonormode')) ? true : false ;
- _$('enable_disable_checkbox_fxshonormode').updateStatus();
-
-
- ASTGUI.updateFieldToValue( 'boostringer' , c.getProperty('boostringer') );
- _$('enable_disable_checkbox_boostringer').checked = (c.getProperty('boostringer')) ? true : false ;
- _$('enable_disable_checkbox_boostringer').updateStatus();
-
-
- ASTGUI.updateFieldToValue( 'lowpower' , c.getProperty('lowpower') );
- _$('enable_disable_checkbox_lowpower').checked = (c.getProperty('lowpower')) ? true : false ;
- _$('enable_disable_checkbox_lowpower').updateStatus();
-
-
- ASTGUI.updateFieldToValue( 'fastringer' , c.getProperty('fastringer') );
- _$('enable_disable_checkbox_fastringer').checked = (c.getProperty('fastringer')) ? true : false ;
- _$('enable_disable_checkbox_fastringer').updateStatus();
-
-
- ASTGUI.updateFieldToValue( 'fwringdetect' , c.getProperty('fwringdetect') );
- _$('enable_disable_checkbox_fwringdetect').checked = (c.getProperty('fwringdetect')) ? true : false ;
- _$('enable_disable_checkbox_fwringdetect').updateStatus();
-
- ASTGUI.updateFieldToValue( 'neonmwi_level' , c.getProperty('neonmwi_level') || '75' );
- ASTGUI.updateFieldToValue( 'neonmwi_offlimit' , c.getProperty('neonmwi_offlimit') || '16000' );
- ASTGUI.updateFieldToValue( 'mwimode' , c.getProperty('mwimode') );
- _$('enable_disable_checkbox_mwimode').checked = (c.getProperty('mwimode')) ? true : false ;
- _$('enable_disable_checkbox_mwimode').updateStatus();
-
- if(c.getProperty('mwimode') == 'NEON')$(".neon_settings").show();
-
- ASTGUI.events.add( _$('mwimode'), 'change' , function(){
- if( _$('mwimode').value == 'NEON'){
- $(".neon_settings").show();
- }else{
- $(".neon_settings").hide();
- }
- }) ;
- })();
-
- ASTGUI.systemCmd( 'touch /etc/asterisk/modprobe_default', function(){
- loadConfigFiles.load_hwcfgfile(); // try to load last detected/configured hardware information
- });
-
-};
+ loadConfigFiles.load_hwcfgfile(); // try to load last detected/configured hardware information
+
+};
More information about the asterisk-gui-commits
mailing list