pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-05-03 20:38:41 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'master' into post1

Browse Source
This commit is contained in:
geeksville 2020-08-31 09:10:24 -07:00
commit 810429b54f
5 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/version.sh
View File

@ -1,3 +1,3 @@
export VERSION=0.9.3 export VERSION=0.9.5

2
src/esp32/BluetoothSoftwareUpdate.cpp
View File

@ -31,6 +31,8 @@ int update_size_callback(uint16_t conn_handle, uint16_t attr_handle, struct ble_
if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR && updateExpectedSize != 0) { if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR && updateExpectedSize != 0) {
updateActualSize = 0; updateActualSize = 0;
crc.reset(); crc.reset();
if (Update.isRunning())
Update.abort();
bool canBegin = Update.begin(updateExpectedSize); bool canBegin = Update.begin(updateExpectedSize);
DEBUG_MSG("Setting update size %u, result %d\n", updateExpectedSize, canBegin); DEBUG_MSG("Setting update size %u, result %d\n", updateExpectedSize, canBegin);
if (!canBegin) { if (!canBegin) {

16
src/mesh/MeshRadio.h
View File

@ -26,11 +26,16 @@
#define CH_SPACING_CN 2.0f // MHz FIXME, this is just a guess for 470-510 #define CH_SPACING_CN 2.0f // MHz FIXME, this is just a guess for 470-510
#define NUM_CHANNELS_CN 20 #define NUM_CHANNELS_CN 20
// JP channel settings // JP channel settings (AS1 bandplan)
#define CH0_JP 920.0f // MHz #define CH0_JP 920.0f // MHz
#define CH_SPACING_JP 0.5f // MHz FIXME, this is just a guess for 920-925 #define CH_SPACING_JP 0.5f
#define NUM_CHANNELS_JP 10 #define NUM_CHANNELS_JP 10
// TW channel settings (AS2 bandplan 923-925MHz)
#define CH0_TW 923.0f // MHz
#define CH_SPACING_TW 0.2
#define NUM_CHANNELS_TW 10
// FIXME add defs for other regions and use them here // FIXME add defs for other regions and use them here
#ifdef HW_VERSION_US #ifdef HW_VERSION_US
#define CH0 CH0_US #define CH0 CH0_US
@ -49,13 +54,18 @@
#define CH_SPACING CH_SPACING_CN #define CH_SPACING CH_SPACING_CN
#define NUM_CHANNELS NUM_CHANNELS_CN #define NUM_CHANNELS NUM_CHANNELS_CN
#elif defined(HW_VERSION_JP) #elif defined(HW_VERSION_JP)
// Also called AS1 bandplan
#define CH0 CH0_JP #define CH0 CH0_JP
#define CH_SPACING CH_SPACING_JP #define CH_SPACING CH_SPACING_JP
#define NUM_CHANNELS NUM_CHANNELS_JP #define NUM_CHANNELS NUM_CHANNELS_JP
#elif defined(HW_VERSION_TW)
// Also called AS2 bandplan
#define CH0 CH0_TW
#define CH_SPACING CH_SPACING_TW
#define NUM_CHANNELS NUM_CHANNELS_TW
#else #else
// HW version not set - assume US // HW version not set - assume US
#define CH0 CH0_US #define CH0 CH0_US
#define CH_SPACING CH_SPACING_US #define CH_SPACING CH_SPACING_US
#define NUM_CHANNELS NUM_CHANNELS_US #define NUM_CHANNELS NUM_CHANNELS_US
#endif #endif

4
src/mesh/NodeDB.cpp
View File

@ -86,7 +86,7 @@ const char *getChannelName()
static char buf[32]; static char buf[32];
uint8_t code = 0; uint8_t code = 0;
for (int i = 0; i < sizeof(channelSettings.psk.size); i++) for (int i = 0; i < channelSettings.psk.size; i++)
code ^= channelSettings.psk.bytes[i]; code ^= channelSettings.psk.bytes[i];
snprintf(buf, sizeof(buf), "#%s-%c", channelSettings.name, 'A' + (code % 26)); snprintf(buf, sizeof(buf), "#%s-%c", channelSettings.name, 'A' + (code % 26));
@ -121,7 +121,7 @@ void NodeDB::resetRadioConfig()
channelSettings.modem_config = ChannelSettings_ModemConfig_Bw125Cr48Sf4096; // slow and long range channelSettings.modem_config = ChannelSettings_ModemConfig_Bw125Cr48Sf4096; // slow and long range
channelSettings.tx_power = 0; // default channelSettings.tx_power = 0; // default
memcpy(&channelSettings.psk.bytes, &defaultpsk, sizeof(channelSettings.psk)); memcpy(&channelSettings.psk.bytes, defaultpsk, sizeof(channelSettings.psk));
channelSettings.psk.size = sizeof(defaultpsk); channelSettings.psk.size = sizeof(defaultpsk);
strcpy(channelSettings.name, "Default"); strcpy(channelSettings.name, "Default");
} }

10
src/nimble/BluetoothUtil.cpp
View File

@ -330,7 +330,7 @@ static void on_sync(void)
int isPrivate = 0; int isPrivate = 0;
rc = ble_hs_id_copy_addr(own_addr_type, addr_val, &isPrivate); rc = ble_hs_id_copy_addr(own_addr_type, addr_val, &isPrivate);
assert(rc == 0); assert(rc == 0);
DEBUG_MSG("Addr type %d, Private=%d, Device Address: ", own_addr_type, isPrivate); DEBUG_MSG("BLE advertisting type=%d, Private=%d, Device Address: ", own_addr_type, isPrivate);
print_addr(addr_val); print_addr(addr_val);
DEBUG_MSG("\n"); DEBUG_MSG("\n");
/* Begin advertising. */ /* Begin advertising. */
@ -357,17 +357,17 @@ void gatt_svr_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg)
break; break;
case BLE_GATT_REGISTER_OP_CHR: case BLE_GATT_REGISTER_OP_CHR:
DEBUG_MSG("registering characteristic %s with " /* DEBUG_MSG("registering characteristic %s with "
"def_handle=%d val_handle=%d\n", "def_handle=%d val_handle=%d\n",
ble_uuid_to_str(ctxt->chr.chr_def->uuid, buf), ctxt->chr.def_handle, ctxt->chr.val_handle); ble_uuid_to_str(ctxt->chr.chr_def->uuid, buf), ctxt->chr.def_handle, ctxt->chr.val_handle); */
if (ctxt->chr.chr_def->uuid == &fromnum_uuid.u) { if (ctxt->chr.chr_def->uuid == &fromnum_uuid.u) {
fromNumValHandle = ctxt->chr.val_handle; fromNumValHandle = ctxt->chr.val_handle;
DEBUG_MSG("FromNum handle %d\n", fromNumValHandle); // DEBUG_MSG("FromNum handle %d\n", fromNumValHandle);
} }
if (ctxt->chr.chr_def->uuid == &update_result_uuid.u) { if (ctxt->chr.chr_def->uuid == &update_result_uuid.u) {
updateResultHandle = ctxt->chr.val_handle; updateResultHandle = ctxt->chr.val_handle;
DEBUG_MSG("update result handle %d\n", updateResultHandle); // DEBUG_MSG("update result handle %d\n", updateResultHandle);
} }
break; break;