mainscnt/mains-frequency-counter-stm32
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2021-02-16 13:08:39 +01:00
commit b6439e7df3
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F
20 changed files with 324 additions and 803 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
cube/Makefile
View File

@ -3,6 +3,9 @@
# File automatically-generated by tool: [projectgenerator] version: [3.10.0-B14] date: [Sat Feb 13 18:28:59 CET 2021] # 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) # Generic Makefile (based on gcc)
# #
@ -11,6 +14,18 @@
# 2015-07-22 - first version # 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
###################################### ######################################
# target # target
###################################### ######################################
@ -37,7 +52,17 @@ BUILD_DIR = build
###################################### ######################################
# C sources # 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 \
User/Src/counter.c \
User/Src/eeprom.c \
User/Src/logger.c \
User/Src/main2.c \
User/Src/ringbuffer.c \
User/Src/sha256.c \
User/Src/show.c \
User/Src/utils.c \
User/Src/networkAbstractionLayer.c \
hottislib/PontCoopScheduler.c \
Core/Src/main.c \ Core/Src/main.c \
Core/Src/gpio.c \ Core/Src/gpio.c \
Core/Src/iwdg.c \ Core/Src/iwdg.c \
@ -64,6 +89,18 @@ Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c \
Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c \ Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c \
Core/Src/system_stm32f1xx.c Core/Src/system_stm32f1xx.c
ifeq ($(NETWORK), LAN)
C_SOURCES += \
User/Src/ports.c \
User/Src/wizHelper.c \
User/Src/networkAbstractionLayer_lan.c
endif
ifeq ($(NETWORK), WiFi)
C_SOURCES += \
User/Src/networkAbstractionLayer_wifi.c
endif
# ASM sources # ASM sources
ASM_SOURCES = \ ASM_SOURCES = \
startup_stm32f103xb.s startup_stm32f103xb.s
@ -121,10 +158,6 @@ AS_INCLUDES =
C_INCLUDES = \ C_INCLUDES = \
-Ihottislib \ -Ihottislib \
-IUser/Inc \ -IUser/Inc \
-IioLibrary_Driver/Internet/SNTP \
-IioLibrary_Driver/Internet/DNS \
-IioLibrary_Driver/Internet/DHCP \
-IioLibrary_Driver/Ethernet \
-ICore/Inc \ -ICore/Inc \
-IDrivers/STM32F1xx_HAL_Driver/Inc \ -IDrivers/STM32F1xx_HAL_Driver/Inc \
-IDrivers/STM32F1xx_HAL_Driver/Inc/Legacy \ -IDrivers/STM32F1xx_HAL_Driver/Inc/Legacy \
@ -133,10 +166,19 @@ C_INCLUDES = \
-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 # compile gcc flags
ASFLAGS = $(MCU) $(AS_DEFS) $(AS_INCLUDES) $(OPT) -Wall -Werror -fdata-sections -ffunction-sections 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=$(NETWORK) -Wall -Werror -fdata-sections -ffunction-sections
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
CFLAGS += -g -gdwarf-2 CFLAGS += -g -gdwarf-2
@ -168,13 +210,19 @@ all: $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET
# list of objects # list of objects
OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(C_SOURCES:.c=.o))) OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(C_SOURCES:.c=.o)))
vpath %.c $(sort $(dir $(C_SOURCES))) vpath %.c $(sort $(dir $(C_SOURCES)))
ifeq ($(NETWORK), LAN)
OBJECTS += $(addprefix $(BUILD_DIR)/,w5500.a) OBJECTS += $(addprefix $(BUILD_DIR)/,w5500.a)
endif
# list of ASM program objects # list of ASM program objects
OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASM_SOURCES:.s=.o))) OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASM_SOURCES:.s=.o)))
vpath %.s $(sort $(dir $(ASM_SOURCES))) vpath %.s $(sort $(dir $(ASM_SOURCES)))
ifeq ($(NETWORK), LAN)
$(BUILD_DIR)/w5500.a: $(BUILD_DIR)/w5500.a:
(cd ioLibrary_Driver && $(MAKE) && cp w5500.a ../$(BUILD_DIR) && cd ..) (cd ioLibrary_Driver && $(MAKE) && cp w5500.a ../$(BUILD_DIR) && cd ..)
endif
$(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR) $(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR)
$(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.c=.lst)) $< -o $@ $(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.c=.lst)) $< -o $@

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

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

23
cube/User/Inc/cmdHelper.h
View File

@ -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_ */

13
cube/User/Inc/config.h
View File

