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

eeprom working now

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2020-11-06 21:16:17 +01:00
parent 7c7e1c4725
commit 371c22768a
8 changed files with 70 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@ typedef enum {
typedef enum {
MBCS_IDLE,
MBCS_SEND,
MBCS_SEND_CONT,
MBCS_SEND_CONTINUED,
MBCS_SENDING_DONE,
MBCS_ENABLE_FRONTEND,
MBCS_START1,
@ -88,8 +88,17 @@ typedef struct {
static t_mbusCommHandle mbusCommHandle = { .state = MBCS_IDLE, .retryCnt = 0, .cmd = 0, .addr = 0, .receiveCnt = 0, .receivedOctet = 0, .receiving = false };
static t_mbusCommStats mbusCommStats = { .requestCnt = 0, .errorCnt = 0 };
void mbusCommSetStats(t_mbusCommStats stats) {
mbusCommStats = stats;
}
t_mbusCommStats *mbusCommGetStats() {
return &mbusCommStats;
}
static void parseAndPrintFrame(t_mbusCommHandle *mbusCommHandle) {
t_longframe *frame = &(mbusCommHandle->frame);
@ -196,11 +205,11 @@ static void handleRequestEngine(void *handle) {
localMbusCommHandle->sendBuf[2] = localMbusCommHandle->addr;
localMbusCommHandle->sendBuf[3] = localMbusCommHandle->cmd + localMbusCommHandle->addr; // checksum
localMbusCommHandle->sendBuf[4] = 0x16;
localMbusCommHandle->state = MBCS_SEND_CONT;
localMbusCommHandle->state = MBCS_SEND_CONTINUED;
// no break !!
case MBCS_SEND_CONT:
logMsg("hre state SEND_CONT");
case MBCS_SEND_CONTINUED:
logMsg("hre state SEND_CONTINUED");
show(LED_RED, OFF);
if (! loopActive) {
logMsg("hre enabling loop, try %d", localMbusCommHandle->retryCnt);
@ -375,6 +384,7 @@ static void handleRequestEngine(void *handle) {
case MBCS_TIMEOUT:
errMsg("hre state TIMEOUT");
mbusCommStats.errorCnt += 1;
localMbusCommHandle->device->failures += 1;
localMbusCommHandle->receiving = false;
if (localMbusCommHandle->frame.userdata != NULL) {
@ -415,16 +425,15 @@ void mbusCommRxCpltCallback(UART_HandleTypeDef *huart) {
}
e_mbusCommRequestResult mbusCommRequest(t_mbusDevice *mbusDevice) {
static uint32_t cnt = 0;
e_mbusCommRequestResult res = MBCRR_BUSY;
if (mbusCommHandle.state == MBCS_IDLE) {
coloredMsg(LOG_BLUE, "*** NEW REQUEST %s R:%d F:%d C:%d ***",
coloredMsg(LOG_BLUE, "*** NEW REQUEST %s R:%d F:%d GRC:%d GEC:%d ***",
mbusDevice->deviceName,
mbusDevice->requests,
mbusDevice->failures,
cnt);
cnt++;
mbusCommStats.requestCnt,
mbusCommStats.errorCnt);
mbusCommHandle.state = MBCS_SEND;
mbusCommHandle.retryCnt = 0;
@ -434,6 +443,8 @@ e_mbusCommRequestResult mbusCommRequest(t_mbusDevice *mbusDevice) {
mbusDevice->requests += 1;
schAdd(handleRequestEngine, (void*) &mbusCommHandle, 0, 0);
res = MBCRR_TRIGGERED;
mbusCommStats.requestCnt += 1;
}
return res;