Merge branch 'FirstReleaseOutThereBranch'

.gitignore

@@ -6,5 +6,5 @@ cube/pubsubc.a
 test
 .bash_history
 .vscode
-
+tools/ENV
 

configmaker/Makefile

@@ -1,9 +1,7 @@
 BUILD_DIR = build
 
 C_SOURCES = \
-../cube/User/Src/sha256.c \
+configmaker.c
-sink20169.c \
-logging.c
 
 
 C_INCLUDES = \
@@ -14,8 +12,8 @@ VERSION := $(shell git rev-parse --short=8 HEAD)
 
 CC = gcc
 CFLAGS = $(C_INCLUDES) -Wall -Werror -std=c99 -DVERSION="\"$(VERSION)\""
-LDFLAGS = -lconfig -lcurl
+LDFLAGS = -lconfig
-TARGET = sink20169
+TARGET = configmaker
 
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),OpenBSD)

configmaker/configmaker.c

@@ -3,60 +3,32 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <netinet/in.h>
 #include <string.h>
 #include <getopt.h>
-#include <pwd.h>
 
 #include <libconfig.h>
-#include <curl/curl.h>
 
 #include <sinkStruct.h>
-#include <logging.h>
 #include <sha256.h>
 
 
-const char DEFAULT_CONFIG_FILENAME[] = "./sink20169.cfg";
+const char DEFAULT_CONFIG_FILENAME[] = "./configmaker.cfg";
 
 typedef struct {
-    const char *deviceId;
+    uint32_t eepromMagic;
-    const char *location;
+    uint32_t configMagic;
-    const char *sharedSecret;
+    uint8_t macAddress[6];
-} t_device;
+    char deviceName[16];
-
+    char deviceId[16];
-typedef struct {
+    uint8_t sharedSecret[32];
-    config_t cfg;
+    char ntpServer[48];
-    uint16_t numOfDevices;
+    char sinkServer[48];
-    t_device *devices;    
 } t_configHandle;
 
-typedef struct {
+t_configHandle configHandle;
-    t_configHandle *configHandle;
-    int receiveSockFd;
-} t_receiverHandle;
-
-typedef struct {
-    t_configHandle *configHandle;
-    const char *influxUser;
-    const char *influxPass;
-    const char *influxServer;
-    uint16_t influxPort;
-    const char *influxDatabase;
-    const char *influxMeasurement;
-    char influxUrl[1024];
-} t_forwarderHandle;
-
-bool verbose = false;
 
 
 int initConfig(const char *configFilename, t_configHandle *configHandle) {
-    configHandle->numOfDevices = 0;
-    configHandle->devices = NULL;
-
     config_init(&(configHandle->cfg));
     if (! config_read_file(&(configHandle->cfg), configFilename)) {
         logmsg(LOG_ERR, "failed to read config file: %s:%d - %s\n",
@@ -275,11 +247,10 @@ int forwardMinuteBuffer(t_forwarderHandle *handle, t_minuteBuffer *buf) {
     const char *location = device->location;
 
     for (uint8_t j = 0; j < SECONDS_PER_MINUTE; j++) {
-        uint64_t timestamp = buf->s.timestamp + j;
+        logmsg(LOG_DEBUG, "Time: %lu, Frequency: %u", buf->s.events[j].timestamp, buf->s.events[j].frequency);
-        logmsg(LOG_DEBUG, "Time: %lu, Frequency: %u", timestamp, buf->s.frequency[j]);
 
-        int frequency_before_point = buf->s.frequency[j] / 1000;
+        int frequency_before_point = buf->s.events[j].frequency / 1000;
-        int frequency_behind_point = buf->s.frequency[j] - (frequency_before_point * 1000);
+        int frequency_behind_point = buf->s.events[j].frequency - (frequency_before_point * 1000);
 
         char payload[256];
         int res = snprintf(payload, sizeof(payload),
@@ -292,7 +263,7 @@ int forwardMinuteBuffer(t_forwarderHandle *handle, t_minuteBuffer *buf) {
                            "",
                            handle->influxMeasurement, location, buf->s.deviceId, 
                            frequency_before_point, frequency_behind_point, 
-                           timestamp);
+                           buf->s.events[j].timestamp);
         if (res > sizeof(payload)) {
             logmsg(LOG_ERR, "payload buffer to small");
             return -1;

configmaker/configmaker.cfg

@@ -0,0 +1,21 @@
+eepromMagic = 0xaffe000b;
+
+configMagic = 0xdead0007;
+
+macAddress = 0x...........;
+
+# max 16 octets
+deviceName = "MainsCnt01";
+
+# max 16 octets
+deviceId = "MainsCnt01";
+
+# exactly 31 octets
+sharedSecret = "5DVYZoB3TwGoFoLAPF8S8EkgURLPqjY";
+
+# max 48 octets
+ntpServer = "pool.ntp.org";
+
+# max 48 octets
+sinkServer = "sink.hottis.de";
+

cube/Makefile

@@ -1,8 +1,11 @@
-# Processed by ../tools/insertMyCode.sh
+# Processed by ../tools/insertMyCode.sh
 ##########################################################################################################################
 # File automatically-generated by tool: [projectgenerator] version: [3.10.0-B14] date: [Sat Feb 13 18:28:59 CET 2021]
 ##########################################################################################################################
 
+# FILE NOT LONGER UNDER CONTROL OF THE GENERATOR BUT MANUALLY MAINTAINED, 2020-02-16 #
+
+
 # ------------------------------------------------
 # Generic Makefile (based on gcc)
 #
@@ -11,6 +14,21 @@
 #   2015-07-22 - first version
 # ------------------------------------------------
 
+
+# Network implementations, to be set on commandline
+# LAN
+# WiFi
+# GSM
+
+# NETWORK = LAN
+
+ifndef NETWORK
+$(error NETWORK is not set)
+endif
+
+VERSION := $(shell git rev-parse --short=8 HEAD)
+
+
 ######################################
 # target
 ######################################
@@ -36,36 +54,61 @@ BUILD_DIR = build
 # source
 ######################################
 # C sources
-C_SOURCES =  \
+C_SOURCES =  \
-User/Src/cmdHandler.c User/Src/config.c User/Src/configCmds.c User/Src/counter.c User/Src/eeprom.c User/Src/logger.c User/Src/main2.c User/Src/ports.c User/Src/regularCmds.c User/Src/ringbuffer.c User/Src/sha256.c User/Src/show.c User/Src/utils.c User/Src/wizHelper.c hottislib/PontCoopScheduler.c  \
+User/Src/config.c \
-Core/Src/main.c \
+User/Src/counter.c \
-Core/Src/gpio.c \
+User/Src/eeprom.c \
-Core/Src/iwdg.c \
+User/Src/logger.c \
-Core/Src/spi.c \
+User/Src/main2.c \
-Core/Src/tim.c \
+User/Src/ringbuffer.c \
-Core/Src/usart.c \
+User/Src/sha256.c \
-Core/Src/stm32f1xx_it.c \
+User/Src/show.c \
-Core/Src/stm32f1xx_hal_msp.c \
+User/Src/utils.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c \
+User/Src/networkAbstractionLayer.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c \
+hottislib/PontCoopScheduler.c  \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c \
+Core/Src/main.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c \
+Core/Src/gpio.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c \
+Core/Src/iwdg.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c \
+Core/Src/spi.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c \
+Core/Src/tim.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c \
+Core/Src/usart.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c \
+Core/Src/stm32f1xx_it.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c \
+Core/Src/stm32f1xx_hal_msp.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c \
 Core/Src/system_stm32f1xx.c  
 
+ifeq ($(NETWORK), LAN)
+C_SOURCES += \
+User/Src/ports.c \
+User/Src/wizHelper.c \
+User/Src/networkAbstractionLayer_lan.c
+NETWORK_STACK=1
+endif
+
+ifeq ($(NETWORK), WiFi)
+C_SOURCES += \
+User/Src/networkAbstractionLayer_wifi.c \
+User/Src/modemCom.c
+NETWORK_STACK=2
+endif
+
 # ASM sources
-ASM_SOURCES =  \
+ASM_SOURCES =  \
 startup_stm32f103xb.s
 
 
@@ -109,8 +152,8 @@ MCU = $(CPU) -mthumb $(FPU) $(FLOAT-ABI)
 AS_DEFS = 
 
 # C defines
-C_DEFS =  \
+C_DEFS =  \
--DUSE_HAL_DRIVER \
+-DUSE_HAL_DRIVER \
 -DSTM32F103xB
 
 
@@ -118,25 +161,30 @@ C_DEFS =  \
 AS_INCLUDES = 
 
 # C includes
-C_INCLUDES =  \
+C_INCLUDES =  \
--Ihottislib \
+-Ihottislib \
--IUser/Inc \
+-IUser/Inc \
--IioLibrary_Driver/Internet/SNTP \
+-ICore/Inc \
--IioLibrary_Driver/Internet/DNS \
+-IDrivers/STM32F1xx_HAL_Driver/Inc \
--IioLibrary_Driver/Internet/DHCP \
+-IDrivers/STM32F1xx_HAL_Driver/Inc/Legacy \
--IioLibrary_Driver/Ethernet \
+-IDrivers/CMSIS/Device/ST/STM32F1xx/Include \
--ICore/Inc \
+-IDrivers/CMSIS/Include \
--IDrivers/STM32F1xx_HAL_Driver/Inc \
--IDrivers/STM32F1xx_HAL_Driver/Inc/Legacy \
--IDrivers/CMSIS/Device/ST/STM32F1xx/Include \
--IDrivers/CMSIS/Include \
 -IDrivers/CMSIS/Include
 
 
+ifeq ($(NETWORK), LAN)
+C_INCLUDES += \
+-IioLibrary_Driver/Internet/SNTP \
+-IioLibrary_Driver/Internet/DNS \
+-IioLibrary_Driver/Internet/DHCP \
+-IioLibrary_Driver/Ethernet
+endif
+
+
 # compile gcc flags
 ASFLAGS = $(MCU) $(AS_DEFS) $(AS_INCLUDES) $(OPT) -Wall -Werror -fdata-sections -ffunction-sections
 
-CFLAGS = $(MCU) $(C_DEFS) $(C_INCLUDES) $(OPT) -Wall -Werror -fdata-sections -ffunction-sections
+CFLAGS = $(MCU) $(C_DEFS) $(C_INCLUDES) $(OPT) -DNETWORK_STACK=$(NETWORK_STACK) -DVERSION="\"$(VERSION)\"" -Wall -Werror -fdata-sections -ffunction-sections
 
 ifeq ($(DEBUG), 1)
 CFLAGS += -g -gdwarf-2
@@ -168,14 +216,20 @@ all: $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET
 # list of objects
 OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(C_SOURCES:.c=.o)))
 vpath %.c $(sort $(dir $(C_SOURCES)))
-OBJECTS += $(addprefix $(BUILD_DIR)/,w5500.a)
+
+ifeq ($(NETWORK), LAN)
+OBJECTS += $(addprefix $(BUILD_DIR)/,w5500.a)
+endif
+
 # list of ASM program objects
 OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASM_SOURCES:.s=.o)))
 vpath %.s $(sort $(dir $(ASM_SOURCES)))
 
-$(BUILD_DIR)/w5500.a:
+ifeq ($(NETWORK), LAN)
-	(cd ioLibrary_Driver && $(MAKE) && cp w5500.a ../$(BUILD_DIR) && cd ..)
+$(BUILD_DIR)/w5500.a:
-
+	(cd ioLibrary_Driver && $(MAKE) && cp w5500.a ../$(BUILD_DIR) && cd ..)
+endif
+
 $(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR) 
 	$(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.c=.lst)) $< -o $@
 
