Skip to content
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

Jump to bottom

Add ELRS OSD and buzzer support #171

Merged
merged 4 commits into from
Feb 28, 2023
Merged

Add ELRS OSD and buzzer support #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00a1151
Add ELRS OSD and buzzer support
pkendall64 Feb 17, 2023
dc36fa3
Clear the backpack OSD overlay when entering video modes.
pkendall64 Feb 21, 2023
0174897
Upgrade to 512 font chars
pkendall64 Feb 21, 2023
c5c6c90
Fix after review
pkendall64 Feb 28, 2023
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
49 changes: 46 additions & 3 deletions src/core/elrs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "core/battery.h"
#include "core/common.hh"
#include "core/ht.h"
#include "core/msp_displayport.h"
#include "core/osd.h"
#include "driver/dm5680.h"
#include "driver/gpio.h"
Expand All @@ -42,7 +43,11 @@ static int record_state;
static uint32_t record_time = 0;
static bool headtracking_enabled = false;

uint16_t elrs_osd[HD_VMAX][HD_HMAX];
static uint16_t elrs_osd_overlay[HD_VMAX][HD_HMAX];

void msp_process_packet();
static void handle_osd(uint8_t *payload, uint8_t size);

static const uint16_t freq_table[] = {
5658, 5695, 5732, 5769, 5806, 5843, 5880, 5917, // R1-8
Expand Down Expand Up @@ -284,11 +289,10 @@ void msp_process_packet() {
}
} break;
case MSP_SET_BUZZER:
// TODO after merge
// beep_dur((packet.payload[0] | packet.payload[1]<<8) * 1000);
beep_dur((packet.payload[0] | packet.payload[1]<<8) * 1000);
break;
case MSP_SET_OSD_ELEM:
// TODO
handle_osd(packet.payload, packet.payload_size);
break;
case MSP_SET_HT_ENABLE:
if (packet.payload_size > 0) {
Expand Down Expand Up @@ -364,4 +368,43 @@ void msp_ht_update(uint16_t pan, uint16_t tilt, uint16_t roll) {

bool elrs_headtracking_enabled() {
return headtracking_enabled;
}

void elrs_clear_osd() {
for (int i = 0; i < HD_VMAX; i++) {
bkleiner marked this conversation as resolved.
Show resolved Hide resolved
for (int j = 0; j < HD_HMAX; j++) {
elrs_osd_overlay[i][j] = 0x20;
}
}
}

static void handle_osd(uint8_t payload[], uint8_t size) {
switch (payload[0]) {
case 0x00: // hearbeat
break;
case 0x01: // release port
elrs_clear_osd();
memcpy(elrs_osd, elrs_osd_overlay, sizeof(elrs_osd));
osd_signal_update();
break;
case 0x02: // clear screen
elrs_clear_osd();
break;
case 0x03: // write string
{
uint8_t row = payload[1];
uint8_t col = payload[2];
uint8_t attr = payload[3];
// HDZero only allows 2 pages of characters (i.e. 512 characters)
int page = (attr & 1) * 256;
uint8_t len = size - 4 < HD_HMAX - col ? size - 4 : HD_HMAX - col;
for (int j = 0; j < len; j++) {
elrs_osd_overlay[row][col+j] = payload[j+4] + page;
}
} break;
case 0x04: // draw screen
memcpy(elrs_osd, elrs_osd_overlay, sizeof(elrs_osd));
osd_signal_update();
break;
}
}
5 changes: 5 additions & 0 deletions src/core/elrs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include <stdbool.h>
#include <stdint.h>

#include "core/msp_displayport.h"

typedef enum {
MSP_IDLE,
MSP_HEADER_START,
Expand Down Expand Up @@ -59,8 +61,11 @@ typedef struct {
bool read_error;
} mspPacket_t;

extern uint16_t elrs_osd[HD_VMAX][HD_HMAX];

void elrs_init();
bool elrs_headtracking_enabled();
void elrs_clear_osd();

void msp_send_packet(uint16_t function, mspPacketType_e type, uint16_t payload_size, uint8_t *payload);
bool msp_read_resposne(uint16_t function, uint16_t *payload_size, uint8_t *payload);
Expand Down
8 changes: 6 additions & 2 deletions src/core/osd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#include "core/battery.h"
#include "core/common.hh"
#include "core/elrs.h"
#include "core/msp_displayport.h"
#include "driver/dm5680.h"
#include "driver/fans.h"
Expand Down Expand Up @@ -444,6 +445,7 @@ void osd_hdzero_update(void) {

int osd_clear(void) {
clear_screen();
elrs_clear_osd();
osd_signal_update();
return 0;
}
Expand Down Expand Up @@ -678,8 +680,10 @@ void *thread_osd(void *ptr) {

for (int i = 0; i < HD_VMAX; i++) {
for (int j = 0; j < HD_HMAX; j++) {
if (osd_buf[i][j] != osd_buf_shadow[i][j]) {
osd_buf_shadow[i][j] = osd_buf[i][j];
uint16_t ch = osd_buf[i][j];
if (ch == 0x20) ch = elrs_osd[i][j];
if (ch != osd_buf_shadow[i][j]) {
osd_buf_shadow[i][j] = ch;
draw_osd_on_screen(i, j);
}
}
Expand Down