Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-19 14:25:11 +03:00
Code Issues Wiki Activity

Bluetooth rewrite to C++

Browse source
This commit is contained in:
Bertrand Songis 2019-04-25 10:50:06 +02:00
parent d73081425f
commit 3914bf7ff4
6 changed files with 222 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

299
radio/src/bluetooth.cpp
View file

@ -30,20 +30,12 @@
#define BLUETOOTH_COMMAND_BAUD_115200 "TTM:BPS-115200" #define BLUETOOTH_COMMAND_BAUD_115200 "TTM:BPS-115200"
#endif #endif
#define BLUETOOTH_PACKET_SIZE 14
#define BLUETOOTH_LINE_LENGTH 32
extern Fifo<uint8_t, 64> btTxFifo; extern Fifo<uint8_t, 64> btTxFifo;
extern Fifo<uint8_t, 128> btRxFifo; extern Fifo<uint8_t, 128> btRxFifo;
volatile uint8_t bluetoothState; Bluetooth bluetooth;
char bluetoothLocalAddr[LEN_BLUETOOTH_ADDR+1];
char bluetoothDistantAddr[LEN_BLUETOOTH_ADDR+1];
uint8_t bluetoothBuffer[BLUETOOTH_LINE_LENGTH+1];
uint8_t bluetoothBufferIndex = 0;
tmr10ms_t bluetoothWakeupTime = 0;
void bluetoothWrite(const uint8_t * data, uint8_t length) void Bluetooth::write(const uint8_t * data, uint8_t length)
{ {
TRACE_NOCRLF("BT>"); TRACE_NOCRLF("BT>");
for (int i=0; i<length; i++) { for (int i=0; i<length; i++) {
@ -54,7 +46,7 @@ void bluetoothWrite(const uint8_t * data, uint8_t length)
bluetoothWriteWakeup(); bluetoothWriteWakeup();
} }
void bluetoothWriteString(const char * str) void Bluetooth::writeString(const char * str)
{ {
TRACE("BT> %s", str); TRACE("BT> %s", str);
while (*str != 0) { while (*str != 0) {
@ -63,7 +55,7 @@ void bluetoothWriteString(const char * str)
bluetoothWriteWakeup(); bluetoothWriteWakeup();
} }
char * bluetoothReadline(bool error_reset) char * Bluetooth::readline(bool error_reset)
{ {
uint8_t byte; uint8_t byte;
@ -78,15 +70,15 @@ char * bluetoothReadline(bool error_reset)
TRACE_NOCRLF("%02X ", byte); TRACE_NOCRLF("%02X ", byte);
#if 0 #if 0
if (error_reset && byte == 'R' && bluetoothBufferIndex == 4 && memcmp(bluetoothBuffer, "ERRO", 4)) { if (error_reset && byte == 'R' && bufferIndex == 4 && memcmp(buffer, "ERRO", 4)) {
#if defined(PCBX9E) // X9E enter BT reset loop if following code is implemented #if defined(PCBX9E) // X9E enter BT reset loop if following code is implemented
TRACE("BT Error..."); TRACE("BT Error...");
#else #else
TRACE("BT Reset..."); TRACE("BT Reset...");
bluetoothBufferIndex = 0; bufferIndex = 0;
bluetoothDone(); bluetoothDone();
bluetoothState = BLUETOOTH_STATE_OFF; state = BLUETOOTH_STATE_OFF;
bluetoothWakeupTime = get_tmr10ms() + 100; /* 1s */ wakeupTime = get_tmr10ms() + 100; /* 1s */
#endif #endif
return NULL; return NULL;
} }
@ -94,70 +86,70 @@ char * bluetoothReadline(bool error_reset)
#endif #endif
if (byte == '\n') { if (byte == '\n') {
if (bluetoothBufferIndex > 2 && bluetoothBuffer[bluetoothBufferIndex-1] == '\r') { if (bufferIndex > 2 && buffer[bufferIndex-1] == '\r') {
bluetoothBuffer[bluetoothBufferIndex-1] = '\0'; buffer[bufferIndex-1] = '\0';
bluetoothBufferIndex = 0; bufferIndex = 0;
TRACE("BT< %s", bluetoothBuffer); TRACE("BT< %s", buffer);
if (error_reset && !strcmp((char *)bluetoothBuffer, "ERROR")) { if (error_reset && !strcmp((char *)buffer, "ERROR")) {
#if defined(PCBX9E) // X9E enter BT reset loop if following code is implemented #if defined(PCBX9E) // X9E enter BT reset loop if following code is implemented
TRACE("BT Error..."); TRACE("BT Error...");
#else #else
TRACE("BT Reset..."); TRACE("BT Reset...");
bluetoothDone(); bluetoothDone();
bluetoothState = BLUETOOTH_STATE_OFF; state = BLUETOOTH_STATE_OFF;
bluetoothWakeupTime = get_tmr10ms() + 100; /* 1s */ wakeupTime = get_tmr10ms() + 100; /* 1s */
#endif #endif
return nullptr; return nullptr;
} }
else { else {
if (!memcmp(bluetoothBuffer, "Central:", 8)) if (!memcmp(buffer, "Central:", 8))
strcpy(bluetoothLocalAddr, (char *) bluetoothBuffer + 8); strcpy(localAddr, (char *) buffer + 8);
else if (!memcmp(bluetoothBuffer, "Peripheral:", 11)) else if (!memcmp(buffer, "Peripheral:", 11))
strcpy(bluetoothLocalAddr, (char *) bluetoothBuffer + 11); strcpy(localAddr, (char *) buffer + 11);
return (char *) bluetoothBuffer; return (char *) buffer;
} }
} }
else { else {
bluetoothBufferIndex = 0; bufferIndex = 0;
} }
} }
else { else {
bluetoothBuffer[bluetoothBufferIndex++] = byte; buffer[bufferIndex++] = byte;
bluetoothBufferIndex &= (BLUETOOTH_LINE_LENGTH-1); bufferIndex &= (BLUETOOTH_LINE_LENGTH-1);
} }
} }
} }
void bluetoothProcessTrainerFrame(const uint8_t * bluetoothBuffer) void Bluetooth::processTrainerFrame(const uint8_t * buffer)
{ {
TRACE(""); TRACE("");
for (uint8_t channel=0, i=1; channel<8; channel+=2, i+=3) { for (uint8_t channel=0, i=1; channel<8; channel+=2, i+=3) {
// +-500 != 512, but close enough. // +-500 != 512, but close enough.
ppmInput[channel] = bluetoothBuffer[i] + ((bluetoothBuffer[i+1] & 0xf0) << 4) - 1500; ppmInput[channel] = buffer[i] + ((buffer[i+1] & 0xf0) << 4) - 1500;
ppmInput[channel+1] = ((bluetoothBuffer[i+1] & 0x0f) << 4) + ((bluetoothBuffer[i+2] & 0xf0) >> 4) + ((bluetoothBuffer[i+2] & 0x0f) << 8) - 1500; ppmInput[channel+1] = ((buffer[i+1] & 0x0f) << 4) + ((buffer[i+2] & 0xf0) >> 4) + ((buffer[i+2] & 0x0f) << 8) - 1500;
} }
ppmInputValidityTimer = PPM_IN_VALID_TIMEOUT; ppmInputValidityTimer = PPM_IN_VALID_TIMEOUT;
} }
void bluetoothAppendTrainerByte(uint8_t data) void Bluetooth::appendTrainerByte(uint8_t data)
{ {
if (bluetoothBufferIndex < BLUETOOTH_LINE_LENGTH) { if (bufferIndex < BLUETOOTH_LINE_LENGTH) {
bluetoothBuffer[bluetoothBufferIndex++] = data; buffer[bufferIndex++] = data;
// we check for "DisConnected", but the first byte could be altered (if received in state STATE_DATA_XOR) // we check for "DisConnected", but the first byte could be altered (if received in state STATE_DATA_XOR)
if (data == '\n') { if (data == '\n') {
if (!strncmp((char *)&bluetoothBuffer[bluetoothBufferIndex-13], "isConnected", 11)) { if (!strncmp((char *)&buffer[bufferIndex-13], "isConnected", 11)) {
TRACE("BT< DisConnected"); TRACE("BT< DisConnected");
bluetoothState = BLUETOOTH_STATE_DISCONNECTED; state = BLUETOOTH_STATE_DISCONNECTED;
bluetoothBufferIndex = 0; bufferIndex = 0;
bluetoothWakeupTime += 200; // 1s wakeupTime += 200; // 1s
} }
} }
} }
} }
void bluetoothProcessTrainerByte(uint8_t data) void Bluetooth::processTrainerByte(uint8_t data)
{ {
static uint8_t dataState = STATE_DATA_IDLE; static uint8_t dataState = STATE_DATA_IDLE;
@ -165,10 +157,10 @@ void bluetoothProcessTrainerByte(uint8_t data)
case STATE_DATA_START: case STATE_DATA_START:
if (data == START_STOP) { if (data == START_STOP) {
dataState = STATE_DATA_IN_FRAME ; dataState = STATE_DATA_IN_FRAME ;
bluetoothBufferIndex = 0; bufferIndex = 0;
} }
else { else {
bluetoothAppendTrainerByte(data); appendTrainerByte(data);
} }
break; break;
@ -178,99 +170,98 @@ void bluetoothProcessTrainerByte(uint8_t data)
} }
else if (data == START_STOP) { else if (data == START_STOP) {
dataState = STATE_DATA_IN_FRAME ; dataState = STATE_DATA_IN_FRAME ;
bluetoothBufferIndex = 0; bufferIndex = 0;
} }
else { else {
bluetoothAppendTrainerByte(data); appendTrainerByte(data);
} }
break; break;
case STATE_DATA_XOR: case STATE_DATA_XOR:
bluetoothAppendTrainerByte(data ^ STUFF_MASK); appendTrainerByte(data ^ STUFF_MASK);
dataState = STATE_DATA_IN_FRAME; dataState = STATE_DATA_IN_FRAME;
break; break;
case STATE_DATA_IDLE: case STATE_DATA_IDLE:
if (data == START_STOP) { if (data == START_STOP) {
bluetoothBufferIndex = 0; bufferIndex = 0;
dataState = STATE_DATA_START; dataState = STATE_DATA_START;
} }
else { else {
bluetoothAppendTrainerByte(data); appendTrainerByte(data);
} }
break; break;
} }
if (bluetoothBufferIndex >= BLUETOOTH_PACKET_SIZE) { if (bufferIndex >= BLUETOOTH_PACKET_SIZE) {
uint8_t crc = 0x00; uint8_t crc = 0x00;
for (int i=0; i<13; i++) { for (int i=0; i<13; i++) {
crc ^= bluetoothBuffer[i]; crc ^= buffer[i];
} }
if (crc == bluetoothBuffer[13]) { if (crc == buffer[13]) {
if (bluetoothBuffer[0] == 0x80) { if (buffer[0] == 0x80) {
bluetoothProcessTrainerFrame(bluetoothBuffer); processTrainerFrame(buffer);
} }
} }
dataState = STATE_DATA_IDLE; dataState = STATE_DATA_IDLE;
} }
} }
uint8_t bluetoothCrc; void Bluetooth::pushByte(uint8_t byte)
void bluetoothPushByte(uint8_t byte)
{ {
bluetoothCrc ^= byte; crc ^= byte;
if (byte == START_STOP || byte == BYTESTUFF) { if (byte == START_STOP || byte == BYTESTUFF) {
bluetoothBuffer[bluetoothBufferIndex++] = 0x7d; buffer[bufferIndex++] = 0x7d;
byte ^= STUFF_MASK; byte ^= STUFF_MASK;
} }
bluetoothBuffer[bluetoothBufferIndex++] = byte; buffer[bufferIndex++] = byte;
} }
void bluetoothSendTrainer() void Bluetooth::sendTrainer()
{ {
int16_t PPM_range = g_model.extendedLimits ? 640*2 : 512*2; int16_t PPM_range = g_model.extendedLimits ? 640*2 : 512*2;
int firstCh = g_model.trainerData.channelsStart; int firstCh = g_model.trainerData.channelsStart;
int lastCh = firstCh + 8; int lastCh = firstCh + 8;
uint8_t * cur = bluetoothBuffer; uint8_t * cur = buffer;
bluetoothBufferIndex = 0; bufferIndex = 0;
bluetoothCrc = 0x00; crc = 0x00;
bluetoothBuffer[bluetoothBufferIndex++] = START_STOP; // start byte buffer[bufferIndex++] = START_STOP; // start byte
bluetoothPushByte(0x80); // trainer frame type? pushByte(0x80); // trainer frame type?
for (int channel=0; channel<lastCh; channel+=2, cur+=3) { for (int channel=0; channel<lastCh; channel+=2, cur+=3) {
uint16_t channelValue1 = PPM_CH_CENTER(channel) + limit((int16_t)-PPM_range, channelOutputs[channel], (int16_t)PPM_range) / 2; uint16_t channelValue1 = PPM_CH_CENTER(channel) + limit((int16_t)-PPM_range, channelOutputs[channel], (int16_t)PPM_range) / 2;
uint16_t channelValue2 = PPM_CH_CENTER(channel+1) + limit((int16_t)-PPM_range, channelOutputs[channel+1], (int16_t)PPM_range) / 2; uint16_t channelValue2 = PPM_CH_CENTER(channel+1) + limit((int16_t)-PPM_range, channelOutputs[channel+1], (int16_t)PPM_range) / 2;
bluetoothPushByte(channelValue1 & 0x00ff); pushByte(channelValue1 & 0x00ff);
bluetoothPushByte(((channelValue1 & 0x0f00) >> 4) + ((channelValue2 & 0x00f0) >> 4)); pushByte(((channelValue1 & 0x0f00) >> 4) + ((channelValue2 & 0x00f0) >> 4));
bluetoothPushByte(((channelValue2 & 0x000f) << 4) + ((channelValue2 & 0x0f00) >> 8)); pushByte(((channelValue2 & 0x000f) << 4) + ((channelValue2 & 0x0f00) >> 8));
} }
bluetoothBuffer[bluetoothBufferIndex++] = bluetoothCrc; buffer[bufferIndex++] = crc;
bluetoothBuffer[bluetoothBufferIndex++] = START_STOP; // end byte buffer[bufferIndex++] = START_STOP; // end byte
bluetoothWrite(bluetoothBuffer, bluetoothBufferIndex); write(buffer, bufferIndex);
bluetoothBufferIndex = 0; bufferIndex = 0;
} }
void bluetoothForwardTelemetry(const uint8_t * packet) void Bluetooth::forwardTelemetry(const uint8_t * packet)
{ {
bluetoothCrc = 0x00; crc = 0x00;
bluetoothBuffer[bluetoothBufferIndex++] = START_STOP; // start byte buffer[bufferIndex++] = START_STOP; // start byte
for (uint8_t i=0; i<sizeof(SportTelemetryPacket); i++) { for (uint8_t i=0; i<sizeof(SportTelemetryPacket); i++) {
bluetoothPushByte(packet[i]); pushByte(packet[i]);
} }
bluetoothBuffer[bluetoothBufferIndex++] = bluetoothCrc; buffer[bufferIndex++] = crc;
bluetoothBuffer[bluetoothBufferIndex++] = START_STOP; // end byte buffer[bufferIndex++] = START_STOP; // end byte
if (bluetoothBufferIndex >= 2*FRSKY_SPORT_PACKET_SIZE) { if (bufferIndex >= 2*FRSKY_SPORT_PACKET_SIZE) {
bluetoothWrite(bluetoothBuffer, bluetoothBufferIndex); write(buffer, bufferIndex);
bluetoothBufferIndex = 0; bufferIndex = 0;
} }
} }
void bluetoothReceiveTrainer() void Bluetooth::receiveTrainer()
{ {
uint8_t byte; uint8_t byte;
@ -281,25 +272,25 @@ void bluetoothReceiveTrainer()
TRACE_NOCRLF("%02X ", byte); TRACE_NOCRLF("%02X ", byte);
bluetoothProcessTrainerByte(byte); processTrainerByte(byte);
} }
} }
#if defined(PCBX9E) && !defined(USEHORUSBT) #if defined(PCBX9E) && !defined(USEHORUSBT)
void bluetoothWakeup(void) void Bluetooth::wakeup(void)
{ {
#if !defined(SIMU) #if !defined(SIMU)
if (!g_eeGeneral.bluetoothMode) { if (!g_eeGeneral.bluetoothMode) {
if (bluetoothState != BLUETOOTH_INIT) { if (state != BLUETOOTH_INIT) {
bluetoothDone(); bluetoothDone();
bluetoothState = BLUETOOTH_INIT; state = BLUETOOTH_INIT;
} }
} }
else { else {
static tmr10ms_t waitEnd = 0; static tmr10ms_t waitEnd = 0;
if (bluetoothState != BLUETOOTH_STATE_IDLE) { if (state != BLUETOOTH_STATE_IDLE) {
if (bluetoothState == BLUETOOTH_INIT) { if (state == BLUETOOTH_INIT) {
bluetoothInit(BLUETOOTH_DEFAULT_BAUDRATE); bluetoothInit(BLUETOOTH_DEFAULT_BAUDRATE);
char command[32]; char command[32];
char * cur = strAppend(command, BLUETOOTH_COMMAND_NAME); char * cur = strAppend(command, BLUETOOTH_COMMAND_NAME);
@ -313,43 +304,43 @@ void bluetoothWakeup(void)
cur = strAppend(cur, "Taranis-X9E"); cur = strAppend(cur, "Taranis-X9E");
} }
strAppend(cur, "\r\n"); strAppend(cur, "\r\n");
bluetoothWriteString(command); writeString(command);
bluetoothState = BLUETOOTH_WAIT_TTM; state = BLUETOOTH_WAIT_TTM;
waitEnd = get_tmr10ms() + 25; // 250ms waitEnd = get_tmr10ms() + 25; // 250ms
} }
else if (bluetoothState == BLUETOOTH_WAIT_TTM) { else if (state == BLUETOOTH_WAIT_TTM) {
if (get_tmr10ms() > waitEnd) { if (get_tmr10ms() > waitEnd) {
char * line = bluetoothReadline(); char * line = readline();
if (strncmp(line, "OK+", 3)) { if (strncmp(line, "OK+", 3)) {
bluetoothState = BLUETOOTH_STATE_IDLE; state = BLUETOOTH_STATE_IDLE;
} }
else { else {
bluetoothInit(BLUETOOTH_FACTORY_BAUDRATE); bluetoothInit(BLUETOOTH_FACTORY_BAUDRATE);
const char btMessage[] = "TTM:BPS-115200"; const char btMessage[] = "TTM:BPS-115200";
bluetoothWriteString(btMessage); writeString(btMessage);
bluetoothState = BLUETOOTH_WAIT_BAUDRATE_CHANGE; state = BLUETOOTH_WAIT_BAUDRATE_CHANGE;
waitEnd = get_tmr10ms() + 250; // 2.5s waitEnd = get_tmr10ms() + 250; // 2.5s
} }
} }
} }
else if (bluetoothState == BLUETOOTH_WAIT_BAUDRATE_CHANGE) { else if (state == BLUETOOTH_WAIT_BAUDRATE_CHANGE) {
if (get_tmr10ms() > waitEnd) { if (get_tmr10ms() > waitEnd) {
bluetoothState = BLUETOOTH_INIT; state = BLUETOOTH_INIT;
} }
} }
} }
else if (IS_BLUETOOTH_TRAINER()){ else if (IS_BLUETOOTH_TRAINER()){
bluetoothState = BLUETOOTH_STATE_CONNECTED; state = BLUETOOTH_STATE_CONNECTED;
bluetoothWriteWakeup(); bluetoothWriteWakeup();
bluetoothSendTrainer(); sendTrainer();
} }
} }
#endif #endif
} }
#else // PCBX9E #else // PCBX9E
void bluetoothWakeup() void Bluetooth::wakeup()
{ {
if (bluetoothState != BLUETOOTH_STATE_OFF) { if (state != BLUETOOTH_STATE_OFF) {
bluetoothWriteWakeup(); bluetoothWriteWakeup();
if (bluetoothIsWriting()) { if (bluetoothIsWriting()) {
return; return;
@ -358,49 +349,49 @@ void bluetoothWakeup()
tmr10ms_t now = get_tmr10ms(); tmr10ms_t now = get_tmr10ms();
if (now < bluetoothWakeupTime) if (now < wakeupTime)
return; return;
bluetoothWakeupTime = now + 5; /* 50ms default */ wakeupTime = now + 5; /* 50ms default */
if (g_eeGeneral.bluetoothMode == BLUETOOTH_OFF || (g_eeGeneral.bluetoothMode == BLUETOOTH_TRAINER && !IS_BLUETOOTH_TRAINER())) { if (g_eeGeneral.bluetoothMode == BLUETOOTH_OFF || (g_eeGeneral.bluetoothMode == BLUETOOTH_TRAINER && !IS_BLUETOOTH_TRAINER())) {
if (bluetoothState != BLUETOOTH_STATE_OFF) { if (state != BLUETOOTH_STATE_OFF) {
bluetoothDone(); bluetoothDone();
bluetoothState = BLUETOOTH_STATE_OFF; state = BLUETOOTH_STATE_OFF;
} }
bluetoothWakeupTime = now + 10; /* 100ms */ wakeupTime = now + 10; /* 100ms */
} }
else if (bluetoothState == BLUETOOTH_STATE_OFF) { else if (state == BLUETOOTH_STATE_OFF) {
bluetoothInit(BLUETOOTH_FACTORY_BAUDRATE); bluetoothInit(BLUETOOTH_FACTORY_BAUDRATE);
bluetoothState = BLUETOOTH_STATE_FACTORY_BAUDRATE_INIT; state = BLUETOOTH_STATE_FACTORY_BAUDRATE_INIT;
} }
if (bluetoothState == BLUETOOTH_STATE_FACTORY_BAUDRATE_INIT) { if (state == BLUETOOTH_STATE_FACTORY_BAUDRATE_INIT) {
bluetoothWriteString("AT+BAUD4\r\n"); writeString("AT+BAUD4\r\n");
bluetoothState = BLUETOOTH_STATE_BAUDRATE_SENT; state = BLUETOOTH_STATE_BAUDRATE_SENT;
bluetoothWakeupTime = now + 10; /* 100ms */ wakeupTime = now + 10; /* 100ms */
} }
else if (bluetoothState == BLUETOOTH_STATE_BAUDRATE_SENT) { else if (state == BLUETOOTH_STATE_BAUDRATE_SENT) {
bluetoothInit(BLUETOOTH_DEFAULT_BAUDRATE); bluetoothInit(BLUETOOTH_DEFAULT_BAUDRATE);
bluetoothState = BLUETOOTH_STATE_BAUDRATE_INIT; state = BLUETOOTH_STATE_BAUDRATE_INIT;
bluetoothReadline(false); readline(false);
bluetoothWakeupTime = now + 10; /* 100ms */ wakeupTime = now + 10; /* 100ms */
} }
else if (bluetoothState == BLUETOOTH_STATE_CONNECTED) { else if (state == BLUETOOTH_STATE_CONNECTED) {
if (g_eeGeneral.bluetoothMode == BLUETOOTH_TRAINER && g_model.trainerData.mode == TRAINER_MODE_MASTER_BLUETOOTH) { if (g_eeGeneral.bluetoothMode == BLUETOOTH_TRAINER && g_model.trainerData.mode == TRAINER_MODE_MASTER_BLUETOOTH) {
bluetoothReceiveTrainer(); receiveTrainer();
} }
else { else {
if (g_eeGeneral.bluetoothMode == BLUETOOTH_TRAINER && g_model.trainerData.mode == TRAINER_MODE_SLAVE_BLUETOOTH) { if (g_eeGeneral.bluetoothMode == BLUETOOTH_TRAINER && g_model.trainerData.mode == TRAINER_MODE_SLAVE_BLUETOOTH) {
bluetoothSendTrainer(); sendTrainer();
bluetoothWakeupTime = now + 2; /* 20ms */ wakeupTime = now + 2; /* 20ms */
} }
bluetoothReadline(); // to deal with "ERROR" readline(); // to deal with "ERROR"
} }
} }
else { else {
char * line = bluetoothReadline(); char * line = readline();
if (bluetoothState == BLUETOOTH_STATE_BAUDRATE_INIT) { if (state == BLUETOOTH_STATE_BAUDRATE_INIT) {
char command[32]; char command[32];
char * cur = strAppend(command, BLUETOOTH_COMMAND_NAME); char * cur = strAppend(command, BLUETOOTH_COMMAND_NAME);
uint8_t len = ZLEN(g_eeGeneral.bluetoothName); uint8_t len = ZLEN(g_eeGeneral.bluetoothName);
@ -417,57 +408,57 @@ void bluetoothWakeup()
#endif #endif
} }
strAppend(cur, "\r\n"); strAppend(cur, "\r\n");
bluetoothWriteString(command); writeString(command);
bluetoothState = BLUETOOTH_STATE_NAME_SENT; state = BLUETOOTH_STATE_NAME_SENT;
} }
else if (bluetoothState == BLUETOOTH_STATE_NAME_SENT && (!strncmp(line, "OK+", 3) || !strncmp(line, "Central:", 8) || !strncmp(line, "Peripheral:", 11))) { else if (state == BLUETOOTH_STATE_NAME_SENT && (!strncmp(line, "OK+", 3) || !strncmp(line, "Central:", 8) || !strncmp(line, "Peripheral:", 11))) {
bluetoothWriteString("AT+TXPW0\r\n"); writeString("AT+TXPW0\r\n");
bluetoothState = BLUETOOTH_STATE_POWER_SENT; state = BLUETOOTH_STATE_POWER_SENT;
} }
else if (bluetoothState == BLUETOOTH_STATE_POWER_SENT && (!strncmp(line, "Central:", 8) || !strncmp(line, "Peripheral:", 11))) { else if (state == BLUETOOTH_STATE_POWER_SENT && (!strncmp(line, "Central:", 8) || !strncmp(line, "Peripheral:", 11))) {
if (g_eeGeneral.bluetoothMode == BLUETOOTH_TRAINER && g_model.trainerData.mode == TRAINER_MODE_MASTER_BLUETOOTH) if (g_eeGeneral.bluetoothMode == BLUETOOTH_TRAINER && g_model.trainerData.mode == TRAINER_MODE_MASTER_BLUETOOTH)
bluetoothWriteString("AT+ROLE1\r\n"); writeString("AT+ROLE1\r\n");
else else
bluetoothWriteString("AT+ROLE0\r\n"); writeString("AT+ROLE0\r\n");
bluetoothState = BLUETOOTH_STATE_ROLE_SENT; state = BLUETOOTH_STATE_ROLE_SENT;
} }
else if (bluetoothState == BLUETOOTH_STATE_ROLE_SENT && (!strncmp(line, "Central:", 8) || !strncmp(line, "Peripheral:", 11))) { else if (state == BLUETOOTH_STATE_ROLE_SENT && (!strncmp(line, "Central:", 8) || !strncmp(line, "Peripheral:", 11))) {
bluetoothState = BLUETOOTH_STATE_IDLE; state = BLUETOOTH_STATE_IDLE;
} }
else if (bluetoothState == BLUETOOTH_STATE_DISCOVER_REQUESTED) { else if (state == BLUETOOTH_STATE_DISCOVER_REQUESTED) {
bluetoothWriteString("AT+DISC?\r\n"); writeString("AT+DISC?\r\n");
bluetoothState = BLUETOOTH_STATE_DISCOVER_SENT; state = BLUETOOTH_STATE_DISCOVER_SENT;
} }
else if (bluetoothState == BLUETOOTH_STATE_DISCOVER_SENT && !strcmp(line, "OK+DISCS")) { else if (state == BLUETOOTH_STATE_DISCOVER_SENT && !strcmp(line, "OK+DISCS")) {
bluetoothState = BLUETOOTH_STATE_DISCOVER_START; state = BLUETOOTH_STATE_DISCOVER_START;
} }
else if (bluetoothState == BLUETOOTH_STATE_DISCOVER_START && !strncmp(line, "OK+DISC:", 8)) { else if (state == BLUETOOTH_STATE_DISCOVER_START && !strncmp(line, "OK+DISC:", 8)) {
if (strlen(line) < 8 + LEN_BLUETOOTH_ADDR && reusableBuffer.moduleSetup.bt.devicesCount < MAX_BLUETOOTH_DISTANT_ADDR) { if (strlen(line) < 8 + LEN_BLUETOOTH_ADDR && reusableBuffer.moduleSetup.bt.devicesCount < MAX_BLUETOOTH_DISTANT_ADDR) {
strncpy(reusableBuffer.moduleSetup.bt.devices[reusableBuffer.moduleSetup.bt.devicesCount], &line[8], LEN_BLUETOOTH_ADDR); strncpy(reusableBuffer.moduleSetup.bt.devices[reusableBuffer.moduleSetup.bt.devicesCount], &line[8], LEN_BLUETOOTH_ADDR);
++reusableBuffer.moduleSetup.bt.devicesCount; ++reusableBuffer.moduleSetup.bt.devicesCount;
} }
} }
/* else if (bluetoothState == BLUETOOTH_STATE_DISCOVER_START && !strcmp(line, "OK+DISCE")) { /* else if (state == BLUETOOTH_STATE_DISCOVER_START && !strcmp(line, "OK+DISCE")) {
bluetoothState = BLUETOOTH_STATE_DISCOVER_END; state = BLUETOOTH_STATE_DISCOVER_END;
} */ } */
else if (bluetoothState == BLUETOOTH_STATE_BIND_REQUESTED) { else if (state == BLUETOOTH_STATE_BIND_REQUESTED) {
char command[32]; char command[32];
strAppend(strAppend(strAppend(command, "AT+CON"), bluetoothDistantAddr), "\r\n"); strAppend(strAppend(strAppend(command, "AT+CON"), distantAddr), "\r\n");
bluetoothWriteString(command); writeString(command);
bluetoothState = BLUETOOTH_STATE_CONNECT_SENT; state = BLUETOOTH_STATE_CONNECT_SENT;
} }
else if ((bluetoothState == BLUETOOTH_STATE_IDLE || bluetoothState == BLUETOOTH_STATE_DISCONNECTED || bluetoothState == BLUETOOTH_STATE_CONNECT_SENT) && !strncmp(line, "Connected:", 10)) { else if ((state == BLUETOOTH_STATE_IDLE || state == BLUETOOTH_STATE_DISCONNECTED || state == BLUETOOTH_STATE_CONNECT_SENT) && !strncmp(line, "Connected:", 10)) {
strcpy(bluetoothDistantAddr, &line[10]); // TODO quick & dirty strcpy(distantAddr, &line[10]); // TODO quick & dirty
bluetoothState = BLUETOOTH_STATE_CONNECTED; state = BLUETOOTH_STATE_CONNECTED;
if (g_model.trainerData.mode == TRAINER_MODE_SLAVE_BLUETOOTH) { if (g_model.trainerData.mode == TRAINER_MODE_SLAVE_BLUETOOTH) {
bluetoothWakeupTime += 500; // it seems a 5s delay is needed before sending the 1st frame wakeupTime += 500; // it seems a 5s delay is needed before sending the 1st frame
} }
} }
else if (bluetoothState == BLUETOOTH_STATE_DISCONNECTED && !line) { else if (state == BLUETOOTH_STATE_DISCONNECTED && !line) {
char command[32]; char command[32];
strAppend(strAppend(strAppend(command, "AT+CON"), bluetoothDistantAddr), "\r\n"); strAppend(strAppend(strAppend(command, "AT+CON"), distantAddr), "\r\n");
bluetoothWriteString(command); writeString(command);
bluetoothWakeupTime = now + 200; /* 2s */ wakeupTime = now + 200; /* 2s */
} }
} }
} }

76
radio/src/bluetooth.h
View file

@ -20,37 +20,59 @@
enum BluetoothStates { enum BluetoothStates {
#if defined(PCBX9E) && !defined(USEHORUSBT) #if defined(PCBX9E) && !defined(USEHORUSBT)
BLUETOOTH_INIT, BLUETOOTH_INIT,
BLUETOOTH_WAIT_TTM, BLUETOOTH_WAIT_TTM,
BLUETOOTH_WAIT_BAUDRATE_CHANGE, BLUETOOTH_WAIT_BAUDRATE_CHANGE,
#endif #endif
BLUETOOTH_STATE_OFF, BLUETOOTH_STATE_OFF,
BLUETOOTH_STATE_FACTORY_BAUDRATE_INIT, BLUETOOTH_STATE_FACTORY_BAUDRATE_INIT,
BLUETOOTH_STATE_BAUDRATE_SENT, BLUETOOTH_STATE_BAUDRATE_SENT,
BLUETOOTH_STATE_BAUDRATE_INIT, BLUETOOTH_STATE_BAUDRATE_INIT,
BLUETOOTH_STATE_NAME_SENT, BLUETOOTH_STATE_NAME_SENT,
BLUETOOTH_STATE_POWER_SENT, BLUETOOTH_STATE_POWER_SENT,
BLUETOOTH_STATE_ROLE_SENT, BLUETOOTH_STATE_ROLE_SENT,
BLUETOOTH_STATE_IDLE, BLUETOOTH_STATE_IDLE,
BLUETOOTH_STATE_DISCOVER_REQUESTED, BLUETOOTH_STATE_DISCOVER_REQUESTED,
BLUETOOTH_STATE_DISCOVER_SENT, BLUETOOTH_STATE_DISCOVER_SENT,
BLUETOOTH_STATE_DISCOVER_START, BLUETOOTH_STATE_DISCOVER_START,
BLUETOOTH_STATE_DISCOVER_END, BLUETOOTH_STATE_DISCOVER_END,
BLUETOOTH_STATE_BIND_REQUESTED, BLUETOOTH_STATE_BIND_REQUESTED,
BLUETOOTH_STATE_CONNECT_SENT, BLUETOOTH_STATE_CONNECT_SENT,
BLUETOOTH_STATE_CONNECTED, BLUETOOTH_STATE_CONNECTED,
BLUETOOTH_STATE_DISCONNECTED, BLUETOOTH_STATE_DISCONNECTED,
BLUETOOTH_STATE_FIRMWARE_UGRADE BLUETOOTH_STATE_FIRMWARE_UGRADE
}; };
#define LEN_BLUETOOTH_ADDR 16 #define LEN_BLUETOOTH_ADDR 16
#define MAX_BLUETOOTH_DISTANT_ADDR 6 #define MAX_BLUETOOTH_DISTANT_ADDR 6
#define BLUETOOTH_PACKET_SIZE 14
#define BLUETOOTH_LINE_LENGTH 32
extern volatile uint8_t bluetoothState; class Bluetooth
extern char bluetoothLocalAddr[LEN_BLUETOOTH_ADDR+1]; {
extern char bluetoothDistantAddr[LEN_BLUETOOTH_ADDR+1]; public:
void write(const uint8_t * data, uint8_t length);
void writeString(const char * str);
char * readline(bool error_reset = true);
char * bluetoothReadline(bool error_reset=true); void processTrainerFrame(const uint8_t * buffer);
void bluetoothWriteString(const char * command); void appendTrainerByte(uint8_t data);
void bluetoothForwardTelemetry(const uint8_t * packet); void processTrainerByte(uint8_t data);
void bluetoothWakeup(); void pushByte(uint8_t byte);
void sendTrainer();
void forwardTelemetry(const uint8_t * packet);
void receiveTrainer();
void wakeup();
volatile uint8_t state;
char localAddr[LEN_BLUETOOTH_ADDR+1];
char distantAddr[LEN_BLUETOOTH_ADDR+1];
protected:
uint8_t buffer[BLUETOOTH_LINE_LENGTH+1];
uint8_t bufferIndex = 0;
tmr10ms_t wakeupTime = 0;
uint8_t crc;
};
extern Bluetooth bluetooth;

46
radio/src/gui/128x64/model_setup.cpp
View file

@ -201,8 +201,8 @@ enum MenuModelSetupItems {
#if defined(PCBX7) || defined(PCBX3) #if defined(PCBX7) || defined(PCBX3)
#define ANTENNA_ROW #define ANTENNA_ROW
#if defined(BLUETOOTH) #if defined(BLUETOOTH)
#define TRAINER_BLUETOOTH_M_ROW ((bluetoothDistantAddr[0] == '\0' || bluetoothState == BLUETOOTH_STATE_CONNECTED) ? (uint8_t)0 : (uint8_t)1) #define TRAINER_BLUETOOTH_M_ROW ((bluetooth.distantAddr[0] == '\0' || bluetooth.state == BLUETOOTH_STATE_CONNECTED) ? (uint8_t)0 : (uint8_t)1)
#define TRAINER_BLUETOOTH_S_ROW (bluetoothDistantAddr[0] == '\0' ? HIDDEN_ROW : LABEL()) #define TRAINER_BLUETOOTH_S_ROW (bluetooth.distantAddr[0] == '\0' ? HIDDEN_ROW : LABEL())
#define TRAINER_BLUETOOTH_ROW (g_model.trainerData.mode == TRAINER_MODE_MASTER_BLUETOOTH ? TRAINER_BLUETOOTH_M_ROW : (g_model.trainerData.mode == TRAINER_MODE_SLAVE_BLUETOOTH ? TRAINER_BLUETOOTH_S_ROW : HIDDEN_ROW)), #define TRAINER_BLUETOOTH_ROW (g_model.trainerData.mode == TRAINER_MODE_MASTER_BLUETOOTH ? TRAINER_BLUETOOTH_M_ROW : (g_model.trainerData.mode == TRAINER_MODE_SLAVE_BLUETOOTH ? TRAINER_BLUETOOTH_S_ROW : HIDDEN_ROW)),
#else #else
#define TRAINER_BLUETOOTH_ROW #define TRAINER_BLUETOOTH_ROW
@ -213,8 +213,8 @@ enum MenuModelSetupItems {
#elif defined(PCBXLITES) #elif defined(PCBXLITES)
#define ANTENNA_ROW IF_NOT_PXX2_MODULE(INTERNAL_MODULE, IF_INTERNAL_MODULE_ON(0)), #define ANTENNA_ROW IF_NOT_PXX2_MODULE(INTERNAL_MODULE, IF_INTERNAL_MODULE_ON(0)),
#define IF_BT_TRAINER_ON(x) (g_eeGeneral.bluetoothMode == BLUETOOTH_TRAINER ? (uint8_t)(x) : HIDDEN_ROW) #define IF_BT_TRAINER_ON(x) (g_eeGeneral.bluetoothMode == BLUETOOTH_TRAINER ? (uint8_t)(x) : HIDDEN_ROW)
#define TRAINER_BLUETOOTH_M_ROW ((bluetoothDistantAddr[0] == '\0' || bluetoothState == BLUETOOTH_STATE_CONNECTED) ? (uint8_t)0 : (uint8_t)1) #define TRAINER_BLUETOOTH_M_ROW ((bluetooth.distantAddr[0] == '\0' || bluetooth.state == BLUETOOTH_STATE_CONNECTED) ? (uint8_t)0 : (uint8_t)1)
#define TRAINER_BLUETOOTH_S_ROW (bluetoothDistantAddr[0] == '\0' ? HIDDEN_ROW : LABEL()) #define TRAINER_BLUETOOTH_S_ROW (bluetooth.distantAddr[0] == '\0' ? HIDDEN_ROW : LABEL())
#define TRAINER_BLUETOOTH_ROW (g_model.trainerData.mode == TRAINER_MODE_MASTER_BLUETOOTH ? TRAINER_BLUETOOTH_M_ROW : (g_model.trainerData.mode == TRAINER_MODE_SLAVE_BLUETOOTH ? TRAINER_BLUETOOTH_S_ROW : HIDDEN_ROW)) #define TRAINER_BLUETOOTH_ROW (g_model.trainerData.mode == TRAINER_MODE_MASTER_BLUETOOTH ? TRAINER_BLUETOOTH_M_ROW : (g_model.trainerData.mode == TRAINER_MODE_SLAVE_BLUETOOTH ? TRAINER_BLUETOOTH_S_ROW : HIDDEN_ROW))
#define TRAINER_CHANNELS_ROW (IS_SLAVE_TRAINER() ? (uint8_t)1 : HIDDEN_ROW) #define TRAINER_CHANNELS_ROW (IS_SLAVE_TRAINER() ? (uint8_t)1 : HIDDEN_ROW)
#define TRAINER_PARAMS_ROW (IS_SLAVE_TRAINER() ? (uint8_t)2 : HIDDEN_ROW) #define TRAINER_PARAMS_ROW (IS_SLAVE_TRAINER() ? (uint8_t)2 : HIDDEN_ROW)
@ -222,8 +222,8 @@ enum MenuModelSetupItems {
#elif defined(PCBXLITE) #elif defined(PCBXLITE)
#define ANTENNA_ROW IF_NOT_PXX2_MODULE(INTERNAL_MODULE, IF_INTERNAL_MODULE_ON(0)), #define ANTENNA_ROW IF_NOT_PXX2_MODULE(INTERNAL_MODULE, IF_INTERNAL_MODULE_ON(0)),
#define IF_BT_TRAINER_ON(x) (g_eeGeneral.bluetoothMode == BLUETOOTH_TRAINER ? (uint8_t)(x) : HIDDEN_ROW) #define IF_BT_TRAINER_ON(x) (g_eeGeneral.bluetoothMode == BLUETOOTH_TRAINER ? (uint8_t)(x) : HIDDEN_ROW)
#define TRAINER_BLUETOOTH_M_ROW ((bluetoothDistantAddr[0] == '\0' || bluetoothState == BLUETOOTH_STATE_CONNECTED) ? (uint8_t)0 : (uint8_t)1) #define TRAINER_BLUETOOTH_M_ROW ((bluetooth.distantAddr[0] == '\0' || bluetooth.state == BLUETOOTH_STATE_CONNECTED) ? (uint8_t)0 : (uint8_t)1)
#define TRAINER_BLUETOOTH_S_ROW (bluetoothDistantAddr[0] == '\0' ? HIDDEN_ROW : LABEL()) #define TRAINER_BLUETOOTH_S_ROW (bluetooth.distantAddr[0] == '\0' ? HIDDEN_ROW : LABEL())
#define TRAINER_BLUETOOTH_ROW (g_model.trainerData.mode == TRAINER_MODE_MASTER_BLUETOOTH ? TRAINER_BLUETOOTH_M_ROW : (g_model.trainerData.mode == TRAINER_MODE_SLAVE_BLUETOOTH ? TRAINER_BLUETOOTH_S_ROW : HIDDEN_ROW)) #define TRAINER_BLUETOOTH_ROW (g_model.trainerData.mode == TRAINER_MODE_MASTER_BLUETOOTH ? TRAINER_BLUETOOTH_M_ROW : (g_model.trainerData.mode == TRAINER_MODE_SLAVE_BLUETOOTH ? TRAINER_BLUETOOTH_S_ROW : HIDDEN_ROW))
#define TRAINER_CHANNELS_ROW (IS_SLAVE_TRAINER() ? (uint8_t)1 : HIDDEN_ROW) #define TRAINER_CHANNELS_ROW (IS_SLAVE_TRAINER() ? (uint8_t)1 : HIDDEN_ROW)
#define TRAINER_ROWS IF_BT_TRAINER_ON(LABEL(Trainer)), IF_BT_TRAINER_ON(0), IF_BT_TRAINER_ON(TRAINER_BLUETOOTH_ROW), IF_BT_TRAINER_ON(TRAINER_CHANNELS_ROW) #define TRAINER_ROWS IF_BT_TRAINER_ON(LABEL(Trainer)), IF_BT_TRAINER_ON(0), IF_BT_TRAINER_ON(TRAINER_BLUETOOTH_ROW), IF_BT_TRAINER_ON(TRAINER_CHANNELS_ROW)
@ -511,12 +511,12 @@ void onBluetoothConnectMenu(const char * result)
{ {
if (result != STR_EXIT) { if (result != STR_EXIT) {
uint8_t index = (result - reusableBuffer.moduleSetup.bt.devices[0]) / sizeof(reusableBuffer.moduleSetup.bt.devices[0]); uint8_t index = (result - reusableBuffer.moduleSetup.bt.devices[0]) / sizeof(reusableBuffer.moduleSetup.bt.devices[0]);
strncpy(bluetoothDistantAddr, reusableBuffer.moduleSetup.bt.devices[index], LEN_BLUETOOTH_ADDR); strncpy(bluetooth.distantAddr, reusableBuffer.moduleSetup.bt.devices[index], LEN_BLUETOOTH_ADDR);
bluetoothState = BLUETOOTH_STATE_BIND_REQUESTED; bluetooth.state = BLUETOOTH_STATE_BIND_REQUESTED;
} }
else { else {
reusableBuffer.moduleSetup.bt.devicesCount = 0; reusableBuffer.moduleSetup.bt.devicesCount = 0;
bluetoothState = BLUETOOTH_STATE_DISCOVER_END; bluetooth.state = BLUETOOTH_STATE_DISCOVER_END;
} }
} }
#endif #endif
@ -1178,8 +1178,8 @@ void menuModelSetup(event_t event)
g_model.trainerData.mode = checkIncDec(event, g_model.trainerData.mode, 0, TRAINER_MODE_MAX(), EE_MODEL, isTrainerModeAvailable); g_model.trainerData.mode = checkIncDec(event, g_model.trainerData.mode, 0, TRAINER_MODE_MAX(), EE_MODEL, isTrainerModeAvailable);
#if defined(BLUETOOTH) #if defined(BLUETOOTH)
if (checkIncDec_Ret) { if (checkIncDec_Ret) {
bluetoothState = BLUETOOTH_STATE_OFF; bluetooth.state = BLUETOOTH_STATE_OFF;
bluetoothDistantAddr[0] = 0; bluetooth.distantAddr[0] = 0;
} }
#endif #endif
} }
@ -1192,31 +1192,31 @@ void menuModelSetup(event_t event)
if (attr) { if (attr) {
s_editMode = 0; s_editMode = 0;
} }
if (bluetoothDistantAddr[0]) { if (bluetooth.distantAddr[0]) {
lcdDrawText(INDENT_WIDTH, y+1, bluetoothDistantAddr, TINSIZE); lcdDrawText(INDENT_WIDTH, y+1, bluetooth.distantAddr, TINSIZE);
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON(TR_CLEAR), attr); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON(TR_CLEAR), attr);
if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) { if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) {
bluetoothState = BLUETOOTH_STATE_OFF; bluetooth.state = BLUETOOTH_STATE_OFF;
memclear(bluetoothDistantAddr, sizeof(bluetoothDistantAddr)); memclear(bluetooth.distantAddr, sizeof(bluetooth.distantAddr));
} }
} }
else { else {
lcdDrawText(INDENT_WIDTH, y, "---"); lcdDrawText(INDENT_WIDTH, y, "---");
if (bluetoothState < BLUETOOTH_STATE_IDLE) if (bluetooth.state < BLUETOOTH_STATE_IDLE)
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_BUTTON_INIT, attr); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_BUTTON_INIT, attr);
else else
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_BUTTON_DISCOVER, attr); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_BUTTON_DISCOVER, attr);
if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) { if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) {
if (bluetoothState < BLUETOOTH_STATE_IDLE) { if (bluetooth.state < BLUETOOTH_STATE_IDLE) {
bluetoothState = BLUETOOTH_STATE_OFF; bluetooth.state = BLUETOOTH_STATE_OFF;
} }
else { else {
reusableBuffer.moduleSetup.bt.devicesCount = 0; reusableBuffer.moduleSetup.bt.devicesCount = 0;
bluetoothState = BLUETOOTH_STATE_DISCOVER_REQUESTED; bluetooth.state = BLUETOOTH_STATE_DISCOVER_REQUESTED;
} }
} }
if (bluetoothState == BLUETOOTH_STATE_DISCOVER_START && reusableBuffer.moduleSetup.bt.devicesCount > 0) { if (bluetooth.state == BLUETOOTH_STATE_DISCOVER_START && reusableBuffer.moduleSetup.bt.devicesCount > 0) {
popupMenuItemsCount = min<uint8_t>(reusableBuffer.moduleSetup.bt.devicesCount, 6); popupMenuItemsCount = min<uint8_t>(reusableBuffer.moduleSetup.bt.devicesCount, 6);
for (uint8_t i=0; i<popupMenuItemsCount; i++) { for (uint8_t i=0; i<popupMenuItemsCount; i++) {
popupMenuItems[i] = reusableBuffer.moduleSetup.bt.devices[i]; popupMenuItems[i] = reusableBuffer.moduleSetup.bt.devices[i];
@ -1227,11 +1227,11 @@ void menuModelSetup(event_t event)
} }
} }
else { else {
if (bluetoothDistantAddr[0]) if (bluetooth.distantAddr[0])
lcdDrawText(INDENT_WIDTH, y+1, bluetoothDistantAddr, TINSIZE); lcdDrawText(INDENT_WIDTH, y+1, bluetooth.distantAddr, TINSIZE);
else else
lcdDrawText(INDENT_WIDTH, y, "---"); lcdDrawText(INDENT_WIDTH, y, "---");
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, bluetoothState == BLUETOOTH_STATE_CONNECTED ? "Connected" : "!Connected"); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, bluetooth.state == BLUETOOTH_STATE_CONNECTED ? "Connected" : "!Connected");
} }
break; break;
#endif #endif