@ -13,8 +13,21 @@ typedef struct __attribute__((__packed__)) s_configBlock {
char deviceId[16]; char deviceId[16];
char sharedSecret[SHA256_BLOCK_SIZE]; char sharedSecret[SHA256_BLOCK_SIZE];
char sinkServer[48]; char sinkServer[48];
<<<<<<< HEAD
uint8_t macAddress[6]; uint8_t macAddress[6];
uint8_t filler[22]; 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];
>>>>>>> network_abstraction_layer
} t_configBlock; } t_configBlock;

20
cube/User/Inc/networkAbstractionLayer.h Normal file
View File

@ -0,0 +1,20 @@
#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_ */

10
cube/User/Inc/networkAbstractionLayer_impl.h Normal file
View File

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

8
cube/User/Inc/wizHelper.h
View File

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

326
cube/User/Src/cmdHandler.c
View File

@ -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);
}

16
cube/User/Src/config.c
View File

@ -10,6 +10,10 @@
t_configBlock defaultConfigBlock = { t_configBlock defaultConfigBlock = {
.configMagic = CONFIG_MAGIC, .configMagic = CONFIG_MAGIC,
.deviceName = "MainsCnt", .deviceName = "MainsCnt",
<<<<<<< HEAD
=======
.networkspecific.lan.macAddress = { 0x00, 0xA0, 0x57, 0x05, 0x3E, 0x0F },
>>>>>>> network_abstraction_layer
.ntpServer = "0.de.pool.ntp.org", .ntpServer = "0.de.pool.ntp.org",
.deviceId = "MainsCnt01", .deviceId = "MainsCnt01",
.sharedSecret = "sharedSecretGanzGeheim", .sharedSecret = "sharedSecretGanzGeheim",
@ -43,12 +47,12 @@ void configInit() {
} }
coloredMsg(LOG_BLUE, "cfg ci configMagic: %lx", mainConfigBlock.configMagic); coloredMsg(LOG_BLUE, "cfg ci configMagic: %lx", mainConfigBlock.configMagic);
coloredMsg(LOG_BLUE, "cfg ci deviceName: %s", mainConfigBlock.deviceName); 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 ntp server: %s", mainConfigBlock.ntpServer);
coloredMsg(LOG_BLUE, "cfg ci deviceId: %s", mainConfigBlock.deviceId); coloredMsg(LOG_BLUE, "cfg ci deviceId: %s", mainConfigBlock.deviceId);
coloredMsg(LOG_BLUE, "cfg ci sharedSecret: %s", mainConfigBlock.sharedSecret); coloredMsg(LOG_BLUE, "cfg ci sharedSecret: %s", mainConfigBlock.sharedSecret);

212
cube/User/Src/configCmds.c
View File

@ -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;
}

35
cube/User/Src/counter.c
View File

