Merge branch 'develop' of ssh://github.com/irext/core
This commit is contained in:
@@ -33,11 +33,11 @@ const UINT16 tag_index[TAG_COUNT_FOR_PROTOCOL] =
|
|||||||
INT8 binary_parse_offset()
|
INT8 binary_parse_offset()
|
||||||
{
|
{
|
||||||
int i = 0;
|
int i = 0;
|
||||||
#if defined BOARD_ESP8266
|
#if defined(ESP8266) || defined(ESP32)
|
||||||
UINT8 *phead = (UINT8 *)&p_ir_buffer->data[1];
|
UINT8 *phead = (UINT8 *)&p_ir_buffer->data[1];
|
||||||
#else
|
#else
|
||||||
UINT16 *phead = (UINT16 *)&p_ir_buffer->data[1];
|
UINT16 *phead = (UINT16 *)&p_ir_buffer->data[1];
|
||||||
#endif // BOARD_ESP8266
|
#endif // ESPRESSIF
|
||||||
|
|
||||||
tag_count = p_ir_buffer->data[0];
|
tag_count = p_ir_buffer->data[0];
|
||||||
if (TAG_COUNT_FOR_PROTOCOL != tag_count)
|
if (TAG_COUNT_FOR_PROTOCOL != tag_count)
|
||||||
@@ -63,7 +63,7 @@ INT8 binary_parse_offset()
|
|||||||
#if defined BOARD_STM8 && defined COMPILER_IAR
|
#if defined BOARD_STM8 && defined COMPILER_IAR
|
||||||
UINT16 offset = *(phead + i);
|
UINT16 offset = *(phead + i);
|
||||||
tags[i].offset = (offset >> 8) | (offset << 8);
|
tags[i].offset = (offset >> 8) | (offset << 8);
|
||||||
#elif defined BOARD_ESP8266
|
#elif defined(ESP8266) || defined(ESP32)
|
||||||
UINT16 tmp_a = *(phead + i * 2);
|
UINT16 tmp_a = *(phead + i * 2);
|
||||||
UINT16 tmp_b = *(phead + i * 2 + 1);
|
UINT16 tmp_b = *(phead + i * 2 + 1);
|
||||||
tags[i].offset = tmp_b << 8 | tmp_a;
|
tags[i].offset = tmp_b << 8 | tmp_a;
|
||||||
|
|||||||
Reference in New Issue
Block a user