4
radio/src/gui/128x64/radio_hardware.cpp
View file

@ -381,12 +381,12 @@ void menuRadioHardware(event_t event)
case ITEM_RADIO_HARDWARE_BLUETOOTH_LOCAL_ADDR: case ITEM_RADIO_HARDWARE_BLUETOOTH_LOCAL_ADDR:
lcdDrawTextAlignedLeft(y, STR_BLUETOOTH_LOCAL_ADDR); lcdDrawTextAlignedLeft(y, STR_BLUETOOTH_LOCAL_ADDR);
lcdDrawText(HW_SETTINGS_COLUMN2, y, bluetoothLocalAddr[0] == '\0' ? "---" : bluetoothLocalAddr); lcdDrawText(HW_SETTINGS_COLUMN2, y, bluetooth.localAddr[0] == '\0' ? "---" : bluetooth.localAddr);
break; break;
case ITEM_RADIO_HARDWARE_BLUETOOTH_DISTANT_ADDR: case ITEM_RADIO_HARDWARE_BLUETOOTH_DISTANT_ADDR:
lcdDrawTextAlignedLeft(y, STR_BLUETOOTH_DIST_ADDR); lcdDrawTextAlignedLeft(y, STR_BLUETOOTH_DIST_ADDR);
lcdDrawText(HW_SETTINGS_COLUMN2, y, bluetoothDistantAddr[0] == '\0' ? "---" : bluetoothDistantAddr); lcdDrawText(HW_SETTINGS_COLUMN2, y, bluetooth.distantAddr[0] == '\0' ? "---" : bluetooth.distantAddr);
break; break;
case ITEM_RADIO_HARDWARE_BLUETOOTH_NAME: case ITEM_RADIO_HARDWARE_BLUETOOTH_NAME:

