diff --git a/binaries/Tag_FW_1.54.bin b/binaries/Tag_FW_1.54.bin index 501217f7..1f2bdc2f 100644 Binary files a/binaries/Tag_FW_1.54.bin and b/binaries/Tag_FW_1.54.bin differ diff --git a/binaries/Tag_FW_2.9-uc8151.bin b/binaries/Tag_FW_2.9-uc8151.bin index 65fd755f..0cdffe19 100644 Binary files a/binaries/Tag_FW_2.9-uc8151.bin and b/binaries/Tag_FW_2.9-uc8151.bin differ diff --git a/binaries/Tag_FW_2.9.bin b/binaries/Tag_FW_2.9.bin index 721ac750..458f6a9a 100644 Binary files a/binaries/Tag_FW_2.9.bin and b/binaries/Tag_FW_2.9.bin differ diff --git a/binaries/Tag_FW_4.2.bin b/binaries/Tag_FW_4.2.bin index 1201bce6..e51bb0d1 100644 Binary files a/binaries/Tag_FW_4.2.bin and b/binaries/Tag_FW_4.2.bin differ diff --git a/zbs243_Tag_FW/powermgt.c b/zbs243_Tag_FW/powermgt.c old mode 100644 new mode 100755 index 86cdcee7..b5a0e7ee --- a/zbs243_Tag_FW/powermgt.c +++ b/zbs243_Tag_FW/powermgt.c @@ -188,7 +188,7 @@ void powerUp(const uint8_t parts) { radioInit(); radioRxFilterCfg(mSelfMac, 0x10000, PROTO_PAN_ID); radioSetTxPower(10); - if (currentChannel >= 11 && currentChannel <= 25) { + if (currentChannel >= 11 && currentChannel <= 27) { radioSetChannel(currentChannel); } else { radioSetChannel(RADIO_FIRST_CHANNEL); diff --git a/zbs243_Tag_FW/settings.h b/zbs243_Tag_FW/settings.h old mode 100644 new mode 100755 index d7df03df..270258c6 --- a/zbs243_Tag_FW/settings.h +++ b/zbs243_Tag_FW/settings.h @@ -3,9 +3,9 @@ #include -#define FW_VERSION 014 // version number (max 2.5.5 :) ) -#define FW_VERSION_SUFFIX "-RE" // suffix, like -RC1 or whatever. +#define FW_VERSION 015 // version number (max 2.5.5 :) ) +#define FW_VERSION_SUFFIX "-RF" // suffix, like -RC1 or whatever. #define HAS_BUTTON // uncomment to enable reading a push button (connect between 'TEST' en 'GND' on the tag, along with a 100nF capacitor in parallel). -#define DEBUGBLOCKS // uncomment to enable extra debug information on the block transfers +//#define DEBUGBLOCKS // uncomment to enable extra debug information on the block transfers //#define PRINT_LUT // uncomment if you want the tag to print the LUT for the current temperature bracket #endif \ No newline at end of file diff --git a/zbs243_Tag_FW/syncedproto.c b/zbs243_Tag_FW/syncedproto.c index a85e847d..5b0beaf5 100755 --- a/zbs243_Tag_FW/syncedproto.c +++ b/zbs243_Tag_FW/syncedproto.c @@ -615,6 +615,7 @@ static bool downloadImageDataToEEPROM(const struct AvailDataInfo *__xdata avail) if (xMemEqual((const void *__xdata) & avail->dataVer, (const void *__xdata) & curDataInfo.dataVer, 8) && curDataInfo.dataSize) { // looks like we did. We'll carry on where we left off. pr("restarting image download"); + curImgSlot = nextImgSlot; } else { // go to the next image slot nextImgSlot++; @@ -657,6 +658,9 @@ static bool downloadImageDataToEEPROM(const struct AvailDataInfo *__xdata avail) if (getDataBlock(dataRequestSize)) { // succesfully downloaded datablock, save to eeprom powerUp(INIT_EEPROM); +#ifdef DEBUGBLOCKS + pr("Saving block %d to slot %d\n", curBlock.blockId, curImgSlot); +#endif saveImgBlockData(curImgSlot, curBlock.blockId); powerDown(INIT_EEPROM); curBlock.blockId++; @@ -676,6 +680,9 @@ static bool downloadImageDataToEEPROM(const struct AvailDataInfo *__xdata avail) eih->size = imageSize; eih->dataType = curDataInfo.dataType; +#ifdef DEBUGBLOCKS + pr("Now writing datatype 0x%02X to slot %d\n", curDataInfo.dataType, curImgSlot); +#endif powerUp(INIT_EEPROM); eepromWrite(getAddressForSlot(curImgSlot), eih, sizeof(struct EepromImageHeader)); powerDown(INIT_EEPROM);