wn/mbusgateway3variant
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

first use of libmbus

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2020-11-03 14:43:56 +01:00
parent c2efa9d8f3
commit 47df03e9e5
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cube/User/Src/main2.c
View File

@ -128,21 +128,14 @@ static t_mbusDevice devices[] = {
void triggerMBusRequest(void *handle) { void triggerMBusRequest(void *handle) {
static uint8_t deviceIndex = 0; static uint8_t deviceIndex = 0;
static uint32_t cnt = 0;
logMsg(""); e_mbusCommRequestResult r = mbusCommRequest(&(devices[deviceIndex]));
logMsg("*** NEW REQUEST %s %d %d %d %d ***", if (r == MBCRR_TRIGGERED) {
devices[deviceIndex].deviceName,
devices[deviceIndex].requests,
devices[deviceIndex].failures,
deviceIndex, cnt);
mbusCommRequest(&(devices[deviceIndex]));
cnt++;
deviceIndex++; deviceIndex++;
if (deviceIndex >= numOfDevices) { if (deviceIndex >= numOfDevices) {
deviceIndex = 0; deviceIndex = 0;
} }
}
} }
@ -153,7 +146,7 @@ void my_setup_2() {
frontendInit(); frontendInit();
frontendSetThreshold(240); frontendSetThreshold(240);
schAdd(triggerMBusRequest, NULL, 0, 10000); schAdd(triggerMBusRequest, NULL, 0, 1000);
} }
void my_loop() { void my_loop() {

9
cube/User/Src/mbusComm.c
View File

@ -391,9 +391,18 @@ void mbusCommRxCpltCallback(UART_HandleTypeDef *huart) {
} }
e_mbusCommRequestResult mbusCommRequest(t_mbusDevice *mbusDevice) { e_mbusCommRequestResult mbusCommRequest(t_mbusDevice *mbusDevice) {
static uint32_t cnt = 0;
e_mbusCommRequestResult res = MBCRR_BUSY; e_mbusCommRequestResult res = MBCRR_BUSY;
if (mbusCommHandle.state == MBCS_IDLE) { if (mbusCommHandle.state == MBCS_IDLE) {
logMsg("");
logMsg("*** NEW REQUEST %s R:%d F:%d C:%d ***",
mbusDevice->deviceName,
mbusDevice->requests,
mbusDevice->failures,
cnt);
cnt++;
mbusCommHandle.state = MBCS_SEND; mbusCommHandle.state = MBCS_SEND;
mbusCommHandle.retryCnt = 0; mbusCommHandle.retryCnt = 0;
mbusCommHandle.cmd = MBUS_QUERY_CMD; mbusCommHandle.cmd = MBUS_QUERY_CMD;