3
radio/src/tasks.cpp
View file

@ -107,7 +107,6 @@ TASK_FUNCTION(mixerTask)
s_pulses_paused = true; s_pulses_paused = true;
while (1) { while (1) {
#if defined(PCBX9D) || defined(PCBX7) #if defined(PCBX9D) || defined(PCBX7)
// SBUS on Hearbeat PIN (which is a serial RX) // SBUS on Hearbeat PIN (which is a serial RX)
processSbusInput(); processSbusInput();
@ -118,7 +117,7 @@ TASK_FUNCTION(mixerTask)
#endif #endif
#if defined(BLUETOOTH) #if defined(BLUETOOTH)
bluetoothWakeup(); bluetooth.wakeup();
#endif #endif
RTOS_WAIT_TICKS(1); RTOS_WAIT_TICKS(1);

4
radio/src/telemetry/frsky_sport.cpp
View file

@ -158,8 +158,8 @@ void sportProcessTelemetryPacketWithoutCrc(uint8_t origin, const uint8_t * packe
uint32_t data = SPORT_DATA_S32(packet); uint32_t data = SPORT_DATA_S32(packet);
#if defined(BLUETOOTH) #if defined(BLUETOOTH)
if (g_eeGeneral.bluetoothMode == BLUETOOTH_TELEMETRY && bluetoothState == BLUETOOTH_STATE_CONNECTED) { if (g_eeGeneral.bluetoothMode == BLUETOOTH_TELEMETRY && bluetooth.state == BLUETOOTH_STATE_CONNECTED) {
bluetoothForwardTelemetry(packet); bluetooth.forwardTelemetry(packet);
} }
#endif #endif