diff --git a/ARM_Tag_FW/OpenEPaperLink_esp32_C6_AP/main/cc1101_radio.c b/ARM_Tag_FW/OpenEPaperLink_esp32_C6_AP/main/cc1101_radio.c index ec4eae0b..13ecaffe 100755 --- a/ARM_Tag_FW/OpenEPaperLink_esp32_C6_AP/main/cc1101_radio.c +++ b/ARM_Tag_FW/OpenEPaperLink_esp32_C6_AP/main/cc1101_radio.c @@ -701,10 +701,18 @@ bool CC1101_Present() uint8_t PartNum = CC1101_readReg(CC1101_PARTNUM, CC1101_STATUS_REGISTER); uint8_t ChipVersion = CC1101_readReg(CC1101_VERSION, CC1101_STATUS_REGISTER); - if(PartNum == 0 && ChipVersion == 20) { + if(PartNum == 0 && (ChipVersion == 20 || ChipVersion == 4)) { LOGA("CC1101 detected\n"); Ret = true; } + else { + if(PartNum != 0) { + LOGA("Invalid PartNum 0x%x\n",PartNum); + } + else { + LOGA("Invalid or unsupported ChipVersion 0x%x\n",ChipVersion); + } + } return Ret; } diff --git a/ARM_Tag_FW/OpenEPaperLink_esp32_C6_AP/main/main.c b/ARM_Tag_FW/OpenEPaperLink_esp32_C6_AP/main/main.c index ff4e84df..d0f568ba 100644 --- a/ARM_Tag_FW/OpenEPaperLink_esp32_C6_AP/main/main.c +++ b/ARM_Tag_FW/OpenEPaperLink_esp32_C6_AP/main/main.c @@ -42,7 +42,7 @@ const uint8_t channelList[6] = {11, 15, 20, 25, 26, 27}; struct pendingData pendingDataArr[MAX_PENDING_MACS]; // VERSION GOES HERE! -uint16_t version = 0x001C; +uint16_t version = 0x001d; #define RAW_PKT_PADDING 2 diff --git a/ARM_Tag_FW/OpenEPaperLink_esp32_C6_AP/main/radio.c b/ARM_Tag_FW/OpenEPaperLink_esp32_C6_AP/main/radio.c index 5a08d20a..4c8ebcb2 100644 --- a/ARM_Tag_FW/OpenEPaperLink_esp32_C6_AP/main/radio.c +++ b/ARM_Tag_FW/OpenEPaperLink_esp32_C6_AP/main/radio.c @@ -39,7 +39,7 @@ void esp_ieee802154_receive_done(uint8_t *frame, esp_ieee802154_frame_info_t *fr memcpy(inner_rxPKT, &frame[0], frame[0] + 1); xQueueSendFromISR(packet_buffer, (void *)&inner_rxPKT, &xHigherPriorityTaskWoken); portYIELD_FROM_ISR_ARG(xHigherPriorityTaskWoken); - esp_ieee802154_receive_handle_done(frame); + esp_ieee802154_receive_sfd_done(); } void esp_ieee802154_transmit_failed(const uint8_t *frame, esp_ieee802154_tx_error_t error) { @@ -50,7 +50,7 @@ void esp_ieee802154_transmit_failed(const uint8_t *frame, esp_ieee802154_tx_erro void esp_ieee802154_transmit_done(const uint8_t *frame, const uint8_t *ack, esp_ieee802154_frame_info_t *ack_frame_info) { isInTransmit = 0; ESP_EARLY_LOGI(TAG, "TX %d", frame[0]); - esp_ieee802154_receive_handle_done(frame); + esp_ieee802154_receive_sfd_done(); } static bool zigbee_is_enabled = false; void radio_init(uint8_t ch) {