Skip to content

Add IRC Tramp protocol support for VTX control #165

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

Draft
vishwamartur wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Add IRC Tramp protocol support for VTX control #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/Espfc/src/Connect/MspProcessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1403,7 +1403,7 @@ void MspProcessor::processCommand(MspMessage& m, MspResponse& r, Device::SerialD
r.writeU8(0); // ready
r.writeU8(0); // low power disarm
} else {
r.writeU8(3 /* SMARTAUDIO */); // vtx type unknown
r.writeU8(_model.config.vtx.protocol); // vtx type
r.writeU8(_model.config.vtx.band); // band
r.writeU8(_model.config.vtx.channel); // channel
r.writeU8(_model.config.vtx.power); // power
Expand Down
32 changes: 30 additions & 2 deletions lib/Espfc/src/Connect/Vtx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,19 @@ int Vtx::update()
_model.state.vtx.active = true;
break;
case State::SET_POWER:
setPower();
if (type == VTXDEV_TRAMP) {
setTrampPower();
} else {
setPower();
}
_state = State::IDLE;
break;
case State::SET_CHANNEL:
setChannel();
if (type == VTXDEV_TRAMP) {
setTrampChannel();
} else {
setChannel();
}
_state = State::SET_POWER;
break;
case State::IDLE:
Expand Down Expand Up @@ -101,4 +109,24 @@ int Vtx::setPower()
return 1;
}

int Vtx::setTrampChannel()
{
uint8_t vtxCommand[6] = { 0x0F, 0x55, 0xAA, 0x03, (uint8_t)((_model.config.vtx.band - 1) * 8 + _model.config.vtx.channel - 1) };
vtxCommand[5] = crc8(vtxCommand, 5);
_serial->write(vtxCommand, 6);
_serial->flush();

return 1;
}

int Vtx::setTrampPower()
{
uint8_t vtxCommand[6] = { 0x0F, 0x55, 0xAA, 0x02, (uint8_t)((!_model.config.vtx.lowPowerDisarm || _model.isModeActive(MODE_ARMED)) ? _model.config.vtx.power - 1 : 0) };
vtxCommand[5] = crc8(vtxCommand, 5);
_serial->write(vtxCommand, 6);
_serial->flush();

return 1;
}

}
2 changes: 2 additions & 0 deletions lib/Espfc/src/Connect/Vtx.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ class Vtx
int update();
int setChannel();
int setPower();
int setTrampChannel();
int setTrampPower();
Connect::VtxDeviceType type;

private:
Expand Down
11 changes: 9 additions & 2 deletions lib/Espfc/src/SerialManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,13 @@ int SerialManager::begin()
sdc.stop_bits = SDC_SERIAL_STOP_BITS_2;
sdc.data_bits = 8;
}
else if(spc.functionMask & SERIAL_FUNCTION_VTX_TRAMP)
{
sdc.baud = 9600;
sdc.parity = SDC_SERIAL_PARITY_NONE;
sdc.stop_bits = SDC_SERIAL_STOP_BITS_2;
sdc.data_bits = 8;
}

if(!sdc.baud)
{
Expand All @@ -122,7 +129,7 @@ int SerialManager::begin()
{
_ibus.begin(port);
}
if(spc.functionMask & SERIAL_FUNCTION_VTX_SMARTAUDIO)
if(spc.functionMask & SERIAL_FUNCTION_VTX_SMARTAUDIO || spc.functionMask & SERIAL_FUNCTION_VTX_TRAMP)
{
_vtx.begin(port);
}
Expand Down Expand Up @@ -161,7 +168,7 @@ int FAST_CODE_ATTR SerialManager::update()
{
_ibus.update();
}
if(sc.functionMask & SERIAL_FUNCTION_VTX_SMARTAUDIO)
if(sc.functionMask & SERIAL_FUNCTION_VTX_SMARTAUDIO || sc.functionMask & SERIAL_FUNCTION_VTX_TRAMP)
{
_vtx.update();
}
Expand Down