diff --git a/src/hms/cmt2300a.h b/src/hms/cmt2300a.h index cf1f023f..5c1746de 100644 --- a/src/hms/cmt2300a.h +++ b/src/hms/cmt2300a.h @@ -154,7 +154,7 @@ #define CMT2300A_MASK_PKT_OK_FLG 0x01 // default CMT paramters -/*static uint8_t cmtConfig[0x60] PROGMEM { +static uint8_t cmtConfig[0x60] PROGMEM { // 0x00 - 0x0f -- RSSI offset +- 0 and 13dBm 0x00, 0x66, 0xEC, 0x1C, 0x70, 0x80, 0x14, 0x08, 0x11, 0x02, 0x02, 0x00, 0xAE, 0xE0, 0x35, 0x00, @@ -173,28 +173,6 @@ // 0x50 - 0x5f 0xFF, 0x00, 0x00, 0x1F, 0x10, 0x70, 0x4D, 0x06, 0x00, 0x07, 0x50, 0x00, 0x42, 0x0C, 0x3F, 0x7F // - TX 13dBm -};*/ - -// LP Settings -static uint8_t cmtConfig[0x60] PROGMEM { - // 0x00 - 0x0f - 0x00, 0x66, 0xEC, 0x1D, 0x70, 0x80, 0x14, 0x08, - 0x91, 0x02, 0x02, 0xD0, 0xAE, 0xE0, 0x35, 0x00, - // 0x10 - 0x1f - 0x00, 0xF4, 0x10, 0xE2, 0x42, 0x20, 0x0C, 0x81, - 0x42, 0x32, 0xCF, 0x82, 0x42, 0x27, 0x76, 0x12, // 0x42, 0xCF, 0xA7, 0x8C, 0x42, 0xC4, 0x4E, 0x1C, - // 0x20 - 0x2f - 0xA6, 0xC9, 0x20, 0x20, 0xD2, 0x35, 0x0C, 0x0A, - 0x9F, 0x4B, 0x0A, 0x29, 0xC0, 0x14, 0x05, 0x53, // 0x9F, 0x4B, 0x29, 0x29, 0xC0, 0x14, 0x05, 0x53, - // 0x30 - 0x3f - 0x10, 0x00, 0xB4, 0x00, 0x00, 0x01, 0x00, 0x00, - 0x12, 0x1E, 0x00, 0xAA, 0x06, 0x00, 0x00, 0x00, - // 0x40 - 0x4f - 0x00, 0x48, 0x5A, 0x48, 0x4D, 0x01, 0x1D, 0x00, // 0x00, 0xD6, 0xD5, 0xD4, 0x2D, 0x01, 0x1D, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xC3, 0x00, 0x00, 0x60, - // 0x50 - 0x5f - 0xFF, 0x00, 0x00, 0x1F, 0x10, 0x70, 0x4D, 0x06, - 0x00, 0x07, 0x50, 0x00, 0x8A, 0x18, 0x3F, 0x7F }; @@ -253,8 +231,6 @@ class Cmt2300a { mSpi.writeReg(CMT2300A_CUS_FIFO_CLR, 0x02); mSpi.writeReg(0x16, 0x0C); // [4:3]: RSSI_DET_SEL, [2:0]: RSSI_AVG_MODE - //mSpi.writeReg(CMT2300A_CUS_FREQ_CHNL, 0x00); // 863.0 MHz - if(!cmtSwitchStatus(CMT2300A_GO_RX, CMT2300A_STA_RX)) return CMT_ERR_SWITCH_STATE; @@ -316,7 +292,6 @@ class Cmt2300a { mSpi.writeFifo(buf, len); if(0xff != mRqstCh) { - //DPRINTLN(DBG_INFO, "switchChannel: 0x" + String(mRqstCh, HEX)); mCurCh = mRqstCh; mRqstCh = 0xff; } diff --git a/src/hms/hmsPayload.h b/src/hms/hmsPayload.h index 09dedf1c..bd87f181 100644 --- a/src/hms/hmsPayload.h +++ b/src/hms/hmsPayload.h @@ -149,7 +149,7 @@ class HmsPayload { uint8_t cmd = iv->getQueuedCmd(); DPRINT(DBG_INFO, F("(#")); DBGPRINT(String(iv->id)); - DBGPRINT(F(") prepareDevInformCmd")); // + String(cmd, HEX)); + DBGPRINTLN(F(") prepareDevInformCmd")); // + String(cmd, HEX)); mRadio->prepareDevInformCmd(&iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false); mPayload[iv->id].txCmd = cmd; }