Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions Components/Communication/CANMessageHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,15 @@ bool CANTask::HandleCANCommands() {
}
}

{
RPB_IRCTRAMP_SET_COMMAND cmd;
if(dau.ReadMessageByLogIndex(_RPB_IRCTRAMP_SET_COMMAND_LOGINDEX, (uint8_t*)&cmd,sizeof(cmd))) {
SOAR_PRINT("got irc tramp cmd\n");
Command cm = {TASK_SPECIFIC_COMMAND,CAMERA_COMMAND_IRC_TRAMP};
cm.CopyDataToCommand((uint8_t*)&cmd, sizeof(cmd));
CameraTask::Inst().SendCommandReference(cm);
}
}

return foundone;
};
13 changes: 13 additions & 0 deletions Components/PeriphTasks/CameraTask.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,10 @@ void CameraTask::Run(void *pvParams)
osdDriver.OSD_WriteCustomCharacter(0xE3, callsign_tile_3);
osdDriver.OSD_WriteCustomCharacter(0xE4, callsign_tile_4);


muxDriver.Enable();
muxDriver.Select(Camera::CAMERA2);

while (1)
{
/* Process commands */
Expand Down Expand Up @@ -245,6 +247,17 @@ void CameraTask::HandleCommand(Command &cm)
}
break;
}
case CAMERA_COMMAND_IRC_TRAMP: {
RPB_IRCTRAMP_SET_COMMAND cmd = *(RPB_IRCTRAMP_SET_COMMAND*)cm.GetDataPointer();
if(cmd.setFreq) {
IRCTramp::SetVTXFrequency(cmd.freq, UART5);
osDelay(10);
}
if(cmd.setPower) {
IRCTramp::SetVTXPower(cmd.power, UART5);
}
break;
}
default:
SOAR_PRINT("CameraTask - Received Unsupported Task Command {%d}\n", cm.GetTaskCommand());
break;
Expand Down
3 changes: 2 additions & 1 deletion Components/PeriphTasks/Inc/CameraTask.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ enum CAMERA_TASK_COMMANDS
CAMERA_COMMAND_START_RECORDING,
CAMERA_COMMAND_STOP_RECORDING,
CAMERA_COMMAND_POWER_ON,
CAMERA_COMMAND_POWER_OFF
CAMERA_COMMAND_POWER_OFF,
CAMERA_COMMAND_IRC_TRAMP
};

/* Macros ------------------------------------------------------------------*/
Expand Down
2 changes: 1 addition & 1 deletion Core/Src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ static void MX_UART5_Init(void)

/* USER CODE END UART5_Init 1 */
USART_InitStruct.PrescalerValue = LL_USART_PRESCALER_DIV1;
USART_InitStruct.BaudRate = 115200;
USART_InitStruct.BaudRate = 9600;
USART_InitStruct.DataWidth = LL_USART_DATAWIDTH_8B;
USART_InitStruct.StopBits = LL_USART_STOPBITS_1;
USART_InitStruct.Parity = LL_USART_PARITY_NONE;
Expand Down
2 changes: 2 additions & 0 deletions RPB.ioc
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,8 @@ SPI2.VirtualType=VM_MASTER
TIM3.Channel-PWM\ Generation1\ CH1=TIM_CHANNEL_1
TIM3.IPParameters=Channel-PWM Generation1 CH1,Prescaler
TIM3.Prescaler=16
UART5.BaudRate=9600
UART5.IPParameters=BaudRate
USART1.IPParameters=VirtualMode-Asynchronous
USART1.VirtualMode-Asynchronous=VM_ASYNC
USART2.IPParameters=VirtualMode-Asynchronous
Expand Down
2 changes: 1 addition & 1 deletion SoarDrivers