Merge branch 'master' of github.com:markqvist/RNode_Firmware
This commit is contained in:
commit
7f998e6436
|
@ -476,7 +476,7 @@ char bt_devname[11];
|
||||||
Bluefruit.Security.setSecuredCallback(bt_connect_callback);
|
Bluefruit.Security.setSecuredCallback(bt_connect_callback);
|
||||||
Bluefruit.Periph.setDisconnectCallback(bt_disconnect_callback);
|
Bluefruit.Periph.setDisconnectCallback(bt_disconnect_callback);
|
||||||
Bluefruit.Security.setPairCompleteCallback(bt_pairing_complete);
|
Bluefruit.Security.setPairCompleteCallback(bt_pairing_complete);
|
||||||
//Bluefruit.Periph.setConnInterval(6, 12); // 7.5 - 15 ms
|
Bluefruit.Periph.setConnInterval(6, 12); // 7.5 - 15 ms
|
||||||
|
|
||||||
const ble_gap_addr_t gap_addr = Bluefruit.getAddr();
|
const ble_gap_addr_t gap_addr = Bluefruit.getAddr();
|
||||||
char *data = (char*)malloc(BT_DEV_ADDR_LEN+1);
|
char *data = (char*)malloc(BT_DEV_ADDR_LEN+1);
|
||||||
|
|
|
@ -609,8 +609,14 @@ void transmit(uint16_t size) {
|
||||||
|
|
||||||
written++;
|
written++;
|
||||||
|
|
||||||
if (written == 255) {
|
if (written == 255 && header & 0x0F) {
|
||||||
LoRa->endPacket(); add_airtime(written);
|
if (!LoRa->endPacket()) {
|
||||||
|
kiss_indicate_error(ERROR_MODEM_TIMEOUT);
|
||||||
|
kiss_indicate_error(ERROR_TXFAILED);
|
||||||
|
led_indicate_error(5);
|
||||||
|
hard_reset();
|
||||||
|
}
|
||||||
|
add_airtime(written);
|
||||||
LoRa->beginPacket();
|
LoRa->beginPacket();
|
||||||
LoRa->write(header);
|
LoRa->write(header);
|
||||||
written = 1;
|
written = 1;
|
||||||
|
|
Loading…
Reference in New Issue