@ -7,12 +7,12 @@
#include <show.h> #include <show.h>
#include <logger.h> #include <logger.h>
#include <PontCoopScheduler.h> #include <PontCoopScheduler.h>
#include <wizHelper.h>
#include <config.h> #include <config.h>
#include <socket.h>
#include <sinkStruct.h> #include <sinkStruct.h>
#include <sha256.h> #include <sha256.h>
#include <eeprom.h> #include <eeprom.h>
#include <networkAbstractionLayer.h>
const uint32_t COUNTER_FREQUENCY = 1.0e6; const uint32_t COUNTER_FREQUENCY = 1.0e6;
@ -36,33 +36,6 @@ uint8_t activeMinuteBuffer;
static t_configBlock *config; 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) { void counterMinuteTick(void *handle) {
for (uint8_t minuteBufferIdx = 0; minuteBufferIdx < NUM_OF_MINUTE_BUFFERS; minuteBufferIdx++) { for (uint8_t minuteBufferIdx = 0; minuteBufferIdx < NUM_OF_MINUTE_BUFFERS; minuteBufferIdx++) {
@ -120,7 +93,7 @@ void counterMinuteTick(void *handle) {
minuteBuffer->s.hash[31] minuteBuffer->s.hash[31]
); );
int8_t res = counterSendMinuteBuffer(minuteBuffer); int8_t res = networkSendMinuteBuffer(minuteBuffer);
if (res == 1) { if (res == 1) {
coloredMsg(LOG_BLUE, "cmt, successfully sent"); coloredMsg(LOG_BLUE, "cmt, successfully sent");
minuteBufferReady[minuteBufferIdx] = false; minuteBufferReady[minuteBufferIdx] = false;
@ -198,7 +171,7 @@ void mainsCntsInputCaptureCallback(TIM_HandleTypeDef *htim) {
void counterInit() { void counterInit() {
deviceStats = getGlobalDeviceStats(); deviceStats = getGlobalDeviceStats();
seconds = wizGetSeconds(); seconds = networkGetSeconds();
for (uint8_t i = 0; i < NUM_OF_MINUTE_BUFFERS; i++) { for (uint8_t i = 0; i < NUM_OF_MINUTE_BUFFERS; i++) {
minuteBufferReady[i] = false; minuteBufferReady[i] = false;
} }

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

@ -13,12 +13,14 @@
#include <show.h> #include <show.h>
#include <logger.h> #include <logger.h>
#include <eeprom.h> #include <eeprom.h>
#include <wizHelper.h> #include <networkAbstractionLayer.h>
#include <cmdHandler.h>
#include <config.h> #include <config.h>
#include <counter.h> #include <counter.h>
void my_setup_1() { void my_setup_1() {
schInit(); schInit();
logInit(); logInit();
@ -38,13 +40,7 @@ void my_setup_2() {
configInit(); 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(); counterInit();

70
cube/User/Src/networkAbstractionLayer.c Normal file
View File

@ -0,0 +1,70 @@
#include <networkAbstractionLayer.h>
#include <PontCoopScheduler.h>
#include <iwdg.h>
#include <logger.h>
#include <sinkStruct.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) {
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;
} else {
coloredMsg(LOG_YELLOW, "nsh, failed");
seconds.missedUpdates += 1;
}
} else if (tryAgain || ((seconds.seconds % 3600) == 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;
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);
}

43
cube/User/Src/networkAbstractionLayer_lan.c Normal file
View File

@ -0,0 +1,43 @@
#include <networkAbstractionLayer_impl.h>
#include <logger.h>
#include <wizHelper.h>
#include <wizchip_conf.h>
#include <socket.h>
uint64_t networkSntpQuery() {
return wizSntpQuery();
}
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;
}
void networkImplInit() {
wizInit();
}

19
cube/User/Src/networkAbstractionLayer_wifi.c Normal file
View File

@ -0,0 +1,19 @@
#include <networkAbstractionLayer_impl.h>
#include <logger.h>
#include <stdint.h>
uint64_t networkSntpQuery() {
return 0;
}
int8_t networkUdpSend(char *hostname, uint16_t port, uint8_t *buf, uint16_t bufLen) {
return 0;
}
void networkImplInit() {
}

5
cube/User/Src/ports.c
View File

@ -6,6 +6,5 @@
const uint8_t DHCP_SOCK = 0; const uint8_t DHCP_SOCK = 0;
const uint8_t SNTP_SOCK = 1; 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;

52
cube/User/Src/regularCmds.c
View File

@ -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;
}

66
cube/User/Src/wizHelper.c
View File

@ -13,7 +13,6 @@
#include <dns.h> #include <dns.h>
#include <sntp.h> #include <sntp.h>
#include <config.h> #include <config.h>
#include <iwdg.h>
static t_configBlock *config; static t_configBlock *config;
@ -28,7 +27,6 @@ static uint8_t dnsBuffer[DNS_BUFFER_SIZE];
static uint8_t sntpBuffer[MAX_SNTP_BUF_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; const uint64_t UNIX_NTP_EPOCH_DIFF = 2208988800;
@ -135,61 +133,34 @@ bool wizDnsQuery(char *name, uint8_t *ip) {
} }
static void wizSNTPHandler(void *handle) { uint64_t wizSntpQuery() {
bool success = false; uint64_t seconds = 0;
if (networkAvailable) { if (networkAvailable) {
coloredMsg(LOG_BLUE, "wizsh, about to call SNTP"); coloredMsg(LOG_BLUE, "wizsq, about to call SNTP");
uint8_t ntpServer[4]; uint8_t ntpServer[4];
if (wizDnsQuery(config->ntpServer, ntpServer)) { if (wizDnsQuery(config->ntpServer, ntpServer)) {
SNTP_init(SNTP_SOCK, ntpServer, 0, sntpBuffer); SNTP_init(SNTP_SOCK, ntpServer, 0, sntpBuffer);
bool updated = false;
for (uint8_t i = 0; i < 16; i++) { for (uint8_t i = 0; i < 16; i++) {
datetime curTime; datetime curTime;
int8_t res = SNTP_run(&curTime); int8_t res = SNTP_run(&curTime);
uint64_t receivedSeconds = curTime.seconds - UNIX_NTP_EPOCH_DIFF;
if (res == 1) { if (res == 1) {
if (seconds.seconds != receivedSeconds) { seconds = curTime.seconds - UNIX_NTP_EPOCH_DIFF;
coloredMsg(LOG_BLUE, "wizsh, time deviation: %lu %lu", coloredMsg(LOG_BLUE, "wizsq, curTime: %lu", seconds);
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; break;
} }
} }
if (! updated) { if (seconds == 0) {
coloredMsg(LOG_BLUE, "wizsh, time update failed"); coloredMsg(LOG_BLUE, "wizsq, time update failed");
seconds.missedUpdates += 1;
} }
} else { } else {
seconds.missedUpdates += 1; coloredMsg(LOG_BLUE, "wizsq, error when querying ntp server name");
coloredMsg(LOG_BLUE, "wizsh, error when querying ntp server name");
} }
} }
uint16_t tryAgainIn = (success) ? 3600 : 1; return seconds;
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) { static void wizPhyLinkHandler(void *handle) {
@ -198,7 +169,6 @@ static void wizPhyLinkHandler(void *handle) {
static uint8_t lastStablePhyLink = 255; static uint8_t lastStablePhyLink = 255;
static bool dhcpInitialized = false; static bool dhcpInitialized = false;
static bool sntpInitialized = false;
uint8_t phyLink = 0; uint8_t phyLink = 0;
int8_t res = ctlwizchip(CW_GET_PHYLINK, (void*) &phyLink); int8_t res = ctlwizchip(CW_GET_PHYLINK, (void*) &phyLink);
@ -218,12 +188,6 @@ static void wizPhyLinkHandler(void *handle) {
coloredMsg(LOG_BLUE, "wizplh, DHCP handler scheduled"); coloredMsg(LOG_BLUE, "wizplh, DHCP handler scheduled");
dhcpInitialized = true; dhcpInitialized = true;
schAdd(wizSNTPHandler, NULL, 15, 0);
coloredMsg(LOG_BLUE, "wizplh, SNTP handler scheduled");
sntpInitialized = true;
} else { } else {
networkAvailable = false; networkAvailable = false;
show(LED_GREEN, BLINK); show(LED_GREEN, BLINK);
@ -239,14 +203,6 @@ static void wizPhyLinkHandler(void *handle) {
dhcpInitialized = false; dhcpInitialized = false;
} }
if (sntpInitialized) {
schDel(wizSNTPHandler, NULL);
coloredMsg(LOG_BLUE, "wizplh, SNTP handler unscheduled");
seconds.valid = false;
sntpInitialized = false;
}
} }
} }
} }
@ -255,7 +211,7 @@ static void wizPhyLinkHandler(void *handle) {
int wizInit() { int wizInit() {
config = getConfig(); config = getConfig();
netInfo.dhcp = NETINFO_DHCP; 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"); coloredMsg(LOG_BLUE, "wizI, resetting Ethernet module");
wizReset(true); wizReset(true);
@ -304,7 +260,5 @@ int wizInit() {
schAdd(wizPhyLinkHandler, NULL, 0, 1000); schAdd(wizPhyLinkHandler, NULL, 0, 1000);
coloredMsg(LOG_BLUE, "wizI, PhyLink handler scheduled"); coloredMsg(LOG_BLUE, "wizI, PhyLink handler scheduled");
schAdd(wizSecondsHandler, NULL, 0, 1000);
coloredMsg(LOG_BLUE, "wizI, Seconds handler scheduled");
return 0; return 0;
} }

38
tools/insertMyCode.sh
View File

@ -6,8 +6,8 @@ MAIN_C_BAK=${MAIN_C}-bak
IT_C=./Core/Src/stm32f1xx_it.c IT_C=./Core/Src/stm32f1xx_it.c
IT_C_BAK=${IT_C}-bak IT_C_BAK=${IT_C}-bak
MAKEFILE=./Makefile # MAKEFILE=./Makefile
MAKEFILE_BAK=${MAKEFILE}-bak # MAKEFILE_BAK=${MAKEFILE}-bak
PROCESSED="Processed by $0" PROCESSED="Processed by $0"
@ -31,7 +31,7 @@ checkFile () {
checkFile $MAIN_C $MAIN_C_BAK checkFile $MAIN_C $MAIN_C_BAK
checkFile $MAKEFILE $MAKEFILE_BAK # checkFile $MAKEFILE $MAKEFILE_BAK
checkFile $IT_C $IT_C_BAK checkFile $IT_C $IT_C_BAK
cp $MAIN_C $MAIN_C_BAK cp $MAIN_C $MAIN_C_BAK
@ -62,22 +62,22 @@ for I in hottislib/*.c; do
SRC_EXT+="$I " SRC_EXT+="$I "
done 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

2
tools/removeGeneratedCode.sh
View File

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