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

more stats output

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2020-11-20 12:32:00 +01:00
parent 206e371d48
commit b1fdc04366
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cube/User/Inc/eeprom.h
View File

@ -4,10 +4,19 @@
#include <stdint.h> #include <stdint.h>
#include <spi.h> #include <spi.h>
typedef struct __attribute__((__packed__)) s_deviceStats {
uint32_t totalRunningHours;
uint32_t totalPowercycles;
uint32_t totalRequests;
uint32_t totalFailures;
} t_deviceStats;
void eepromInit(); void eepromInit();
void eepromWrite(uint16_t addr, uint8_t *buf, uint8_t len); void eepromWrite(uint16_t addr, uint8_t *buf, uint8_t len);
void eepromRead(uint16_t addr, uint8_t *buf, uint8_t len); void eepromRead(uint16_t addr, uint8_t *buf, uint8_t len);
void eepromSpiTxCpltCallback(SPI_HandleTypeDef *hspi); void eepromSpiTxCpltCallback(SPI_HandleTypeDef *hspi);
t_deviceStats* getGlobalDeviceStats();
#endif /* EEPROM_H_ */ #endif /* EEPROM_H_ */

18
cube/User/Src/eeprom.c
View File

@ -35,18 +35,15 @@ typedef union {
static const uint16_t EEPROM_HEADER_ADDR = 0; static const uint16_t EEPROM_HEADER_ADDR = 0;
static t_eepromHeader eepromHeader; static t_eepromHeader eepromHeader;
typedef union { typedef union {
struct __attribute__((__packed__)) s_deviceStats { t_deviceStats s;
uint32_t totalRunningHours; uint8_t b[sizeof(t_deviceStats)];
uint32_t totalPowercycles; } t_deviceStatsBlock;
uint32_t totalRequests;
uint32_t totalFailures;
} s;
uint8_t b[sizeof(struct s_deviceStats)];
} t_deviceStats;
static const uint16_t DEVICE_STATS_ADDR = 32; static const uint16_t DEVICE_STATS_ADDR = 32;
static t_deviceStats deviceStats; static t_deviceStatsBlock deviceStats;
static const uint8_t NUM_OF_BLOCKS = 2; static const uint8_t NUM_OF_BLOCKS = 2;
static const uint16_t BLOCK_ADDR[] = { 64, 4128 }; static const uint16_t BLOCK_ADDR[] = { 64, 4128 };
@ -62,6 +59,9 @@ typedef union {
} t_spiMsg; } t_spiMsg;
t_deviceStats* getGlobalDeviceStats() {
return &(deviceStats.s);
}
inline static void __EEPROM_CS(GPIO_PinState v) { inline static void __EEPROM_CS(GPIO_PinState v) {
HAL_GPIO_WritePin(EEPROM_CS_GPIO_Port, EEPROM_CS_Pin, v); HAL_GPIO_WritePin(EEPROM_CS_GPIO_Port, EEPROM_CS_Pin, v);

10
cube/User/Src/mqttComm.c
View File

@ -8,6 +8,7 @@
#include <wizHelper.h> #include <wizHelper.h>
#include <mbusComm.h> #include <mbusComm.h>
#include <oled.h> #include <oled.h>
#include <eeprom.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
@ -53,10 +54,12 @@ static void mqttCallback(char *topic, uint8_t *payload, uint16_t payloadLength)
static void mqttStatusPublisher(void *handle) { static void mqttStatusPublisher(void *handle) {
coloredMsg(LOG_GREEN, false, "mqsp: publishing status"); coloredMsg(LOG_GREEN, false, "mqsp: publishing status");
t_mbusCommStats *mbusCommStats = mbusCommGetStats(); t_mbusCommStats *mbusCommStats = mbusCommGetStats();
t_deviceStats* globalDeviceStats = getGlobalDeviceStats();
char buf[64]; char buf[64];
uint32_t uptime = HAL_GetTick() / 1000; uint32_t uptime = HAL_GetTick() / 1000;
snprintf(buf, 128, "{\"uptime\":\"%ld\", \"tasks\":\"%d\", \"requests\":\"%ld\", \"errors\":\"%ld\"}", snprintf(buf, 128, "{\"uptime\":\"%ld\", \"runningHours\":\"%ld\", \"powerCycles\":\"%ld\", \"tasks\":\"%d\", \"requests\":\"%ld\", \"errors\":\"%ld\"}",
uptime, schTaskCnt(), mbusCommStats->requestCnt, mbusCommStats->errorCnt); uptime, globalDeviceStats->totalRunningHours, globalDeviceStats->totalPowercycles, schTaskCnt(), mbusCommStats->requestCnt, mbusCommStats->errorCnt);
bool res = publish(&mqttClient, StatusTopic, (const uint8_t*)buf, strlen(buf), false); bool res = publish(&mqttClient, StatusTopic, (const uint8_t*)buf, strlen(buf), false);
coloredMsg(LOG_GREEN, false, "mqch, publish returned %d", res); coloredMsg(LOG_GREEN, false, "mqch, publish returned %d", res);
@ -66,8 +69,11 @@ static void mqttStatusPublisher(void *handle) {
oledPrintf(OLED_SCREEN1, "Addr:%d.%d.%d.%d", addr[0], addr[1], addr[2], addr[3]); oledPrintf(OLED_SCREEN1, "Addr:%d.%d.%d.%d", addr[0], addr[1], addr[2], addr[3]);
oledPrintf(OLED_SCREEN1, "Network available:%d", isNetworkAvailable()); oledPrintf(OLED_SCREEN1, "Network available:%d", isNetworkAvailable());
oledPrintf(OLED_SCREEN1, "Uptime:%ld", uptime); oledPrintf(OLED_SCREEN1, "Uptime:%ld", uptime);
oledPrintf(OLED_SCREEN1, "RunHours:%d", globalDeviceStats->totalRunningHours);
oledPrintf(OLED_SCREEN1, "PowerCycl:%d", globalDeviceStats->totalPowercycles);
oledPrintf(OLED_SCREEN1, "Req:%ld", mbusCommStats->requestCnt); oledPrintf(OLED_SCREEN1, "Req:%ld", mbusCommStats->requestCnt);
oledPrintf(OLED_SCREEN1, "Err:%ld", mbusCommStats->errorCnt); oledPrintf(OLED_SCREEN1, "Err:%ld", mbusCommStats->errorCnt);
} }
void mqttCommHandler(void *handle) { void mqttCommHandler(void *handle) {