@@ -206,4 +260,4 @@ clean:
 #######################################
 -include $(wildcard $(BUILD_DIR)/*.d)
 
-# *** EOF ***
+# *** EOF ***

cube/Makefile.sav

@@ -1,7 +1,11 @@
+# Processed by ../tools/insertMyCode.sh
 ##########################################################################################################################
 # File automatically-generated by tool: [projectgenerator] version: [3.10.0-B14] date: [Sat Feb 13 18:28:59 CET 2021]
 ##########################################################################################################################
 
+# FILE NOT LONGER UNDER CONTROL OF THE GENERATOR BUT MANUALLY MAINTAINED, 2020-02-16 #
+
+
 # ------------------------------------------------
 # Generic Makefile (based on gcc)
 #
@@ -10,6 +14,21 @@
 #   2015-07-22 - first version
 # ------------------------------------------------
 
+
+# Network implementations, to be set on commandline
+# LAN
+# WiFi
+# GSM
+
+# NETWORK = LAN
+
+ifndef NETWORK
+$(error NETWORK is not set)
+endif
+
+VERSION := $(shell git rev-parse --short=8 HEAD)
+
+
 ######################################
 # target
 ######################################
@@ -35,35 +54,61 @@ BUILD_DIR = build
 # source
 ######################################
 # C sources
-C_SOURCES =  \
+C_SOURCES =  \
-Core/Src/main.c \
+User/Src/config.c \
-Core/Src/gpio.c \
+User/Src/counter.c \
-Core/Src/iwdg.c \
+User/Src/eeprom.c \
-Core/Src/spi.c \
+User/Src/logger.c \
-Core/Src/tim.c \
+User/Src/main2.c \
-Core/Src/usart.c \
+User/Src/ringbuffer.c \
-Core/Src/stm32f1xx_it.c \
+User/Src/sha256.c \
-Core/Src/stm32f1xx_hal_msp.c \
+User/Src/show.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c \
+User/Src/utils.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c \
+User/Src/networkAbstractionLayer.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c \
+hottislib/PontCoopScheduler.c  \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c \
+Core/Src/main.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c \
+Core/Src/gpio.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c \
+Core/Src/iwdg.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c \
+Core/Src/spi.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c \
+Core/Src/tim.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c \
+Core/Src/usart.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c \
+Core/Src/stm32f1xx_it.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c \
+Core/Src/stm32f1xx_hal_msp.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c \
 Core/Src/system_stm32f1xx.c  
 
+ifeq ($(NETWORK), LAN)
+C_SOURCES += \
+User/Src/ports.c \
+User/Src/wizHelper.c \
+User/Src/networkAbstractionLayer_lan.c
+NETWORK_STACK=1
+endif
+
+ifeq ($(NETWORK), WiFi)
+C_SOURCES += \
+User/Src/networkAbstractionLayer_wifi.c \
+User/Src/modemCom.c
+NETWORK_STACK=2
+endif
+
 # ASM sources
-ASM_SOURCES =  \
+ASM_SOURCES =  \
 startup_stm32f103xb.s
 
 
@@ -107,8 +152,8 @@ MCU = $(CPU) -mthumb $(FPU) $(FLOAT-ABI)
 AS_DEFS = 
 
 # C defines
-C_DEFS =  \
+C_DEFS =  \
--DUSE_HAL_DRIVER \
+-DUSE_HAL_DRIVER \
 -DSTM32F103xB
 
 
@@ -116,19 +161,30 @@ C_DEFS =  \
 AS_INCLUDES = 
 
 # C includes
-C_INCLUDES =  \
+C_INCLUDES =  \
--ICore/Inc \
+-Ihottislib \
--IDrivers/STM32F1xx_HAL_Driver/Inc \
+-IUser/Inc \
--IDrivers/STM32F1xx_HAL_Driver/Inc/Legacy \
+-ICore/Inc \
--IDrivers/CMSIS/Device/ST/STM32F1xx/Include \
+-IDrivers/STM32F1xx_HAL_Driver/Inc \
--IDrivers/CMSIS/Include \
+-IDrivers/STM32F1xx_HAL_Driver/Inc/Legacy \
+-IDrivers/CMSIS/Device/ST/STM32F1xx/Include \
+-IDrivers/CMSIS/Include \
 -IDrivers/CMSIS/Include
 
 
-# compile gcc flags
+ifeq ($(NETWORK), LAN)
-ASFLAGS = $(MCU) $(AS_DEFS) $(AS_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections
+C_INCLUDES += \
+-IioLibrary_Driver/Internet/SNTP \
+-IioLibrary_Driver/Internet/DNS \
+-IioLibrary_Driver/Internet/DHCP \
+-IioLibrary_Driver/Ethernet
+endif
 
-CFLAGS = $(MCU) $(C_DEFS) $(C_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections
+
+# compile gcc flags
+ASFLAGS = $(MCU) $(AS_DEFS) $(AS_INCLUDES) $(OPT) -Wall -Werror -fdata-sections -ffunction-sections
+
+CFLAGS = $(MCU) $(C_DEFS) $(C_INCLUDES) $(OPT) -DNETWORK_STACK=$(NETWORK_STACK) -DVERSION="\"$(VERSION)\"" -Wall -Werror -fdata-sections -ffunction-sections
 
 ifeq ($(DEBUG), 1)
 CFLAGS += -g -gdwarf-2
@@ -148,7 +204,7 @@ LDSCRIPT = STM32F103C8Tx_FLASH.ld
 # libraries
 LIBS = -lc -lm -lnosys 
 LIBDIR = 
-LDFLAGS = $(MCU) -specs=nano.specs -T$(LDSCRIPT) $(LIBDIR) $(LIBS) -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref -Wl,--gc-sections
+LDFLAGS = $(MCU) -specs=nano.specs -u _printf_float -T$(LDSCRIPT) $(LIBDIR) $(LIBS) -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref -Wl,--gc-sections
 
 # default action: build all
 all: $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).bin
@@ -160,10 +216,20 @@ all: $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET
 # list of objects
 OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(C_SOURCES:.c=.o)))
 vpath %.c $(sort $(dir $(C_SOURCES)))
+
+ifeq ($(NETWORK), LAN)
+OBJECTS += $(addprefix $(BUILD_DIR)/,w5500.a)
+endif
+
 # list of ASM program objects
 OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASM_SOURCES:.s=.o)))
 vpath %.s $(sort $(dir $(ASM_SOURCES)))
 
+ifeq ($(NETWORK), LAN)
+$(BUILD_DIR)/w5500.a:
+	(cd ioLibrary_Driver && $(MAKE) && cp w5500.a ../$(BUILD_DIR) && cd ..)
+endif
+
 $(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR) 
 	$(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.c=.lst)) $< -o $@
 
@@ -194,4 +260,4 @@ clean:
 #######################################
 -include $(wildcard $(BUILD_DIR)/*.d)
 
-# *** EOF ***
+# *** EOF ***

cube/User/Inc/cmdHandler.h

@@ -1,9 +0,0 @@
-#ifndef _CMDHANDLER_H_
-#define _CMDHANDLER_H_
-
-#include <stdint.h>
-
-void cmdHandlerInit();
-
-
-#endif /* _CMDHANDLER_H_ */

cube/User/Inc/cmdHelper.h

@@ -1,23 +0,0 @@
-#ifndef _CMDHELPER_H_
-#define _CMDHELPER_H_
-
-#include <stdint.h>
-#include <stdbool.h>
-
-
-typedef bool (*cmdFunc_t)(uint8_t argc, char **args);
-
-typedef struct {
-    char name[24];
-    char help[512];
-    cmdFunc_t cmdFunc;
-} cmd_t;
-
-void sendString(const char *buf);
-bool sendFormatString(const char *format, ...);
-
-const cmd_t *getRegularCommands();
-const cmd_t *getAdminCommands();
-const cmd_t *getConfigCommands();
-
-#endif /* _CMDHELPER_H_ */

cube/User/Inc/config.h

@@ -4,17 +4,25 @@
 #include <stdint.h>
 #include <sha256.h>
 
-#define CONFIG_MAGIC 0xdead0007
+#define CONFIG_MAGIC 0xdead0008
 
 typedef struct __attribute__((__packed__)) s_configBlock {
     uint32_t configMagic;
     char deviceName[16];
-    uint8_t macAddress[6];
     char ntpServer[48];
     char deviceId[16];
     char sharedSecret[SHA256_BLOCK_SIZE];
     char sinkServer[48];
-    uint8_t filler[22];
+    union {
+        struct {
+            uint8_t macAddress[6];
+        } lan;
+        struct {
+            char ssid[48];
+            char key[65];     // the actual key may have up to 64 chars and has to end with a \0
+        } wifi;
+    } networkspecific;
+    uint8_t filler[11];
 } t_configBlock;
 
 

cube/User/Inc/modemCom.h

@@ -0,0 +1,16 @@
+#ifndef _MODEM_COM_H_
+#define _MODEM_COM_H_
+
+#include <usart.h>
+
+
+
+#if NETWORK_STACK == 2 // WiFi
+void modemTxCpltCallback(UART_HandleTypeDef *huart);
+void modemRxCpltCallback(UART_HandleTypeDef *huart);
+#endif
+
+
+
+
+#endif // _MODEM_COM_H_

cube/User/Inc/networkAbstractionLayer.h

@@ -0,0 +1,21 @@
+#ifndef _NETWORK_ABSTRACTION_LAYER_H_
+#define _NETWORK_ABSTRACTION_LAYER_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <sinkStruct.h>
+
+
+typedef struct {
+    uint64_t seconds;
+    uint32_t missedUpdates;
+    bool valid;
+} t_seconds;
+
+void networkInit();
+t_seconds* networkGetSeconds();
+int8_t networkSendMinuteBuffer(t_minuteBuffer *minuteBuffer);
+
+
+
+#endif /* _NETWORK_ABSTRACTION_LAYER_H_ */

cube/User/Inc/networkAbstractionLayer_impl.h

@@ -0,0 +1,12 @@
+#ifndef _NETWORK_ABSTRACTION_LAYER_IMPL_H_
+#define _NETWORK_ABSTRACTION_LAYER_IMPL_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+
+uint64_t networkSntpQuery();
+int8_t networkUdpSend(char *hostname, uint16_t port, uint8_t *buf, uint16_t bufLen);
+void networkImplInit();
+bool isNetworkAvailable();
+
+#endif /* _NETWORK_ABSTRACTION_LAYER_IMPL_H_ */

cube/User/Inc/show.h

@@ -12,7 +12,7 @@ typedef enum {
     LED_BLUE
 } signalPin_t;
 
-typedef enum { ON, OFF, TOGGLE, BLINK } signalAction_t;
+typedef enum { ON, OFF, TOGGLE, BLINK, BLINK_FAST } signalAction_t;
 
 void showInit();
 void show(signalPin_t signalPin, signalAction_t action);

cube/User/Inc/sinkStruct.h

@@ -9,6 +9,10 @@
 typedef struct __attribute__((__packed__)) {
     char deviceId[sizeof(((t_configBlock*)0)->deviceId)];
     uint8_t hash[SHA256_BLOCK_SIZE];
+    uint32_t totalRunningHours;
+    uint32_t totalPowercycles;
+    uint32_t totalWatchdogResets;
+    uint32_t version;
     uint64_t timestamp;
     uint32_t frequency[SECONDS_PER_MINUTE];
 } t_minuteStruct;

cube/User/Inc/wizHelper.h

@@ -5,18 +5,11 @@
 #include <stdint.h>
 
 
-typedef struct {
-    uint64_t seconds;
-    uint32_t missedUpdates;
-    bool valid;
-} t_seconds;
 
 int wizInit();
-bool isNetworkAvailable();
+bool wizIsNetworkAvailable();
 uint8_t* wizGetIPAddress();
 bool wizDnsQuery(char *name, uint8_t *ip);
 
-t_seconds* wizGetSeconds();
-
 
 #endif // _WIZHELPER_H_

cube/User/Src/cmdHandler.c

@@ -1,326 +0,0 @@
-#include <cmdHandler.h>
-#include <cmdHelper.h>
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include <socket.h>
-
-#include <logger.h>
-#include <PontCoopScheduler.h>
-#include <wizHelper.h>
-#include <config.h>
-
-
-extern const uint8_t CMD_SOCK;
-
-const uint16_t cmdPort = 23;
-
-typedef enum {
-    CH_INIT,
-    CH_LISTEN,
-    CH_WAITING,
-    CH_BANNER,
-    CH_PROMPT,
-    CH_RECEIVE,
-    CH_DISCONNECT,
-    CH_DISCONNECT_WAIT,
-    CH_ERROR
-} chState_t;
-
-void sendString(const char *buf) {
-        send(CMD_SOCK, (uint8_t*)buf, strlen(buf));
-}
-
-bool sendFormatString(const char *format, ...) {
-    bool retCode = true;
-    va_list vl;
-    va_start(vl, format);
-    char buf[4096];
-    int vcnt = vsnprintf(buf, sizeof(buf), format, vl);
-    retCode = (vcnt < sizeof(buf));
-    va_end(vl);
-    sendString(buf);
-    return retCode;
-}
-
-// returns 0 to continue waiting for input
-// returns -1 to close the connection
-// returns 1 to toggle to admin mode
-// returns 2 to toggle to config mode
-// returns 3 to toggle back to default mode
-static int8_t cmdExecuteCommand(uint8_t *cmdLine, bool resetSpecialModes) {
-    const static char HELP_MSG[] = \
-      "Usage\n\r" \
-      "\n\r" \
-      "help ................................. Show this help page\n\r" \
-      "quit ................................. Terminate the console session\n\r" \
-      "config ............................... Enter configuration mode\n\r" \
-      ;
-    const static char CONFIG_INTRO_MSG[] = \
-      "In configuration mode each command changing the configuration\n\r" \
-      "will save changes directly to the EEPROM.\n\r" \
-      "However, the system will only consider these changes after a\n\r" \
-      "restart since only in this sitution the EEPROM is read.\n\r" \
-      "\n\r" \
-      ;
-    const static char GOODBYE_MSG[] = "Good bye\n\r";
-    const static char OK_MSG[] = "OK\n\r";
-    const static char FAILED_MSG[] = "Failed\n\r";
-    const static char UNKNOWN_COMMAND[] = "Unknown command\n\r";
-    uint8_t *messageToSend = NULL;
-
-    static bool configMode = false;
-
-    if (resetSpecialModes) {
-        configMode = false;
-    }
-
-    cmd_t const * commands = getRegularCommands();
-    if (configMode) {
-        commands = getConfigCommands();
-    }
-
-    coloredMsg(LOG_YELLOW, "ch cec cmdLine is %s", cmdLine);;
-
-    #define MAX_NUM_OF_ARGS 8
-    char *args[MAX_NUM_OF_TASKS];
-    uint8_t argc = 0;
-    char *inCmdLine = (char*)cmdLine;
-    do {
-        args[argc++] = strtok(inCmdLine, " ");
-        inCmdLine = NULL;
-    } while (args[argc - 1] != NULL);
-    if (argc > 0) {
-        argc--;
-    }
-    char *cmd = args[0];
-
-    int8_t retCode = 0;
-    coloredMsg(LOG_YELLOW, "ch cec cmd is %s, number of arguments %d", cmd, argc);
-
-    if (0 == strcmp(cmd, "quit")) {
-        messageToSend = (uint8_t*)GOODBYE_MSG;
-        retCode = -1;
-    } else if (0 == strcmp(cmd, "help")) {
-        if (configMode) {
-            sendString(CONFIG_INTRO_MSG);
-        }
-        sendString(HELP_MSG);
-        uint8_t cmdIdx = 0;
-        while (true) {
-            cmd_t command = commands[cmdIdx];
-            if (0 == strcmp("END_OF_CMDS", command.name)) {
-                break;
-            }
-            sendString(command.help);
-            cmdIdx++;
-        }
-        messageToSend = NULL;
-    } else if (0 == strcmp(cmd, "config")) {
-        coloredMsg(LOG_YELLOW, "ch cec enable config mode");
-        configMode = true;
-        retCode = 2;
-    } else {
-        uint8_t cmdIdx = 0;
-        while (true) {
-            cmd_t command = commands[cmdIdx];
-            if (0 == strcmp("END_OF_CMDS", command.name)) {
-                messageToSend = (uint8_t*) UNKNOWN_COMMAND;
-                break;
-            }
-            if (0 == strcmp(cmd, command.name)) {
-                messageToSend = command.cmdFunc(argc, args) ? (uint8_t*)OK_MSG : (uint8_t*)FAILED_MSG;
-                break;
-            }
-            cmdIdx++;
-        }
-    }
-
-    if (messageToSend) {
-        coloredMsg(LOG_YELLOW, "ch cec command finally returns %s", messageToSend);
-        send(CMD_SOCK, messageToSend, strlen((char*)messageToSend));
-    }
-
-    return retCode;
-}
-
-static void cmdHandlerEngine(void *handle) {
-    static uint8_t receiveBuffer[256];
-
-    static chState_t state = CH_INIT;
-    static bool resetSpecialModes = false;
-
-    static char banner[] = \
-      "MBGW3\n\r" \
-      "Type help for usage help\n\r" \
-      "or quit to close the connection.\n\r";
-
-    static char *prompt;
-    static char defaultPrompt[] = " > ";
-    static char configPrompt[] = " (config) $ ";
-
-
-    int8_t res = 0;
-    uint8_t sockState;
-    int32_t resultSend;
-    int16_t receivedOctets;
-    int32_t resultRecv;
-    uint8_t resultDisconnect;
-
-
-    if (isNetworkAvailable()) {
-        switch (state) {
-        case CH_INIT:
-            coloredMsg(LOG_YELLOW, "ch che initializing socket");
-
-            res = socket(CMD_SOCK, Sn_MR_TCP, cmdPort, SF_IO_NONBLOCK);
-            coloredMsg(LOG_YELLOW, "ch che socket returns %d", res);
-
-            if (res == CMD_SOCK) {
-                coloredMsg(LOG_YELLOW, "ch che socket is initialized");
-                state = CH_LISTEN;
-            } else {
-                state = CH_ERROR;
-            }
-            break;
-
-        case CH_LISTEN:
-            coloredMsg(LOG_YELLOW, "ch che listening");
-            
-            res = listen(CMD_SOCK);
-            coloredMsg(LOG_YELLOW, "ch che listen returns %d", res);
-
-            if (res == SOCK_OK) {
-                coloredMsg(LOG_YELLOW, "ch che ok, waiting for established");
-                state = CH_WAITING;
-            } else {
-                state = CH_ERROR;
-            }
-            break;
-
-        case CH_WAITING:
-            sockState = getSn_SR(CMD_SOCK);
-            if (sockState != SOCK_LISTEN) {
-                coloredMsg(LOG_YELLOW, "ch che socket state is 0x%02x", sockState);
-                state = CH_DISCONNECT;
-            }
-
-            if (sockState == SOCK_ESTABLISHED) {
-                coloredMsg(LOG_YELLOW, "ch che connection is established");
-                state = CH_BANNER;
-            }
-            break;
-
-        case CH_BANNER:
-            coloredMsg(LOG_YELLOW, "ch che send banner");
-            sockState = getSn_SR(CMD_SOCK);
-            if (sockState != SOCK_ESTABLISHED) {
-                coloredMsg(LOG_YELLOW, "ch che sockState is 0x%02x when trying to send banner", sockState);
-                state = CH_DISCONNECT;
-            } else {
-                resultSend = send(CMD_SOCK, (uint8_t*)banner, strlen(banner));
-                coloredMsg(LOG_YELLOW, "ch che sent banner, send returns 0x%02x", resultSend);
-                prompt = defaultPrompt;
-                resetSpecialModes = true;
-                state = CH_PROMPT;
-            }
-            break;
-
-        case CH_PROMPT:
-            coloredMsg(LOG_YELLOW, "ch che send prompt");
-            sockState = getSn_SR(CMD_SOCK);
-            if (sockState != SOCK_ESTABLISHED) {
-                coloredMsg(LOG_YELLOW, "ch che sockState is 0x%02x when trying to send promt", sockState);
-                state = CH_DISCONNECT;
-            } else {
-                sendFormatString("%s %s", getConfig()->deviceName, prompt);
-                coloredMsg(LOG_YELLOW, "ch che sent prompt %s %s", getConfig()->deviceName, prompt);
-                state = CH_RECEIVE;
-            }
-            break;
-
-        case CH_RECEIVE:
-            sockState = getSn_SR(CMD_SOCK);
-            if (sockState != SOCK_ESTABLISHED) {
-                coloredMsg(LOG_YELLOW, "ch che sockState is 0x%02x when trying to receive something", sockState);
-                state = CH_DISCONNECT;
-            } else {
-                receivedOctets = getSn_RX_RSR(CMD_SOCK);
-
-                if (receivedOctets > 0) {
-                    memset(receiveBuffer, 0, sizeof(receiveBuffer));
-                    resultRecv = recv(CMD_SOCK, receiveBuffer, sizeof(receiveBuffer));
-                    coloredMsg(LOG_YELLOW, "ch che recv returns 0x%02x", resultRecv);
-                    if (resultRecv > 0) {
-                        if ((receiveBuffer[strlen((char*)receiveBuffer) - 1] == 0x0a) ||
-                            (receiveBuffer[strlen((char*)receiveBuffer) - 1] == 0x0d)) {
-                            receiveBuffer[strlen((char*)receiveBuffer) - 1] = 0;
-                        }
-                        if ((receiveBuffer[strlen((char*)receiveBuffer) - 1] == 0x0a) ||
-                            (receiveBuffer[strlen((char*)receiveBuffer) - 1] == 0x0d)) {
-                            receiveBuffer[strlen((char*)receiveBuffer) - 1] = 0;
-                        }
-                        coloredMsg(LOG_YELLOW, "ch che received: %s", receiveBuffer);
-                        int8_t resCEC = cmdExecuteCommand(receiveBuffer, resetSpecialModes);
-                        resetSpecialModes = false;
-                        switch (resCEC) {
-                            case 0:
-                                state = CH_PROMPT;
-                                break;
-                            case -1:
-                                state = CH_DISCONNECT;
-                                break;
-                            case 2:
-                                prompt = configPrompt;
-                                state = CH_PROMPT;
-                                break;
-                            case 3:
-                                prompt = defaultPrompt;
-                                state = CH_PROMPT;
-                                break;
-                            default:
-                                state = CH_DISCONNECT;
-                                break;
-                        }
-                    }
-                }
-            }
-            break;
-
-        case CH_DISCONNECT:
-            coloredMsg(LOG_YELLOW, "ch che close our end");
-            resultDisconnect = disconnect(CMD_SOCK);
-            coloredMsg(LOG_YELLOW, "ch che disconnect returns 0x%02x", resultDisconnect);
-            state = CH_DISCONNECT_WAIT;
-            break;
-
-        case CH_DISCONNECT_WAIT:
-            //coloredMsg(LOG_YELLOW, "ch che waiting after disconnect");
-            sockState = getSn_SR(CMD_SOCK);
-            //coloredMsg(LOG_YELLOW, "ch che sockState is 0x%02x", sockState);
-            if (sockState == SOCK_CLOSED) {
-                coloredMsg(LOG_YELLOW, "ch che socket is closed now");
-                state = CH_INIT;
-            }
-            break;
-        
-
-        case CH_ERROR:
-            coloredMsg(LOG_YELLOW, "ch che error state, will stop here");
-            schDel(cmdHandlerEngine, NULL);
-            state = CH_INIT;
-            schAdd(cmdHandlerEngine, NULL, 5000, 100);
-            coloredMsg(LOG_YELLOW, "ch che restart command handler engine in 5s");
-            break;
-        }
-    }
-}
-
-void cmdHandlerInit() {
-    schAdd(cmdHandlerEngine, NULL, 0, 100);
-}

cube/User/Src/config.c

@@ -10,12 +10,11 @@
 t_configBlock defaultConfigBlock = {
     .configMagic = CONFIG_MAGIC,
     .deviceName = "MainsCnt",
-    .macAddress = { 0x00, 0xA0, 0x57, 0x05, 0x3E, 0x0F },
+    .networkspecific.lan.macAddress = { 0x00, 0xA0, 0x57, 0x05, 0x3E, 0x0F },
     .ntpServer = "0.de.pool.ntp.org",
     .deviceId = "MainsCnt01",
     .sharedSecret = "sharedSecretGanzGeheim",
-    .sinkServer = "laborpc",
+    .sinkServer = "laborpc"
-    .filler = { 0 }
 };
 
 
@@ -44,12 +43,12 @@ void configInit() {
     }
     coloredMsg(LOG_BLUE, "cfg ci configMagic:         %lx", mainConfigBlock.configMagic);
     coloredMsg(LOG_BLUE, "cfg ci deviceName:          %s", mainConfigBlock.deviceName);
-    coloredMsg(LOG_BLUE, "cfg ci MAC address:         %02x:%02x:%02x:%02x:%02x:%02x", mainConfigBlock.macAddress[0], 
+    // coloredMsg(LOG_BLUE, "cfg ci MAC address:         %02x:%02x:%02x:%02x:%02x:%02x", mainConfigBlock.macAddress[0], 
-                                                                                      mainConfigBlock.macAddress[1], 
+    //                                                                                   mainConfigBlock.macAddress[1], 
-                                                                                      mainConfigBlock.macAddress[2], 
+    //                                                                                   mainConfigBlock.macAddress[2], 
-                                                                                      mainConfigBlock.macAddress[3], 
+    //                                                                                   mainConfigBlock.macAddress[3], 
-                                                                                      mainConfigBlock.macAddress[4], 
+    //                                                                                   mainConfigBlock.macAddress[4], 
-                                                                                      mainConfigBlock.macAddress[5]);
+    //                                                                                   mainConfigBlock.macAddress[5]);
     coloredMsg(LOG_BLUE, "cfg ci ntp server:          %s", mainConfigBlock.ntpServer);
     coloredMsg(LOG_BLUE, "cfg ci deviceId:            %s", mainConfigBlock.deviceId);
     coloredMsg(LOG_BLUE, "cfg ci sharedSecret:        %s", mainConfigBlock.sharedSecret);

cube/User/Src/configCmds.c

@@ -1,212 +0,0 @@
-#include <cmdHelper.h>
-#include <logger.h>
-
-#include <eeprom.h>
-#include <config.h>
-
-#include <string.h>
-#include <stdlib.h>
-
-
-
-static bool showConfigCmd(uint8_t argc, char **args) {
-    bool retCode = true;
-
-    t_configBlock configBlock;
-    eepromReadConfigBlock(&configBlock);
-    sendString("This is the saved configuration.\n\r");
-    sendString("It is not necessarily the active configuration.\n\r");
-    sendFormatString("configMagic:         %lx\n\r", configBlock.configMagic);
-    sendFormatString("deviceName:          %s\n\r", configBlock.deviceName);
-    sendFormatString("MAC address:         %02x:%02x:%02x:%02x:%02x:%02x\n\r", configBlock.macAddress[0], 
-                                                                           configBlock.macAddress[1], 
-                                                                           configBlock.macAddress[2], 
-                                                                           configBlock.macAddress[3], 
-                                                                           configBlock.macAddress[4], 
-                                                                           configBlock.macAddress[5]);
-    sendFormatString("NTP Server:          %s\n\r", configBlock.ntpServer);
-    sendFormatString("deviceId:            %s\n\r", configBlock.deviceId);
-    sendFormatString("sharedSecret:        (will not be displayed)\n\r");
-    sendFormatString("Sink Server:         %s\n\r", configBlock.sinkServer);
-
-    return retCode;
-}
-
-static bool setStringParameterCmd(uint8_t argc, char **args, size_t offset, size_t length) {
-    bool retCode = true;
-
-    t_configBlock configBlock;
-    char *parameterName = args[1];
-    char *newParameterValue = args[2];
-    if (strlen(newParameterValue) >= length) {
-        sendString("given new value for is too long\n\r");
-        retCode = false;
-    } else {
-        sendFormatString("set %s to %s\n\r", parameterName, newParameterValue);
-
-        eepromReadConfigBlock(&configBlock);
-        strcpy((((char*)&configBlock) + offset), newParameterValue);
-        eepromWriteConfigBlock(&configBlock);
-    }
-
-    return retCode;
-}
-
-/*
-static bool setInt32ParameterCmd(uint8_t argc, char **args, size_t offset, int32_t minV, int32_t maxV) {
-    bool retCode = true;
-
-    t_configBlock configBlock;
-    char *parameterName = args[1];
-    char *newParameterValue = args[2];
-    long int value = strtol(newParameterValue, NULL, 10);
-    if (value < minV) {
-        sendString("value is too small\n\r");
-        retCode = false;
-    } else if (value > maxV) {
-        sendString("value is too large\n\r");
-    } else {
-        int32_t v = (int32_t) value;
-        sendFormatString("set %s to %ld\n\r", parameterName, v);
-
-        eepromReadConfigBlock(&configBlock);
-        *((int32_t*)(((uint8_t*)&configBlock) + offset)) = v;
-        eepromWriteConfigBlock(&configBlock);
-    }
-
-    return retCode;
-}
-*/
-
-static bool setDeviceNameCmd(uint8_t argc, char **args) {
-    return setStringParameterCmd(argc, args, 
-                                 offsetof(t_configBlock, deviceName), 
-                                 sizeof(((t_configBlock*)0)->deviceName));
-}
-
-static bool setNtpServerCmd(uint8_t argc, char **args) {
-    return setStringParameterCmd(argc, args, 
-                                 offsetof(t_configBlock, ntpServer), 
-                                 sizeof(((t_configBlock*)0)->ntpServer));
-}
-
-static bool setDeviceIdCmd(uint8_t argc, char **args) {
-    return setStringParameterCmd(argc, args, 
-                                 offsetof(t_configBlock, deviceId), 
-                                 sizeof(((t_configBlock*)0)->deviceId));
-}
-
-static bool setSharedSecretCmd(uint8_t argc, char **args) {
-    return setStringParameterCmd(argc, args, 
-                                 offsetof(t_configBlock, sharedSecret), 
-                                 sizeof(((t_configBlock*)0)->sharedSecret));
-}
-
-static bool setSinkServerCmd(uint8_t argc, char **args) {
-    return setStringParameterCmd(argc, args, 
-                                 offsetof(t_configBlock, sinkServer), 
-                                 sizeof(((t_configBlock*)0)->sinkServer));
-}
-
-
-const static cmd_t SET_COMMANDS[] = {
-    { .name = "devicename", .cmdFunc = setDeviceNameCmd,
-      .help = \
-        "devicename ........................... Name of this device\n\r"
-    },
-    { .name = "ntpserver", .cmdFunc = setNtpServerCmd,
-      .help = \
-        "ntpserver ............................ Name of the NTP server\n\r"
-    },
-    { .name = "deviceid", .cmdFunc = setDeviceIdCmd,
-      .help = \
-        "deviceid ............................. ID of this device\n\r"
-    },
-    { .name = "sharedSecret", .cmdFunc = setSharedSecretCmd,
-      .help = \
-        "sharedsecret ......................... Shared secret\n\r"
-    },
-    { .name = "sinkserver", .cmdFunc = setSinkServerCmd,
-      .help = \
-        "sinkserver ........................... Name of the sink server\n\r"
-    },
-    { .name = "END_OF_CMDS", .help = "",.cmdFunc = NULL }
-};
-
-const static char UNKNOWN_PARAMETER[] = "unknown parameter\n\r";
-const static char OK_MSG[] = "OK\n\r";
-const static char FAILED_MSG[] = "Failed\n\r";
-
-static bool setCmd(uint8_t argc, char **args) {
-    bool retCode = false;
-    uint8_t *messageToSend = NULL;
-
-    char *cmd = args[1];
-    if (argc >= 2) {
-        if (0 == strcmp("help", cmd)) {
-            sendString("You can set the following parameters:\n\r");
-            uint8_t cmdIdx = 0;
-            while (true) {
-                cmd_t command = SET_COMMANDS[cmdIdx];
-                if (0 == strcmp("END_OF_CMDS", command.name)) {
-                    break;
-                }
-                sendString(command.help);
-                cmdIdx++;
-            }
-            retCode = true;
-        } else {
-            uint8_t cmdIdx = 0;
-            while (true) {
-                cmd_t command = SET_COMMANDS[cmdIdx];
-                if (0 == strcmp("END_OF_CMDS", command.name)) {
-                    messageToSend = (uint8_t*) UNKNOWN_PARAMETER;
-                    break;
-                }
-                if (0 == strcmp(cmd, command.name)) {
-                    retCode = command.cmdFunc(argc, args);
-                    messageToSend =  retCode ? (uint8_t*)OK_MSG : (uint8_t*)FAILED_MSG;
-                    sendString("Remember you need to restart to active this change.\n\r");
-                    break;
-                }
-                cmdIdx++;
-            }
-            sendString((const char*)messageToSend);
-        }
-    }
-
-    return retCode;
-}
-
-static bool restartCmd(uint8_t argc, char **args) {
-    HAL_NVIC_SystemReset();
-    // you won't come here ...
-    return true;
-}
-
-
-
-const cmd_t CONFIG_COMMANDS[] = {
-    { .name = "show", .cmdFunc = showConfigCmd,
-      .help = \
-        "show ................................. Show the configuration\n\r"
-    },
-    { .name = "set", .cmdFunc = setCmd,
-      .help = \
-        "set .................................. Set configuration parameters\n\r" \
-        "                                       Argument help gives a list of \n\r" \
-        "                                       parameters\n\r"
-    },
-    { .name = "restart", .cmdFunc = restartCmd,
-      .help = \
-        "restart .............................. Restart the system,\n\r" \
-        "                                       Required to reload config\n\r"
-    },
-    { .name = "END_OF_CMDS", .help = "",.cmdFunc = NULL }
-};
-
-
-
-const cmd_t *getConfigCommands() {
-    return CONFIG_COMMANDS;
-}

cube/User/Src/counter.c

@@ -1,5 +1,6 @@
 #include <stdint.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include <tim.h>
 
@@ -7,11 +8,11 @@
 #include <show.h>
 #include <logger.h>
 #include <PontCoopScheduler.h>
-#include <wizHelper.h>
 #include <config.h>
-#include <socket.h>
 #include <sinkStruct.h>
 #include <sha256.h>
+#include <eeprom.h>
+#include <networkAbstractionLayer.h>
 
 
 
@@ -25,6 +26,7 @@ volatile static uint32_t mainsCntSum = 0;
 volatile static uint32_t mainsCntCnt = 0;
 
 static t_seconds *seconds;
+static t_deviceStats *deviceStats;
 
 
 
@@ -35,33 +37,6 @@ uint8_t activeMinuteBuffer;
 
 static t_configBlock *config;
 
-extern uint8_t SINK_SOCK;
-const uint16_t SINK_PORT = 20169;
-
-int8_t counterSendMinuteBuffer(t_minuteBuffer *minuteBuffer) {
-    uint8_t sinkAddr[4];
-    if (! wizDnsQuery(config->sinkServer, sinkAddr)) {
-        coloredMsg(LOG_BLUE, "csmb, failed to resolve sink server name");
-        return -1;
-    } else {
-        coloredMsg(LOG_BLUE, "csmb, sink server at %d.%d.%d.%d", sinkAddr[0], sinkAddr[1], sinkAddr[2], sinkAddr[3]);
-    }
-
-
-    socket(SINK_SOCK, Sn_MR_UDP, SINK_PORT, 0);
-    uint8_t sockState = getSn_SR(SINK_SOCK);
-    if (sockState == SOCK_UDP) {
-        sendto(SINK_SOCK, minuteBuffer->b, sizeof(minuteBuffer->b), sinkAddr, SINK_PORT);
-        coloredMsg(LOG_BLUE, "csmb, sent");
-    } else {
-        coloredMsg(LOG_BLUE, "csmb, socket in unexpected state: %d", sockState);
-        return -2;
-    }
-
-    close(SINK_SOCK);
-
-    return 1;
-}
 
 void counterMinuteTick(void *handle) {
     for (uint8_t minuteBufferIdx = 0; minuteBufferIdx < NUM_OF_MINUTE_BUFFERS; minuteBufferIdx++) {
@@ -69,6 +44,13 @@ void counterMinuteTick(void *handle) {
 
         if (minuteBufferReady[minuteBufferIdx] == 1) {
             coloredMsg(LOG_BLUE, "cmt, buffer %d is done, handle it", minuteBufferIdx);
+
+            minuteBuffer->s.totalRunningHours = deviceStats->totalRunningHours;
+            minuteBuffer->s.totalPowercycles = deviceStats->totalPowercycles;
+            minuteBuffer->s.totalWatchdogResets = deviceStats->totalWatchdogResets;
+            minuteBuffer->s.version = strtoll(VERSION, NULL, 16);
+
+
             memset(minuteBuffer->s.deviceId, 0, sizeof(minuteBuffer->s.deviceId));
             strcpy(minuteBuffer->s.deviceId, config->deviceId);
 
@@ -114,7 +96,7 @@ void counterMinuteTick(void *handle) {
                        minuteBuffer->s.hash[31]
                        );
 
-            int8_t res = counterSendMinuteBuffer(minuteBuffer);
+            int8_t res = networkSendMinuteBuffer(minuteBuffer);
             if (res == 1) {
                 coloredMsg(LOG_BLUE, "cmt, successfully sent");
                 minuteBufferReady[minuteBufferIdx] = false;
@@ -190,7 +172,9 @@ void mainsCntsInputCaptureCallback(TIM_HandleTypeDef *htim) {
 
 
 void counterInit() {
-    seconds = wizGetSeconds();
+    deviceStats = getGlobalDeviceStats();
+
+    seconds = networkGetSeconds();
     for (uint8_t i = 0; i < NUM_OF_MINUTE_BUFFERS; i++) {
         minuteBufferReady[i] = false;
     }

cube/User/Src/main2.c

@@ -13,11 +13,16 @@
 #include <show.h>
 #include <logger.h>
 #include <eeprom.h>
-#include <wizHelper.h>
+#include <networkAbstractionLayer.h>
-#include <cmdHandler.h>
 #include <config.h>
 #include <counter.h>
 
+#if NETWORK_STACK == 2
+#include <modemCom.h>
+#endif
+
+
+
 
 void my_setup_1() {
     schInit();
@@ -33,18 +38,13 @@ void my_setup_2() {
     show(LED_RED, OFF);
     show(LED_GREEN, BLINK);
     logMsg("Application starting");
+    logMsg("Version: " VERSION);
 
     eepromInit();
     
     configInit();
 
-    wizInit();
+    networkInit();
-
-    if (HAL_GPIO_ReadPin(ADMIN_MODE_GPIO_Port, ADMIN_MODE_Pin)) {
-        show(LED_BLUE, BLINK);
-        coloredMsg(LED_RED, "STARTING ADMIN MODE");
-        cmdHandlerInit();
-    }
 
     counterInit();
     
@@ -71,8 +71,24 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) {
         debugTxCpltCallback(huart);
     }
 #endif //LOGGER_OUTPUT_BY_INTERRUPT    
+#if NETWORK_STACK == 2
+    if (huart == &modemUart) {
+        modemTxCpltCallback(huart);
+    }
+#endif    
 }
 
+
+void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart) {
+#if NETWORK_STACK == 2
+    if (huart == &modemUart) {
+        modemRxCpltCallback(huart);
+    }
+#endif    
+}
+
+
+
 void HAL_SPI_TxCpltCallback(SPI_HandleTypeDef *hspi) {
     if (hspi == &eepromSpi) {
         eepromSpiTxCpltCallback(hspi);

cube/User/Src/modemCom.c

@@ -0,0 +1,12 @@
+#include <modemCom.h>
+#include <usart.h>
+
+
+
+void modemTxCpltCallback(UART_HandleTypeDef *huart) {
+  
+}
+
+void modemRxCpltCallback(UART_HandleTypeDef *huart) {
+  
+}

cube/User/Src/networkAbstractionLayer.c

@@ -0,0 +1,74 @@
+#include <networkAbstractionLayer.h>
+#include <PontCoopScheduler.h>
+#include <iwdg.h>
+#include <logger.h>
+#include <sinkStruct.h>
+#include <show.h>
+#include <config.h>
+
+#include <networkAbstractionLayer_impl.h>
+
+
+const uint16_t SINK_PORT = 20169;
+
+static t_seconds seconds = { .seconds = 0, .missedUpdates = 0, .valid = false };
+static t_configBlock *config;
+
+
+
+static void networkSecondsHandler(void *handle) {
+    static bool tryAgain = false;
+
+    seconds.seconds += 1;
+
+    if (! seconds.valid && isNetworkAvailable()) {
+        coloredMsg(LOG_YELLOW, "nsh, initially querying time");
+        uint64_t tmpSeconds = networkSntpQuery();
+        if (tmpSeconds != 0) {
+            coloredMsg(LOG_YELLOW, "nsh, success, time is %lu", tmpSeconds);
+            seconds.seconds = tmpSeconds;
+            seconds.missedUpdates = 0;
+            seconds.valid = true;
+            show(LED_GREEN, ON);
+        } else {
+            coloredMsg(LOG_YELLOW, "nsh, failed");
+            seconds.missedUpdates += 1;
+        }
+    } else if (tryAgain || ((seconds.seconds % 300) == 0)) {
+        coloredMsg(LOG_YELLOW, "nsh, periodically querying time");
+        uint64_t tmpSeconds = networkSntpQuery();
+        if (tmpSeconds != 0) {
+            coloredMsg(LOG_YELLOW, "nsh, success, network time is %lu", tmpSeconds);
+            seconds.missedUpdates = 0;
+            tryAgain = false;
+            show(LED_GREEN, ON);
+            if (seconds.seconds != tmpSeconds) {
+                coloredMsg(LOG_YELLOW, "nsh, local time updated");
+                seconds.seconds = tmpSeconds;
+            } else {
+                coloredMsg(LOG_YELLOW, "nsh, local time still in sync");
+            }
+        } else {
+            coloredMsg(LOG_YELLOW, "nsh, failed, trying again ...");
+            seconds.missedUpdates += 1;
+            tryAgain = true;
+        }
+    }
+
+    HAL_IWDG_Refresh(&hiwdg);
+}
+
+t_seconds* networkGetSeconds() {
+    return &seconds;
+}
+
+int8_t networkSendMinuteBuffer(t_minuteBuffer *minuteBuffer) {
+    return networkUdpSend(config->sinkServer, SINK_PORT, minuteBuffer->b, sizeof(minuteBuffer->b));
+}
+
+void networkInit() {
+    networkImplInit();
+
+    config = getConfig();
+    schAdd(networkSecondsHandler, NULL, 0, 1000);
+}

cube/User/Src/networkAbstractionLayer_lan.c

@@ -0,0 +1,230 @@
+#include <stdint.h>
+#include <string.h>
+
+#include <networkAbstractionLayer_impl.h>
+#include <logger.h>
+#include <PontCoopScheduler.h>
+
+#include <wizHelper.h>
+#include <wizchip_conf.h>
+#include <socket.h>
+#include <config.h>
+#include <sntp.h>
+
+
+static t_configBlock *config;
+
+
+
+static const uint64_t UNIX_NTP_EPOCH_DIFF = 2208988800;
+static const uint16_t NTP_PORT = 123;
+static const uint16_t MAX_SNTP_RETRIES = 100;
+extern const uint8_t SNTP_SOCK;
+
+
+
+const uint8_t SEND_LI_VN_MODE = 0xe3; // LI: unknown (3), VN: 4, Mode: Client (3)
+typedef struct s_ntpStruct {
+    uint8_t   li_vn_mode;
+    uint8_t   stratum;
+    uint8_t   poll;
+    uint8_t   precision;
+    uint32_t  rootdelay;
+    uint32_t  rootdisp;
+    uint32_t  refid;
+    //uint64_t  reftime;
+    uint32_t reftime_h;
+    uint32_t reftime_l;
+    //uint64_t  org;
+    uint32_t org_h;
+    uint32_t org_l;
+    //uint64_t  rec;
+    uint32_t rec_h;
+    uint32_t rec_l;
+    //uint64_t  xmt;
+    uint32_t xmt_h;
+    uint32_t xmt_l;
+} t_ntpStruct;
+
+typedef union __attribute__((__packed__)) {
+    t_ntpStruct s;
+    uint8_t b[sizeof(t_ntpStruct)];
+} ntpMsg_t;
+
+typedef struct {
+    ntpMsg_t ntpMsg;
+    uint8_t ntpAddr[4];
+    uint16_t retryCount;
+    uint64_t seconds;
+    enum {
+        SNTP_STATE_IDLE,
+        SNTP_STATE_START, 
+        SNTP_STATE_SEND,
+        SNTP_STATE_RECV,
+        SNTP_STATE_DONE,
+        SNTP_STATE_ERROR
+    } sntpState;
+} sntpEngineHandle_t;
+
+sntpEngineHandle_t sntpEngineHandle = { 
+    .seconds = 0, 
+    .retryCount = 0, 
+    .sntpState = SNTP_STATE_IDLE 
+};
+
+
+void networkSntpEngine(void *handle) {
+    sntpEngineHandle_t *localHandle = (sntpEngineHandle_t*) handle;
+    if (isNetworkAvailable()) {
+        switch (localHandle->sntpState) {
+            case SNTP_STATE_START:
+                coloredMsg(LOG_BLUE, "nes, resolve ntp server");
+                if (! wizDnsQuery(config->ntpServer, localHandle->ntpAddr)) {
+                    coloredMsg(LOG_BLUE, "nes, failed to resolve ntp server");
+                    localHandle->sntpState = SNTP_STATE_ERROR;
+                } else {
+                    localHandle->sntpState = SNTP_STATE_SEND;
+                    schAdd(networkSntpEngine, (void*) localHandle, 10, 0);
+                }
+                break;
+            case SNTP_STATE_SEND:
+                coloredMsg(LOG_BLUE, "nes, about to call SNTP");
+                localHandle->retryCount = 0;
+                socket(SNTP_SOCK, Sn_MR_UDP, NTP_PORT, 0);
+                uint8_t sockState = getSn_SR(SNTP_SOCK);
+                if (sockState == SOCK_UDP) {
+                    memset(&(localHandle->ntpMsg), 0, sizeof(localHandle->ntpMsg));
+                    localHandle->ntpMsg.s.li_vn_mode = SEND_LI_VN_MODE;
+                    localHandle->ntpMsg.s.xmt_l = 1;
+                    sendto(SNTP_SOCK, localHandle->ntpMsg.b, 
+                           sizeof(localHandle->ntpMsg.b), localHandle->ntpAddr, NTP_PORT);
+                    coloredMsg(LOG_BLUE, "nes, sent");
+                    localHandle->sntpState = SNTP_STATE_RECV;
+                    schAdd(networkSntpEngine, (void*) localHandle, 100, 0);
+                } else {
+                    coloredMsg(LOG_BLUE, "nes, socket in unexpected state %d", sockState);
+                    localHandle->sntpState = SNTP_STATE_ERROR;
+                }
+                break;
+            case SNTP_STATE_RECV:
+                coloredMsg(LOG_BLUE, "nes, check receive");
+                localHandle->retryCount += 1;
+                uint16_t recvLen = getSn_RX_RSR(SNTP_SOCK);
+                if (recvLen == 0) {
+                    if (localHandle->retryCount > MAX_SNTP_RETRIES) {
+                        coloredMsg(LOG_BLUE, "nes, max retry count reached, failed");
+                        localHandle->sntpState = SNTP_STATE_ERROR;
+                    } else {
+                        coloredMsg(LOG_BLUE, "nes, nothing received yet, try again");
+                        schAdd(networkSntpEngine, (void*) localHandle, 100, 0);
+                    }
+                } else if (recvLen >= sizeof(localHandle->ntpMsg)) {
+                    memset(&(localHandle->ntpMsg), 0, sizeof(localHandle->ntpMsg));
+                    uint8_t srcAddr[4];
+                    uint16_t srcPort;
+                    
+                    recvfrom(SNTP_SOCK, localHandle->ntpMsg.b,
+                             sizeof(localHandle->ntpMsg.b), srcAddr, &srcPort);
+                    
+                    
+                    uint8_t *buf = localHandle->ntpMsg.b;
+                    uint8_t x = 0;
+                    coloredMsg(LOG_BLUE, "nes, %02x %02x %02x %02x %02x %02x %02x %02x  %02x %02x %02x %02x %02x %02x %02x %02x",
+                               buf[x+0], buf[x+1], buf[x+2], buf[x+3], buf[x+4], buf[x+5], buf[x+6], buf[x+7],
+                               buf[x+8], buf[x+9], buf[x+10], buf[x+11], buf[x+12], buf[x+13], buf[x+14], buf[x+15]);
+                    x += 16;
+                    coloredMsg(LOG_BLUE, "nes, %02x %02x %02x %02x %02x %02x %02x %02x  %02x %02x %02x %02x %02x %02x %02x %02x",
+                               buf[x+0], buf[x+1], buf[x+2], buf[x+3], buf[x+4], buf[x+5], buf[x+6], buf[x+7],
+                               buf[x+8], buf[x+9], buf[x+10], buf[x+11], buf[x+12], buf[x+13], buf[x+14], buf[x+15]);
+                    x += 16;
+                    coloredMsg(LOG_BLUE, "nes, %02x %02x %02x %02x %02x %02x %02x %02x  %02x %02x %02x %02x %02x %02x %02x %02x",
+                               buf[x+0], buf[x+1], buf[x+2], buf[x+3], buf[x+4], buf[x+5], buf[x+6], buf[x+7],
+                               buf[x+8], buf[x+9], buf[x+10], buf[x+11], buf[x+12], buf[x+13], buf[x+14], buf[x+15]);
+                    x += 16;
+                    coloredMsg(LOG_BLUE, "nes, %02x %02x %02x %02x %02x %02x %02x %02x  %02x %02x %02x %02x %02x %02x %02x %02x",
+                               buf[x+0], buf[x+1], buf[x+2], buf[x+3], buf[x+4], buf[x+5], buf[x+6], buf[x+7],
+                               buf[x+8], buf[x+9], buf[x+10], buf[x+11], buf[x+12], buf[x+13], buf[x+14], buf[x+15]);
+
+                    close(SNTP_SOCK);
+                    coloredMsg(LOG_BLUE, "nes, msg received from %d.%d.%d.%d:%d", 
+                               srcAddr[0], srcAddr[1], srcAddr[2], srcAddr[3],
+                               srcPort);
+                    
+                    coloredMsg(LOG_BLUE, "nes, received in the %d. cycles", localHandle->retryCount);
+                    uint32_t xmt_h = 
+                        (localHandle->ntpMsg.s.xmt_h & 0x0000000ff) << 24 |
+                        (localHandle->ntpMsg.s.xmt_h & 0x00000ff00) << 8 |
+                        (localHandle->ntpMsg.s.xmt_h & 0x000ff0000) >> 8 |
+                        (localHandle->ntpMsg.s.xmt_h & 0x0ff000000) >> 24;
+                    localHandle->seconds = ((uint64_t)xmt_h) - UNIX_NTP_EPOCH_DIFF;
+                    coloredMsg(LOG_BLUE, "nes, xmt: %08x", xmt_h);
+                    coloredMsg(LOG_BLUE, "nes, seconds: %lu", localHandle->seconds);
+                    localHandle->sntpState = SNTP_STATE_DONE;
+                } else {
+                    coloredMsg(LOG_BLUE, "nes, invalid number of octets received: %d", recvLen);
+                    localHandle->sntpState = SNTP_STATE_ERROR;
+                }
+                break;
+            default:
+                coloredMsg(LOG_BLUE, "nes, unexpected state");
+        }
+    } else {
+        coloredMsg(LOG_BLUE, "nes, no network yet, try again");
+        schAdd(networkSntpEngine, (void*) localHandle, 100, 0);
+    }
+}
+
+uint64_t networkSntpQuery() {
+    uint64_t res = 0;
+
+    if (sntpEngineHandle.sntpState == SNTP_STATE_IDLE) {
+        coloredMsg(LOG_BLUE, "nsq, start sntp request");
+        sntpEngineHandle.sntpState = SNTP_STATE_START;
+        schAdd(networkSntpEngine, (void*) &sntpEngineHandle, 1, 0);
+    } else if (sntpEngineHandle.sntpState == SNTP_STATE_DONE) {
+        coloredMsg(LOG_BLUE, "nsq, start sntp done");
+        res = sntpEngineHandle.seconds;
+        coloredMsg(LOG_BLUE, "nsq, time is %lu", res);
+        sntpEngineHandle.sntpState = SNTP_STATE_IDLE;
+    } else if (sntpEngineHandle.sntpState == SNTP_STATE_ERROR) {
+        coloredMsg(LOG_BLUE, "nsq, start sntp failed");
+        sntpEngineHandle.sntpState = SNTP_STATE_IDLE;
+    }
+
+    return res;
+}
+
+extern uint8_t SINK_SOCK;
+
+int8_t networkUdpSend(char *hostname, uint16_t port, uint8_t *buf, uint16_t bufLen) {
+    uint8_t sinkAddr[4];
+    if (! wizDnsQuery(hostname, sinkAddr)) {
+        coloredMsg(LOG_BLUE, "nus, failed to resolve sink server name");
+        return -1;
+    } else {
+        coloredMsg(LOG_BLUE, "nus, sink server at %d.%d.%d.%d", sinkAddr[0], sinkAddr[1], sinkAddr[2], sinkAddr[3]);
+    }
+
+    socket(SINK_SOCK, Sn_MR_UDP, port, 0);
+    uint8_t sockState = getSn_SR(SINK_SOCK);
+    if (sockState == SOCK_UDP) {
+        sendto(SINK_SOCK, buf, bufLen, sinkAddr, port);
+        coloredMsg(LOG_BLUE, "nus, sent");
+    } else {
+        coloredMsg(LOG_BLUE, "nus, socket in unexpected state: %d", sockState);
+        return -2;
+    }
+
+    close(SINK_SOCK);
+
+    return 1;
+}
+
+bool isNetworkAvailable() {
+    return wizIsNetworkAvailable();
+}
+
+void networkImplInit() {
+    config = getConfig();
+    wizInit();
+}

cube/User/Src/networkAbstractionLayer_wifi.c

@@ -0,0 +1,22 @@
+#include <networkAbstractionLayer_impl.h>
+#include <logger.h>
+#include <utils.h>
+
+#include <stdint.h>
+#include <main.h>
+
+
+uint64_t networkSntpQuery() {
+    return 0;
+}
+
+
+int8_t networkUdpSend(char *hostname, uint16_t port, uint8_t *buf, uint16_t bufLen) {
+    return 0;
+}
+
+void networkImplInit() {
+    HAL_GPIO_WritePin(MODEM_RES_GPIO_Port, MODEM_RES_Pin, GPIO_PIN_RESET);
+    activeDelay(255);
+    HAL_GPIO_WritePin(MODEM_RES_GPIO_Port, MODEM_RES_Pin, GPIO_PIN_SET);
+}

cube/User/Src/ports.c

@@ -6,6 +6,5 @@
 
 const uint8_t DHCP_SOCK = 0;
 const uint8_t SNTP_SOCK = 1;
-const uint8_t CMD_SOCK = 2;
+const uint8_t DNS_SOCK = 2;
-const uint8_t DNS_SOCK = 3;
+const uint8_t SINK_SOCK = 3;
-const uint8_t SINK_SOCK = 4;

cube/User/Src/regularCmds.c

@@ -1,52 +0,0 @@
-#include <cmdHelper.h>
-#include <logger.h>
-#include <PontCoopScheduler.h>
-
-#include <eeprom.h>
-
-
-static bool globalStatsCmd(uint8_t argc, char **args) {
-    uint32_t uptime = HAL_GetTick() / 1000;
-    sendFormatString(\
-      "Current uptime:        %ld\n\r" \
-      "\n\r",
-      uptime
-    );
-
-    t_deviceStats *deviceStats = getGlobalDeviceStats();
-    sendFormatString(\
-      "Global Device statistics\n\r" \
-      "  Total running hours:   %ld\n\r" \
-      "  Total power cycles:    %ld\n\r" \
-      "  Total watchdog resets: %ld\n\r" \
-      "\n\r",
-      deviceStats->totalRunningHours, deviceStats->totalPowercycles,
-      deviceStats->totalWatchdogResets
-    );
-
-    return true;
-}
-
-static bool resetStatsCmd(uint8_t argc, char **args) {
-    t_deviceStats *deviceStats = getGlobalDeviceStats();
-    deviceStats->totalWatchdogResets = 0;
-    schAdd(eepromHourlyUpdateDeviceStats, NULL, 1, 0);
-    return true;
-}
-
-
-const cmd_t COMMANDS[] = {
-    { .name = "stats", .cmdFunc = globalStatsCmd,
-      .help = \
-        "stats .......................... Show the device statistics\n\r"
-    },
-    { .name = "resetStats", .cmdFunc = resetStatsCmd,
-      .help = \
-        "resetStats ..................... Reset the device statistics\n\r"
-    },
-    { .name = "END_OF_CMDS", .help = "",.cmdFunc = NULL }
-};
-
-const cmd_t *getRegularCommands() {
-    return COMMANDS;
-}

cube/User/Src/show.c

@@ -1,6 +1,7 @@
 #include <main.h>
 #include <show.h>
 #include <PontCoopScheduler.h>
+#include <show.h>
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -24,9 +25,20 @@ showElement_t showElement[] = {
 };
 
 static void showHandler(void *handle) {
+    const uint8_t MAX_CNT = 3;
+    static uint8_t cnt = 0;
+    cnt += 1;
+    if (cnt > MAX_CNT) {
+        cnt = 0;
+    }
+
     uint8_t idx = 0;
     while (showElement[idx].port) {
         if (showElement[idx].currentState == BLINK) {
+            if (cnt == MAX_CNT) {
+                HAL_GPIO_TogglePin(showElement[idx].port, showElement[idx].pin);
+            }
+        } else if (showElement[idx].currentState == BLINK_FAST) {
             HAL_GPIO_TogglePin(showElement[idx].port, showElement[idx].pin);
         }
         idx++;
@@ -43,5 +55,5 @@ void show(signalPin_t signalPin, signalAction_t action) {
 }
 
 void showInit() {
-    schAdd(showHandler, NULL, 0, 250);
+    schAdd(showHandler, NULL, 0, 100);
 }

cube/User/Src/wizHelper.c

@@ -13,7 +13,6 @@
 #include <dns.h>
 #include <sntp.h>
 #include <config.h>
-#include <iwdg.h>
 
 
 static t_configBlock *config;
@@ -27,19 +26,14 @@ static uint8_t dhcpBuffer[DHCP_BUFFER_SIZE];
 static uint8_t dnsBuffer[DNS_BUFFER_SIZE];
 
 
-static uint8_t sntpBuffer[MAX_SNTP_BUF_SIZE];
-static t_seconds seconds = { .seconds = 0, .missedUpdates = 0, .valid = false };
-const uint64_t UNIX_NTP_EPOCH_DIFF = 2208988800;
-
 
 extern const uint8_t DHCP_SOCK;
 extern const uint8_t DNS_SOCK;
-extern const uint8_t SNTP_SOCK;
 
 
 static bool networkAvailable = false;
 
-bool isNetworkAvailable() {
+bool wizIsNetworkAvailable() {
     return networkAvailable;
 }
 
@@ -92,7 +86,7 @@ static void wizDHCPAssign() {
     coloredMsg(LOG_BLUE, "wizda, set netinfo again");
 
     networkAvailable = true;
-    show(LED_GREEN, ON);
+    show(LED_GREEN, BLINK_FAST);
     coloredMsg(LOG_BLUE, "wizda, network is available");
 }
 
@@ -135,70 +129,12 @@ bool wizDnsQuery(char *name, uint8_t *ip) {
 }
 
 
-static void wizSNTPHandler(void *handle) {
-    bool success = false;
-
-    if (networkAvailable) {
-        coloredMsg(LOG_BLUE, "wizsh, about to call SNTP");
-
-        uint8_t ntpServer[4];
-        if (wizDnsQuery(config->ntpServer, ntpServer)) {
-            SNTP_init(SNTP_SOCK, ntpServer, 0, sntpBuffer);
-            bool updated = false;
-            for (uint8_t i = 0; i < 16; i++) {
-                datetime curTime;
-                int8_t res = SNTP_run(&curTime);
-                uint64_t receivedSeconds = curTime.seconds - UNIX_NTP_EPOCH_DIFF;
-                if (res == 1) {
-                    if (seconds.seconds != receivedSeconds) {
-                        coloredMsg(LOG_BLUE, "wizsh, time deviation: %lu %lu", 
-                            seconds.seconds, receivedSeconds);
-                    } else {
-                        coloredMsg(LOG_BLUE, "wizsh, time still matching");
-                    }
-                   
-                    seconds.seconds = receivedSeconds;
-                    seconds.valid = true;
-                    seconds.missedUpdates = 0;
-                    updated = true;
-                    success = true;
-                    coloredMsg(LOG_BLUE, "wizsh, curTime: %lu", seconds.seconds);
-
-                    break;
-                }
-            }
-            
-            if (! updated) {
-                coloredMsg(LOG_BLUE, "wizsh, time update failed");
-                seconds.missedUpdates += 1;
-            }
-        } else {
-            seconds.missedUpdates += 1;
-            coloredMsg(LOG_BLUE, "wizsh, error when querying ntp server name");
-        }
-    }
-
-    uint16_t tryAgainIn = (success) ? 3600 : 1;
-    schAdd(wizSNTPHandler, NULL, tryAgainIn * 1000, 0);
-    coloredMsg(LOG_BLUE, "wizsh, next sntp request in %d seconds", tryAgainIn);
-}
-
-static void wizSecondsHandler(void *handle) {
-    seconds.seconds += 1;
-    HAL_IWDG_Refresh(&hiwdg);
-}
-
-t_seconds* wizGetSeconds() {
-    return &seconds;
-}
-
 static void wizPhyLinkHandler(void *handle) {
     // this handler is anyhow called with a 1s period, so we reuse it for the DNS timer
     DNS_time_handler();
 
     static uint8_t lastStablePhyLink = 255;
     static bool dhcpInitialized = false;
-    static bool sntpInitialized = false;
 
     uint8_t phyLink = 0;
     int8_t res = ctlwizchip(CW_GET_PHYLINK, (void*) &phyLink);
@@ -218,12 +154,6 @@ static void wizPhyLinkHandler(void *handle) {
             coloredMsg(LOG_BLUE, "wizplh, DHCP handler scheduled");
 
             dhcpInitialized = true;
-
-
-            schAdd(wizSNTPHandler, NULL, 15, 0);
-            coloredMsg(LOG_BLUE, "wizplh, SNTP handler scheduled");
-
-            sntpInitialized = true;
         } else {
             networkAvailable = false;
             show(LED_GREEN, BLINK);
@@ -239,14 +169,6 @@ static void wizPhyLinkHandler(void *handle) {
 
                 dhcpInitialized = false;
             }
-
-            if (sntpInitialized) {
-                schDel(wizSNTPHandler, NULL);
-                coloredMsg(LOG_BLUE, "wizplh, SNTP handler unscheduled");
-                seconds.valid = false;
-
-                sntpInitialized = false;
-            }
         }
     }
 }
@@ -255,7 +177,7 @@ static void wizPhyLinkHandler(void *handle) {
 int wizInit() {
     config = getConfig();
     netInfo.dhcp = NETINFO_DHCP;
-    memcpy(netInfo.mac, config->macAddress, 6);
+    memcpy(netInfo.mac, config->networkspecific.lan.macAddress, 6);
 
     coloredMsg(LOG_BLUE, "wizI, resetting Ethernet module");
     wizReset(true);
@@ -304,7 +226,5 @@ int wizInit() {
     schAdd(wizPhyLinkHandler, NULL, 0, 1000);
     coloredMsg(LOG_BLUE, "wizI, PhyLink handler scheduled");
 
-    schAdd(wizSecondsHandler, NULL, 0, 1000);
-    coloredMsg(LOG_BLUE, "wizI, Seconds handler scheduled");
     return 0;
 }

cube/cube.ioc

@@ -1,6 +1,6 @@
 #MicroXplorer Configuration settings - do not modify
 File.Version=6
-GPIO.groupedBy=
+GPIO.groupedBy=Group By Peripherals
 IWDG.IPParameters=Prescaler
 IWDG.Prescaler=IWDG_PRESCALER_256
 KeepUserPlacement=false
@@ -171,7 +171,7 @@ ProjectManager.StackSize=0x400
 ProjectManager.TargetToolchain=Makefile
 ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=false
-ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_SPI1_Init-SPI1-false-HAL-true,4-MX_SPI2_Init-SPI2-false-HAL-true,5-MX_TIM1_Init-TIM1-false-HAL-true,6-MX_USART1_UART_Init-USART1-false-HAL-true,7-MX_IWDG_Init-IWDG-false-HAL-true
+ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_SPI1_Init-SPI1-false-HAL-true,4-MX_SPI2_Init-SPI2-false-HAL-true,5-MX_TIM1_Init-TIM1-false-HAL-true,6-MX_USART1_UART_Init-USART1-false-HAL-true,7-MX_IWDG_Init-IWDG-false-HAL-true,8-MX_USART2_UART_Init-USART2-false-HAL-true
 RCC.ADCFreqValue=36000000
 RCC.AHBFreq_Value=72000000
 RCC.APB1CLKDivider=RCC_HCLK_DIV2

docs/test1.txt

@@ -0,0 +1,8 @@
+24 02 03 e9 00 00 06 86  00 00 02 cc c0 a8 64 0f
+e3 e6 85 7c b7 79 4a eb  00 00 00 00 00 00 00 00
+e3 e6 86 b4 cb 75 ef d3  e3 e6 86 b4 cb 7c 22 82
+00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
+
+1614546999
+
+2208988800

sink/logging.c

@@ -1,53 +0,0 @@
-#define _DEFAULT_SOURCE
-
-#include <syslog.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-
-extern bool verbose;
-int facility = LOG_LOCAL0;
-
-void setfacility(const char *facility_p) {
-  if (! strcmp(facility_p, "LOCAL0")) {
-    facility = LOG_LOCAL0;
-  } else if (! strcmp(facility_p, "LOCAL1")) {
-    facility = LOG_LOCAL1;
-  } else if (! strcmp(facility_p, "LOCAL2")) {
-    facility = LOG_LOCAL2;
-  } else if (! strcmp(facility_p, "LOCAL3")) {
-    facility = LOG_LOCAL3;
-  } else if (! strcmp(facility_p, "LOCAL4")) {
-    facility = LOG_LOCAL4;
-  } else if (! strcmp(facility_p, "LOCAL5")) {
-    facility = LOG_LOCAL5;
-  } else if (! strcmp(facility_p, "LOCAL6")) {
-    facility = LOG_LOCAL6;
-  } else if (! strcmp(facility_p, "LOCAL7")) {
-    facility = LOG_LOCAL7;
-  } else if (! strcmp(facility_p, "USER")) {
-    facility = LOG_USER;
-  } else if (! strcmp(facility_p, "DAEMON")) {
-    facility = LOG_DAEMON;
-  }
-}
-
-
-void logmsg(int prio, const char* format, ...) {
-  va_list vl;
-  char buf[1024];
-
-  va_start(vl, format);
-  vsnprintf(buf, sizeof(buf), format, vl);
-  va_end(vl);
-
-  if (verbose) {
-    printf("%s\n", buf);
-  }
-
-  openlog("counter", 0, facility);
-  syslog(prio, "%s", buf);
-  closelog();
-}
-

sink/logging.h

@@ -1,8 +0,0 @@
-#ifndef _LOGGING_H_
-#define _LOGGING_H_
-
-#include <syslog.h>
-
-void logmsg(int prio, const char* format, ...);
-void setfacility(const char *facility_p);
-#endif // _LOGGING_H_

sink/readme.md

@@ -1,3 +0,0 @@
-Make sure libconfig and libcurl are available.
-On Linux (Debian) install libconfig-dev and libcurl4-openssl-dev,
-on OpenBSD install libconfig and curl.

sink/sink20169.cfg

@@ -1,18 +0,0 @@
-// influxUser = "";
-// influxPass = "";
-influxServer = "172.16.10.16";
-influxPort = 8086;
-influxDatabase = "smarthome2";
-influxMeasurement = "mainsfrequency";
-
-receivePort = 20169;
-
-devices = (
-    {
-        deviceId = "MainsCnt01";
-        // sharedSecret must have exactly 31 characters
-        sharedSecret = "Uj6*uKDp@8Kvfa4g5eRMLUfVsSuqjxW";
-        // location must neither contains spaces nor commas or any other URL-special characters
-        location = "Essen_DE";
-    }
-);

tools/ENV.tmpl

@@ -0,0 +1,2 @@
+export PRIVATETOKEN=privateToken
+

tools/insertMyCode.sh

@@ -6,8 +6,8 @@ MAIN_C_BAK=${MAIN_C}-bak
 IT_C=./Core/Src/stm32f1xx_it.c
 IT_C_BAK=${IT_C}-bak
 
-MAKEFILE=./Makefile
+# MAKEFILE=./Makefile
-MAKEFILE_BAK=${MAKEFILE}-bak
+# MAKEFILE_BAK=${MAKEFILE}-bak
 
 PROCESSED="Processed by $0"
 
@@ -31,7 +31,7 @@ checkFile () {
 
 
 checkFile $MAIN_C $MAIN_C_BAK
-checkFile $MAKEFILE $MAKEFILE_BAK
+# checkFile $MAKEFILE $MAKEFILE_BAK
 checkFile $IT_C $IT_C_BAK
 
 cp $MAIN_C $MAIN_C_BAK
@@ -62,22 +62,22 @@ for I in hottislib/*.c; do
   SRC_EXT+="$I "
 done
 
-cp $MAKEFILE $MAKEFILE_BAK
+# cp $MAKEFILE $MAKEFILE_BAK
-echo "# $PROCESSED" > $MAKEFILE
+# echo "# $PROCESSED" > $MAKEFILE
-cat $MAKEFILE_BAK | \
+# cat $MAKEFILE_BAK | \
-  sed -e 's/\(-specs=nano.specs\)/\1 -u _printf_float/' \
+#   sed -e 's/\(-specs=nano.specs\)/\1 -u _printf_float/' \
-      -e 's/\(-Wall\)/\1 -Werror/' \
+#       -e 's/\(-Wall\)/\1 -Werror/' \
-      -e 's%\(# list of ASM program objects\)%OBJECTS += $(addprefix $(BUILD_DIR)/,w5500.a)\n\1%' \
+#       -e 's%\(# list of ASM program objects\)%OBJECTS += $(addprefix $(BUILD_DIR)/,w5500.a)\n\1%' \
-      -e 's,\($(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR)\),$(BUILD_DIR)/w5500.a:\n\t(cd ioLibrary_Driver \&\& $(MAKE) \&\& cp w5500.a ../$(BUILD_DIR) \&\& cd ..)\n\n\1,' \
+#       -e 's,\($(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR)\),$(BUILD_DIR)/w5500.a:\n\t(cd ioLibrary_Driver \&\& $(MAKE) \&\& cp w5500.a ../$(BUILD_DIR) \&\& cd ..)\n\n\1,' \
-      -e 's,\(C_SOURCES =  \\\),\1\n'"$SRC_EXT"' \\,' \
+#       -e 's,\(C_SOURCES =  \\\),\1\n'"$SRC_EXT"' \\,' \
-      -e 's,\(C_INCLUDES =  \\\),\1\n-IioLibrary_Driver/Ethernet \\,' \
+#       -e 's,\(C_INCLUDES =  \\\),\1\n-IioLibrary_Driver/Ethernet \\,' \
-      -e 's,\(C_INCLUDES =  \\\),\1\n-IioLibrary_Driver/Internet/DHCP \\,' \
+#       -e 's,\(C_INCLUDES =  \\\),\1\n-IioLibrary_Driver/Internet/DHCP \\,' \
-      -e 's,\(C_INCLUDES =  \\\),\1\n-IioLibrary_Driver/Internet/DNS \\,' \
+#       -e 's,\(C_INCLUDES =  \\\),\1\n-IioLibrary_Driver/Internet/DNS \\,' \
-      -e 's,\(C_INCLUDES =  \\\),\1\n-IioLibrary_Driver/Internet/SNTP \\,' \
+#       -e 's,\(C_INCLUDES =  \\\),\1\n-IioLibrary_Driver/Internet/SNTP \\,' \
-      -e 's,\(C_INCLUDES =  \\\),\1\n-IUser/Inc \\,' \
+#       -e 's,\(C_INCLUDES =  \\\),\1\n-IUser/Inc \\,' \
-      -e 's,\(C_INCLUDES =  \\\),\1\n-Ihottislib \\,' \
+#       -e 's,\(C_INCLUDES =  \\\),\1\n-Ihottislib \\,' \
-      >> $MAKEFILE
+#       >> $MAKEFILE
-
+cp Makefile.sav Makefile
 
 
 

tools/release.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+RELEASENAME=$1
+RELEASETAG=$2
+DESCRIPTION=$3
+
+if [ "$RELEASENAME" = "" -o "$RELEASETAG" = "" -o "$DESCRIPTION" = "" ]; then
+  echo "release.sh RELEASENAME RELEASETAG DESCRIPTION"
+  exit 1
+fi
+
+RELEASETAGTARGET=`git rev-parse --short=8 HEAD`
+
+gitlabreleaseuploader.py \
+  --privateToken $PRIVATETOKEN \
+  --projectId 128 \
+  --projectUrl https://home.hottis.de/gitlab/wolutator/mains-frequency-counter-stm32 \
+  --releaseName "$RELEASENAME" \
+  --createRelease \
+  --releaseTag $RELEASETAG \
+  --releaseTagTarget $RELEASETAGTARGET \
+  --createReleaseTag \
+  --description "$DESCRIPTION" \
+  --instanceUrl https://home.hottis.de/gitlab \
+  --verbose \
+  --file cube/build/cube.elf
+

tools/removeGeneratedCode.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
-
+cp Makefile Makefile.sav
 rm -rf build/ Core/ Drivers/ Makefile Makefile-bak  startup_stm32f103xb.s  STM32F103C8Tx_FLASH.ld