neben/badesee-device
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

consider index

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2023-01-27 12:03:28 +01:00
parent d270123d02
commit 9045f51bf8
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sketch/production.cpp
View File

@ -112,17 +112,21 @@ static void prepareTxFrame( uint8_t port )
msg.status = (DS18B20.getDS18Count() == NUM_OF_SENSORS) ? errorCode : errorCode | ERR_SENSOR_LOST; msg.status = (DS18B20.getDS18Count() == NUM_OF_SENSORS) ? errorCode : errorCode | ERR_SENSOR_LOST;
DS18B20.requestTemperatures(); DS18B20.requestTemperatures();
for (uint8_t i = 0; i < NUM_OF_SENSORS; i++) { for (uint8_t i = 0; i < NUM_OF_SENSORS; i++) {
msg.sensors[i].addr = sensors[i].addr; for (uint8_t j = 0; j < NUM_OF_SENSORS; j++) {
Serial.printf("%d: %s: %016llx\n\r", i, sensors[i].label, sensors[i].addr); if (sensors[j].index == i) {
msg.sensors[i].value = DS18B20.getTemp(((const uint8_t*)(&(sensors[i].addr)))); msg.sensors[i].addr = sensors[j].addr;
Serial.printf("v: %08x\n\r", msg.sensors[i].value); Serial.printf("%d, %d: %s: %016llx\n\r", i, j, sensors[j].label, sensors[j].addr);
msg.sensors[i].value = DS18B20.getTemp(((const uint8_t*)(&(sensors[j].addr))));
Serial.printf("v: %08x\n\r", msg.sensors[i].value);
float tempC = ((float)msg.sensors[i].value) / 128; float tempC = ((float)msg.sensors[i].value) / 128;
Serial.printf("f: %.2f\n\r", tempC); Serial.printf("f: %.2f\n\r", tempC);
char dispbuf[128]; char dispbuf[128];
sprintf(dispbuf, "%s: %.2f °C", sensors[i].label, tempC); sprintf(dispbuf, "%s: %.2f °C", sensors[j].label, tempC);
display.drawString(1, i * 16, dispbuf); display.drawString(1, i * 16, dispbuf);
Serial.printf("%d, %016llx, %s, %.2f\n\r", sensors[i].index, sensors[i].addr, sensors[i].label, tempC); Serial.printf("%d, %016llx, %s, %.2f\n\r", sensors[j].index, sensors[j].addr, sensors[j].label, tempC);
}
}
} }
appDataSize = sizeof(msg); appDataSize = sizeof(msg);
memcpy(&appData, (void*)&msg, appDataSize); memcpy(&appData, (void*)&msg, appDataSize);
@ -200,7 +204,7 @@ void productionSetup() {
sprintf(buf, "%d: %s: %016llx", i, sensors[i].label, sensors[i].addr); sprintf(buf, "%d: %s: %016llx", i, sensors[i].label, sensors[i].addr);
Serial.println(buf); Serial.println(buf);
//display.drawString(1, i*16, buf); //display.drawString(1, i*16, buf);
sensors[i].index = 0; sensors[i].index = i;
} }
} }
} }

8
snippets/decoding2.txt
View File

@ -49,14 +49,14 @@ typedef struct {
} __attribute__((packed)) sensor_t; } __attribute__((packed)) sensor_t;
28 8C 4F 6A 0D 00 00 94 28 8C 4F 6A 0D 00 00 94
00 03
53 45 4E 53 30 00 53 45 4E 53 30 00
28 19 C3 0A 0D 00 00 B4 28 19 C3 0A 0D 00 00 B4
01 02
53 45 4E 53 31 00 53 45 4E 53 31 00
28 35 86 6A 0D 00 00 D4 28 35 86 6A 0D 00 00 D4
02 01
53 45 4E 53 32 00 53 45 4E 53 32 00
28 C7 11 F6 62 20 01 B8 28 C7 11 F6 62 20 01 B8
03 00
53 45 4E 53 33 00 53 45 4E 53 33 00