From 6c91ec0ab4095b0766874eccca5c008e00c619bb Mon Sep 17 00:00:00 2001 From: Conrad Lara - KG6JEI Date: Tue, 31 Mar 2015 23:42:22 -0700 Subject: [PATCH 1/3] Add channels that are within normal 5.8GHz unit range for Rocket M3 usage. M3 is a 5.8GHz unit with a 2GHz offset transverter. 5MHz width is recomended on these channels. Send to spectrum analysis for verification that output looks clean. Stepping stone to working on the wider width of the full 3.4GHz band which has more channels but unlike channels 95-100 (added in this commit) the rest are outside the normal 5.8GHz cal range (but are between two cal points so may be fine) --- files/www/cgi-bin/channelmaps.pm | 7 +++++++ files/www/cgi-bin/perlfunc.pm | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/files/www/cgi-bin/channelmaps.pm b/files/www/cgi-bin/channelmaps.pm index ac22e554..fa6aabf4 100644 --- a/files/www/cgi-bin/channelmaps.pm +++ b/files/www/cgi-bin/channelmaps.pm @@ -61,6 +61,13 @@ sub rf_channel_map 10 => "10 (2457)", 11 => "11 (2462)", }, + '3400' => { + 95 => "(5475)", + 96 => "(5480)", + 97 => "(5485)", + 98 => "(5490)", + 99 => "(5495)", + }, '5500' => { 37 => "36 (5190)", 40 => "40 (5200)", diff --git a/files/www/cgi-bin/perlfunc.pm b/files/www/cgi-bin/perlfunc.pm index e4bfbcb8..970e07eb 100644 --- a/files/www/cgi-bin/perlfunc.pm +++ b/files/www/cgi-bin/perlfunc.pm @@ -1007,6 +1007,17 @@ sub hardware_info 'usechains' => 1, 'rfband' => '900', }, + '0xe1c3' => { + 'name' => 'Rocket M3', + 'comment' => 'In Testing', + 'supported' => '-2', + 'maxpower' => '22', + 'pwroffset' => '3', + 'antennas' => { 1 => "Chain0", 2 => "Chain1", 3 => "Diversity"}, + 'defaultant' => 3, + 'usechains' => 1, + 'rfband' => '3400', + }, '0xe202' => { 'name' => 'Bullet M2 HP', 'comment' => '', From 5414cb2f86dfd87636c5eda512e5eb1c6ae80e08 Mon Sep 17 00:00:00 2001 From: Conrad Lara - KG6JEI Date: Tue, 31 Mar 2015 23:50:05 -0700 Subject: [PATCH 2/3] bugfix: Correct bandmapping to 3400 for Rocket M3 --- files/www/cgi-bin/perlfunc.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/www/cgi-bin/perlfunc.pm b/files/www/cgi-bin/perlfunc.pm index 970e07eb..0830ca19 100644 --- a/files/www/cgi-bin/perlfunc.pm +++ b/files/www/cgi-bin/perlfunc.pm @@ -1104,7 +1104,7 @@ sub hardware_info 'antennas' => { 1 => "Chain0", 2 => "Chain1", 3 => "Diversity"}, 'defaultant' => 3, 'usechains' => 1, - 'rfband' => '2400', + 'rfband' => '3400', }, '0xe252' => { 'name' => 'airGrid M2 HP', From ba045c292a42261607124d840642a6b759527d2b Mon Sep 17 00:00:00 2001 From: Conrad Lara - KG6JEI Date: Wed, 1 Apr 2015 10:07:30 -0700 Subject: [PATCH 3/3] bugfix: channelmaps: 3400 frequency was showing 54** Forgot to change the 5 to a 3 when writing the channelmap --- files/www/cgi-bin/channelmaps.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/files/www/cgi-bin/channelmaps.pm b/files/www/cgi-bin/channelmaps.pm index fa6aabf4..9f916def 100644 --- a/files/www/cgi-bin/channelmaps.pm +++ b/files/www/cgi-bin/channelmaps.pm @@ -62,11 +62,11 @@ sub rf_channel_map 11 => "11 (2462)", }, '3400' => { - 95 => "(5475)", - 96 => "(5480)", - 97 => "(5485)", - 98 => "(5490)", - 99 => "(5495)", + 95 => "(3475)", + 96 => "(3480)", + 97 => "(3485)", + 98 => "(3490)", + 99 => "(3495)", }, '5500' => { 37 => "36 (5190)",