Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parameter Conversion improvement #63

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Parameter Conversion improvement #63

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4920851
Calculate bytestart during run-time
budulinek Mar 4, 2023
83cb3fe
Update P1P2_Daikin_ParameterConversion_EHYHB.h
budulinek Mar 4, 2023
4fb148f
Fix for loop
budulinek Mar 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 26 additions & 14 deletions examples/P1P2-bridge-esp8266/P1P2_Daikin_ParameterConversion_EHYHB.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,24 +121,22 @@ bool scheduleMemSeen[2][SCHEDULE_MEM_SIZE] = {}; // 2 * 1166 = 2332 bytes
#ifdef SAVEPACKETS
#ifdef PSEUDO_PACKETS
#define PCKTP_START 0x08
#define PCKTP_END 0x15 // 0x0D-0x15 and 0x31 mapped to 0x16
#define PCKTP_END 0x16 // 0x08-0x16, 0x30 mapped to 0x17 and 0x31 mapped to 0x18
#define PCKTP_ARR_SZ (PCKTP_END - PCKTP_START + 3)
//byte packetsrc = { {00 }, { 40 }}
//byte packettype = { {08, 09, 0A, 0B, 0C, 0D, 0E, 0F, 10, 11, 12, 13, 14, 15, 30, 31 }, { 08, 09, 0A, 0B, 0C, 0D, 0E, 0F, 10, 11, 12, 13, 14, 15, 30, 31 }}
const PROGMEM uint32_t nr_bytes[2] [PCKTP_ARR_SZ] = { { 0, 0, 0, 0, 0, 20, 20, 20, 20, 8, 15, 3, 15, 6, 2, 6 }, { 0, 20, 20, 20, 0, 20, 20, 20, 20, 20, 20, 14, 19, 6, 0, 0 }};
const PROGMEM uint32_t bytestart[2][PCKTP_ARR_SZ] = { { 0, 0, 0, 0, 0, 0, 20, 40, 60, 80, 88, 103, 106, 121, 127, 129 }, { 135, 135, 155, 175, 195, 195, 215, 235, 255, 275, 295, 315, 329, 348, 354, 354 /* , sizeValSeen=354 */ }};
#define sizeValSeen 354
//byte packetsrc = { {00 }, { 40 }}
//byte packettype = { {08, 09, 0A, 0B, 0C, 0D, 0E, 0F, 10, 11, 12, 13, 14, 15, 16, 30, 31 }, { 08, 09, 0A, 0B, 0C, 0D, 0E, 0F, 10, 11, 12, 13, 14, 15, 16, 30, 31 }}
const PROGMEM uint32_t nr_bytes[2] [PCKTP_ARR_SZ] = { { 0, 0, 0, 0, 0, 20, 20, 20, 20, 8, 15, 3, 15, 6, 16, 2, 6 }, { 0, 20, 20, 20, 0, 20, 20, 20, 20, 20, 20, 16, 19, 9, 9, 0, 0 }}; /* sizeValSeen=384 */
#define sizeValSeen 384
byte payloadByteVal[sizeValSeen] = { 0 };
byte payloadByteSeen[sizeValSeen] = { 0 };
#else /* PSEUDO_PACKETS */
#define PCKTP_START 0x10
#define PCKTP_END 0x15 // 0x10-0x15 and 0x31 mapped to 0x16
#define PCKTP_END 0x16 // 0x10-0x16, 0x30 mapped to 0x17 and 0x31 mapped to 0x18
#define PCKTP_ARR_SZ (PCKTP_END - PCKTP_START + 2)
//byte packetsrc = { {00, 00, 00, 00, 00, 00, 00 }, {40, 40, 40, 40, 40, 40, 40 }}
//byte packettype = { {10, 11, 12, 13, 14, 15, 31 }, {10, 11, 12, 13, 14, 15, 31 }}
const PROGMEM uint32_t nr_bytes[2] [PCKTP_ARR_SZ] = { {20, 8, 15, 3, 15, 6, 6 }, {20, 20, 20, 14, 19, 6, 0 }};
const PROGMEM uint32_t bytestart[2][PCKTP_ARR_SZ] = { { 0, 20, 28, 43, 46, 61, 67 }, {73, 93, 113, 133, 147, 166, 172 /*, sizeValSeen=172 */}};
#define sizeValSeen 172
//byte packetsrc = { {00 }, {40 }}
//byte packettype = { {10, 11, 12, 13, 14, 15, 16, 30, 31 }, {10, 11, 12, 13, 14, 15, 16, 30, 31 }}
const PROGMEM uint32_t nr_bytes[2] [PCKTP_ARR_SZ] = { {20, 8, 15, 3, 15, 6, 16, 2, 6 }, {20, 20, 20, 16, 19, 9, 9, 0, 0 }}; /* sizeValSeen=204 */
#define sizeValSeen 204
byte payloadByteVal[sizeValSeen] = { 0 };
byte payloadByteSeen[sizeValSeen] = { 0 };
#endif /* PSEUDO_PACKETS */
Expand Down Expand Up @@ -167,6 +165,13 @@ bool newPayloadBytesVal(byte packetSrc, byte packetType, byte payloadIndex, byte
bool newByte = (outputFilter == 0);
byte pts = (packetSrc >> 6) & 0x01;
byte pti = packetType - PCKTP_START;
uint32_t bytestart = 0;
for (byte i = 0; i <= pts; i++) {
for (byte j = 0; j < (PCKTP_END - PCKTP_START + 1); j++) {
if (i == pts && j == pti) break;
bytestart += nr_bytes[i][j];
}
}
if (packetType == 0x30) pti = (PCKTP_END - PCKTP_START) + 1; // hack to get 0x30 also covered, treat it as PCKTP_END + 1 (0x16)
if (packetType == 0x31) pti = (PCKTP_END - PCKTP_START) + 2; // hack to get 0x31 also covered, treat it as PCKTP_END + 2 (0x17)
if (payloadIndex == EMPTY_PAYLOAD) {
Expand Down Expand Up @@ -208,7 +213,7 @@ bool newPayloadBytesVal(byte packetSrc, byte packetType, byte payloadIndex, byte
} else {
bool pubHA = false;
for (byte i = payloadIndex + 1 - length; i <= payloadIndex; i++) {
uint16_t pi2 = bytestart[pts][pti] + i;
uint16_t pi2 = bytestart + i;
if (pi2 >= sizeValSeen) {
pi2 = 0;
Sprint_P(true, true, true, PSTR("Warning: pi2 > sizeValSeen"));
Expand Down Expand Up @@ -252,6 +257,13 @@ bool newPayloadBitVal(byte packetSrc, byte packetType, byte payloadIndex, byte*
bool newBit = (outputFilter == 0);
byte pts = (packetSrc >> 6);
byte pti = packetType - PCKTP_START;
uint32_t bytestart = 0;
for (byte i = 0; i <= pts; i++) {
for (byte j = 0; j < (PCKTP_END - PCKTP_START + 1); j++) {
if (i == pts && j == pti) break;
bytestart += nr_bytes[i][j];
}
}
if (packetType == 0x30) pti = (PCKTP_END - PCKTP_START) + 1; // hack to get 0x31 also covered
if (packetType == 0x31) pti = (PCKTP_END - PCKTP_START) + 2; // hack to get 0x31 also covered
if (payloadIndex == EMPTY_PAYLOAD) {
Expand All @@ -267,7 +279,7 @@ bool newPayloadBitVal(byte packetSrc, byte packetType, byte payloadIndex, byte*
// Warning: payloadIndex > expected
newBit = 1;
} else {
uint16_t pi2 = bytestart[pts][pti] + payloadIndex; // no multiplication, bit-wise only for u8 type
uint16_t pi2 = bytestart + payloadIndex; // no multiplication, bit-wise only for u8 type
if (pi2 >= sizeValSeen) {
pi2 = 0;
Sprint_P(true, true, true, PSTR("Warning: pi2 > sizeValSeen"));
Expand Down