Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for issue #220 #221

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Fix for issue #220 #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f845a4d
Fix for issue #220
umatz Jun 29, 2017
da4eaee
Fixed some wrong quotation marks.
umatz Jun 29, 2017
0acd314
Adding model "T27" to name tag
umatz Jun 29, 2017
6725dda
Adding model T27
umatz Jun 29, 2017
4d4d996
Removed PHP 5.2
umatz Jun 29, 2017
b020706
Added testing with PHP 5.5 an 5.6
umatz Jun 30, 2017
b2121dc
Added testing with PHP 7.0 and 7.1
umatz Jun 30, 2017
850770c
Removed testing with php 7.0/7.1 (code not compatible)
umatz Jun 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
language: php
php:
- 5.2
- 5.3
- 5.4
- 5.5
- 5.6
script: phpunit tests/phpunittests

notifications:
irc: "irc.freenode.org#provisioner"
irc: "irc.freenode.org#provisioner"
2 changes: 1 addition & 1 deletion endpoint/yealinkv70/t2x/family_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"data": {
"name": "Yealink V70 T2X Models: [T20, T22, T26, T28]",
"name": "Yealink V70 T2X Models: [T20, T22, T26, T27, T28]",
"id": "1",
"directory": "t2x",
"firmware_ver": 1326828070,
Expand Down
4 changes: 2 additions & 2 deletions endpoint/yealinkv70/t2x/line_keys_27.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"name":"basic",
"item":[
{
"description":"Line Keys (1-21)”,
"description":"Line Keys (1-21)",
"type":"loop",
"loop_start":"1",
"loop_end”:”21”,
"loop_end":"21",
"data":{
"item":[
{
Expand Down
4 changes: 2 additions & 2 deletions endpoint/yealinkv70/t2x/line_keys_28.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"name":"basic",
"item":[
{
"description":"Line Keys (1-6)”,
"description":"Line Keys (1-6)",
"type":"loop",
"loop_start":"1",
"loop_end”:”6”,
"loop_end":"6",
"data":{
"item":[
{
Expand Down
2 changes: 1 addition & 1 deletion endpoint/yealinkv70/t2x/phone.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function parse_lines_hook($line_data, $line_total) {

function prepare_for_generateconfig() {
# This contains the last 2 digits of y0000000000xx.cfg, for each model.
$model_suffixes = array('T28' => '00', 'T26' => '04', 'T22' => '05', 'T20' => '07');
$model_suffixes = array('T28' => '00', 'T27' => '27', 'T26' => '04', 'T22' => '05', 'T20' => '07');
//Yealink likes lower case letters in its mac address
$this->mac = strtolower($this->mac);
$this->config_file_replacements['$suffix'] = $model_suffixes[$this->model];
Expand Down