Skip to content

Add L-Band #31

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

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

Add L-Band #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ffb5d5
Add L-Band
andymac4182 Sep 30, 2017
0035e8f
Fix up menu to show L band
andymac4182 Oct 3, 2017
a27edcd
Should be number - 1 instead of number
andymac4182 Oct 3, 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
7 changes: 4 additions & 3 deletions KISS_OSD/KISS_OSD.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,16 +129,17 @@ static uint8_t oldvTxChannel = 0;
static uint8_t oldvTxBand = 0;
static uint8_t vTxBand = 0;
static uint16_t vTxLowPower, vTxHighPower, oldvTxLowPower, oldvTxHighPower;
const uint8_t VTX_BAND_COUNT = 5;
const uint8_t VTX_BAND_COUNT = 6;
const uint8_t VTX_CHANNEL_COUNT = 8;
static const uint16_t vtx_frequencies[VTX_BAND_COUNT][VTX_CHANNEL_COUNT] PROGMEM = {
{ 5865, 5845, 5825, 5805, 5785, 5765, 5745, 5725 }, //A
{ 5733, 5752, 5771, 5790, 5809, 5828, 5847, 5866 }, //B
{ 5705, 5685, 5665, 5645, 5885, 5905, 5925, 5945 }, //E
{ 5740, 5760, 5780, 5800, 5820, 5840, 5860, 5880 }, //F
{ 5658, 5695, 5732, 5769, 5806, 5843, 5880, 5917 } //R
{ 5658, 5695, 5732, 5769, 5806, 5843, 5880, 5917 }, //R
{ 5362, 5399, 5436, 5473, 5510, 5547, 5584, 5621 } //L
};
static const char bandSymbols[VTX_BAND_COUNT][2] PROGMEM = { {'a',0x00} , {'b', 0x00}, {'e', 0x00}, {'f', 0x00}, {'r', 0x00}};
static const char bandSymbols[VTX_BAND_COUNT][2] PROGMEM = { {'a',0x00} , {'b', 0x00}, {'e', 0x00}, {'f', 0x00}, {'r', 0x00}, {'l', 0x00}};

#ifdef IMPULSERC_VTX
static uint8_t vTxPower, vTxMinPower;
Expand Down
4 changes: 2 additions & 2 deletions KISS_OSD/Menu.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1190,7 +1190,7 @@ void* vTxMenu()
vTxSettingChanged |= checkCode(settings.s.m_vTxPower, 1, 0, maxPower);
break;
case 2:
vTxSettingChanged |= checkCode(settings.s.m_vTxBand, 1, 0, 4);
vTxSettingChanged |= checkCode(settings.s.m_vTxBand, 1, 0, VTX_BAND_COUNT-1);
#ifdef AUSSIE_CHANNELS
if(settings.s.m_vTxBand == 2 && settings.s.m_AussieChannels == 0)
{
Expand All @@ -1199,7 +1199,7 @@ void* vTxMenu()
#endif
break;
case 3:
vTxSettingChanged |= checkCode(settings.s.m_vTxChannel, 1, 0, 7);
vTxSettingChanged |= checkCode(settings.s.m_vTxChannel, 1, 0, VTX_CHANNEL_COUNT-1);
break;
case 4:
if(code & inputChecker.ROLL_RIGHT)
Expand Down
2 changes: 1 addition & 1 deletion KISS_OSD/RTC6705.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void vtx_set_frequency(uint8_t band, uint8_t channel)
uint16_t A = 0;
uint32_t data0 = 0;
uint8_t i = 0;
if (frequency <5956 && frequency> 5644)
if (frequency <5956 && frequency> 5361)
{
data0 = (1 << 4) | (400 << 5);

Expand Down