UC-3853 zen 5159 : feature request for Polycom RealPresence Trio

dizzy · Mar 22, 2016 · 9e0f842 · 9e0f842
1 parent ec44cf5
commit 9e0f842
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 8 deletions.
diff --git a/sipXpolycom/etc/polycom/mac-address.d.40/features.cfg.vm b/sipXpolycom/etc/polycom/mac-address.d.40/features.cfg.vm
@@ -95,7 +95,7 @@
     roaming_privacy.${setting.ProfileName}="$!{setting.Value}"
 #end
   />
-#if ($phone.Model.ModelId == "polycomVVX500" || $phone.Model.ModelId == "polycomVVX410" || $phone.Model.ModelId == "polycomVVX400")
+#if ($phone.Model.ModelId == "polycomVVX500" || $phone.Model.ModelId == "polycomRealPresenceTrio" || $phone.Model.ModelId == "polycomVVX410" || $phone.Model.ModelId == "polycomVVX400")
 #set ($group = $cfg.EndpointSettings.getSetting('background').getSetting('polycomVVX500bg'))
 #if($group.getSetting('enabled').Value == 1)
   <bg>

diff --git a/sipXpolycom/etc/polycom/phone-32.xml b/sipXpolycom/etc/polycom/phone-32.xml
@@ -3014,20 +3014,20 @@
         <value></value>
       </setting>
     </group>
-    <group name="bg" hidden="yes" if="polycomVVX500||polycom550||polycom560||polycom650||polycom670||polycom450||polycomVVX1500">
-      <setting name="bg.color.selection" if="polycomVVX500">
+    <group name="bg" hidden="yes" if="polycomVVX500||polycomRealPresenceTrio||polycom550||polycom560||polycom650||polycom670||polycom450||polycomVVX1500">
+      <setting name="bg.color.selection" if="polycomVVX500||polycomRealPresenceTrio">
         <type>
 		  <string />
 		</type>
         <value>2,1</value>        
       </setting>
-      <setting name="bg.color.bm.1.em.name" if="polycomVVX500">
+      <setting name="bg.color.bm.1.em.name" if="polycomVVX500||polycomRealPresenceTrio">
         <type>
 		  <string />
 		</type>
         <value>ezLogo320x240.jpg</value>        
       </setting>
-      <setting name="bg.color.bm.1.name" if="polycomVVX500">
+      <setting name="bg.color.bm.1.name" if="polycomVVX500||polycomRealPresenceTrio">
         <type>
 		  <string />
 		</type>

diff --git a/sipXpolycom/etc/polycom/phone-4_5.xml b/sipXpolycom/etc/polycom/phone-4_5.xml
@@ -112,7 +112,7 @@
         <value>0</value>
       </setting>
     </group>
-    <group name="numOfDisplayColumns" if="polycomVVX500||polycomVVX600">
+    <group name="numOfDisplayColumns" if="polycomVVX500||polycomRealPresenceTrio||polycomVVX600">
 	    <setting name="numOfDisplayColumns" if="5.0.0||5.0.1||5.0.2||4.1.6||4.1.7||4.1.8||5.1.1||5.1.2||5.1.3||5.2.0||5.2.1||5.2.2||5.2.3||5.3.0||5.3.1||5.4.0">
 	    <type>
 	      <enum>
@@ -3387,7 +3387,7 @@
       </type>
       <value>1</value>
     </setting>
-    <setting name="enable.VVX500" if="polycomVVX500">
+    <setting name="enable.VVX500" if="polycomVVX500||polycomRealPresenceTrio">
       <type>
         <boolean />
       </type>

diff --git a/sipXpolycom/src/org/sipfoundry/sipxconfig/phone/polycom/PolycomPhoneDefaults.java b/sipXpolycom/src/org/sipfoundry/sipxconfig/phone/polycom/PolycomPhoneDefaults.java
@@ -150,7 +150,7 @@ public String getSyslogServer() {
     public String getNumDisplayColumns() {
         if (m_model.equals("polycomVVX600")) {
             return "4";
-        } else if (m_model.equals("polycomVVX500")) {
+        } else if (m_model.equals("polycomVVX500") || m_model.equals("polycomRealPresenceTrio")) {
             return "3";
         }
         return null;

diff --git a/sipXpolycom/src/sipxplugin.beans.xml b/sipXpolycom/src/sipxplugin.beans.xml
@@ -621,6 +621,54 @@
         <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_4_1_5"/>
     </property>
   </bean>
+  <bean id="polycomRealPresenceTrio" parent="polycomModel">
+    <property name="label" value="Polycom RealPresence Trio" />
+    <property name="maxLineCount" value="1" />
+    <property name="supportedFeatures">
+      <set>
+        <value>disableCallList</value>
+        <value>intercom</value>
+        <value>voiceQualityMonitoring</value>
+        <value>nway-conference</value>
+        <value>localConferenceCallHold</value>
+        <value>singleKeyPressConference</value>
+        <value>VVX_500_CodecPref</value>
+        <value>desktopIntegration</value>
+        <value>exchangeIntegration</value>
+        <value>video</value>
+      </set>
+    </property>
+    <property name="versions">
+      <list>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_4_0_X"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_4_1_X"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_4_1_0"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_4_1_2"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_4_1_3"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_4_1_4"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_4_1_5"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_4_1_6"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_4_1_7"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_4_1_8"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_5_0_0"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_5_0_1"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_5_0_2"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_5_1_1"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_5_1_2"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_5_1_3"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_5_2_0"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_5_2_1"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_5_2_2"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_5_2_3"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_5_3_0"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_5_3_1"/>
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_5_4_0"/>
+      </list>
+    </property>
+    <property name="defaultVersion">
+        <ref local="org.sipfoundry.sipxconfig.phone.polycom.PolycomModel.VER_4_1_5"/>
+    </property>
+  </bean>
   <bean id="polycomVVX600" parent="polycomModel">
     <property name="label" value="Polycom VVX 600" />
     <property name="maxLineCount" value="16" />