Skip to content

Commit 069a876

Browse files
author
Personal
committed
Only load the VTX Manager if enable on settings
Also some minor warnings corrections
1 parent 032b9ed commit 069a876

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

jni/msp/msp_vtx.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ uint8_t * resetVTXTableMessage() {
3636
}
3737

3838
uint8_t * setupVTXPowerMessage(int index, int value, char name[]) {
39-
uint8_t name_size = sizeof(name);
39+
uint8_t name_size = strlen(name);
4040
uint8_t payload_size = 4 + name_size;
4141
uint8_t vtx_power[4 + 3] = {
4242
index, // idx
4343
value & 0xFF, // powerValue LSB
4444
(value >> 8) & 0xFF, // powerValue MSB
45-
sizeof(name), // label lenght
45+
strlen(name), // label lenght
4646
};
4747

48-
for(int i = 0; i < sizeof(name); i++) {
48+
for(int i = 0; i < strlen(name); i++) {
4949
vtx_power[i] = name[i];
5050
}
5151
/*txPacket[8] = idx;

jni/msp_displayport_mux.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,9 @@ static void rx_msp_callback(msp_msg_t *msp_message)
239239
}
240240
case MSP_CMD_VTX_CONFIG: {
241241
DEBUG_PRINT("Received VTX CONFIG message...\n");
242-
printf("data: %d %d %d \n", msp_message->payload[0], msp_message->payload[1], msp_message->payload[2]);
243-
// TODO: Damage control accessing to index 2 if not exists
244-
fc_vtx_channel = msp_message->payload[2];
242+
if(sizeof(msp_message->payload) > 2) {
243+
fc_vtx_channel = msp_message->payload[2];
244+
}
245245
}
246246
case MSP_CMD_SET_VTX_CONFIG: {
247247
DEBUG_PRINT("Received SET VTX CONFIG message...\n");

jni/osd_dji_overlay_udp.c

+5-2
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ static void process_data_packet(uint8_t *buf, int len, dji_shm_state_t *radio_sh
499499
snprintf(str, 8, "A %2.1fV", packet->tx_voltage / 64.0f);
500500
display_print_string(overlay_display_info.char_width - 7, overlay_display_info.char_height - 7, str, 7);
501501
}
502-
if(vtx_manager_enabled == 1) {
502+
if(vtx_manager_enabled == true) {
503503
changeChannel(packet->fc_vtx_channel);
504504
}
505505
if(len > 6) {
@@ -760,8 +760,11 @@ void osd_directfb(duss_disp_instance_handle_t *disp, duss_hal_obj_handle_t ion_h
760760
int compression_dict_size = 0;
761761
void *compression_dict = open_dict(DICTIONARY_VERSION, &compression_dict_size);
762762

763+
// VTX Manager
763764
vtx_manager_enabled = get_boolean_config_value(VTX_MPS_CONFIG_KEY);
764-
setupVTXManager();
765+
if(vtx_manager_enabled == true) {
766+
setupVTXManager();
767+
}
765768

766769
uint64_t event_number;
767770
while (!quit)

0 commit comments

Comments
 (0)