Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
57fa805851
|
@ -61,6 +61,7 @@ void Error_Handler(void);
|
||||
#define eepromSpi hspi1
|
||||
#define etherSpi hspi2
|
||||
#define debugUart huart1
|
||||
#define modemUart huart2
|
||||
#define mainsCnt htim1
|
||||
#define LED_Red_Pin GPIO_PIN_13
|
||||
#define LED_Red_GPIO_Port GPIOC
|
||||
@ -68,6 +69,12 @@ void Error_Handler(void);
|
||||
#define LED_Green_GPIO_Port GPIOC
|
||||
#define LED_Blue_Pin GPIO_PIN_15
|
||||
#define LED_Blue_GPIO_Port GPIOC
|
||||
#define MODEM_RES_Pin GPIO_PIN_1
|
||||
#define MODEM_RES_GPIO_Port GPIOA
|
||||
#define MODEM_TX_Pin GPIO_PIN_2
|
||||
#define MODEM_TX_GPIO_Port GPIOA
|
||||
#define MODEM_RX_Pin GPIO_PIN_3
|
||||
#define MODEM_RX_GPIO_Port GPIOA
|
||||
#define EEPROM_CS_Pin GPIO_PIN_4
|
||||
#define EEPROM_CS_GPIO_Port GPIOA
|
||||
#define EEPROM_SCK_Pin GPIO_PIN_5
|
||||
|
||||
@ -31,12 +31,14 @@
|
||||
/* USER CODE END Includes */
|
||||
|
||||
extern UART_HandleTypeDef huart1;
|
||||
extern UART_HandleTypeDef huart2;
|
||||
|
||||
/* USER CODE BEGIN Private defines */
|
||||
|
||||
/* USER CODE END Private defines */
|
||||
|
||||
void MX_USART1_UART_Init(void);
|
||||
void MX_USART2_UART_Init(void);
|
||||
|
||||
/* USER CODE BEGIN Prototypes */
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@ void MX_GPIO_Init(void)
|
||||
HAL_GPIO_WritePin(GPIOC, LED_Red_Pin|LED_Green_Pin|LED_Blue_Pin, GPIO_PIN_RESET);
|
||||
|
||||
/*Configure GPIO pin Output Level */
|
||||
HAL_GPIO_WritePin(EEPROM_CS_GPIO_Port, EEPROM_CS_Pin, GPIO_PIN_RESET);
|
||||
HAL_GPIO_WritePin(GPIOA, MODEM_RES_Pin|EEPROM_CS_Pin, GPIO_PIN_RESET);
|
||||
|
||||
/*Configure GPIO pin Output Level */
|
||||
HAL_GPIO_WritePin(GPIOB, ETHER_RES_Pin|ETHER_CS_Pin|Debug_Signal_2_Pin|Debug_Signal_1_Pin, GPIO_PIN_RESET);
|
||||
@ -64,12 +64,12 @@ void MX_GPIO_Init(void)
|
||||
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
|
||||
HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
|
||||
|
||||
/*Configure GPIO pin : PtPin */
|
||||
GPIO_InitStruct.Pin = EEPROM_CS_Pin;
|
||||
/*Configure GPIO pins : PAPin PAPin */
|
||||
GPIO_InitStruct.Pin = MODEM_RES_Pin|EEPROM_CS_Pin;
|
||||
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
|
||||
GPIO_InitStruct.Pull = GPIO_NOPULL;
|
||||
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
|
||||
HAL_GPIO_Init(EEPROM_CS_GPIO_Port, &GPIO_InitStruct);
|
||||
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
|
||||
|
||||
/*Configure GPIO pin : PtPin */
|
||||
GPIO_InitStruct.Pin = ADMIN_MODE_Pin;
|
||||
|
||||
@ -99,6 +99,7 @@ int main(void)
|
||||
MX_TIM1_Init();
|
||||
MX_USART1_UART_Init();
|
||||
MX_IWDG_Init();
|
||||
MX_USART2_UART_Init();
|
||||
/* USER CODE BEGIN 2 */
|
||||
my_setup_2();
|
||||
|
||||
|
||||
@ -94,6 +94,7 @@ int main(void)
|
||||
MX_TIM1_Init();
|
||||
MX_USART1_UART_Init();
|
||||
MX_IWDG_Init();
|
||||
MX_USART2_UART_Init();
|
||||
/* USER CODE BEGIN 2 */
|
||||
|
||||
/* USER CODE END 2 */
|
||||
|
||||
@ -25,6 +25,7 @@
|
||||
/* USER CODE END 0 */
|
||||
|
||||
UART_HandleTypeDef huart1;
|
||||
UART_HandleTypeDef huart2;
|
||||
|
||||
/* USART1 init function */
|
||||
|
||||
@ -44,6 +45,25 @@ void MX_USART1_UART_Init(void)
|
||||
Error_Handler();
|
||||
}
|
||||
|
||||
}
|
||||
/* USART2 init function */
|
||||
|
||||
void MX_USART2_UART_Init(void)
|
||||
{
|
||||
|
||||
huart2.Instance = USART2;
|
||||
huart2.Init.BaudRate = 115200;
|
||||
huart2.Init.WordLength = UART_WORDLENGTH_8B;
|
||||
huart2.Init.StopBits = UART_STOPBITS_1;
|
||||
huart2.Init.Parity = UART_PARITY_NONE;
|
||||
huart2.Init.Mode = UART_MODE_TX_RX;
|
||||
huart2.Init.HwFlowCtl = UART_HWCONTROL_NONE;
|
||||
huart2.Init.OverSampling = UART_OVERSAMPLING_16;
|
||||
if (HAL_UART_Init(&huart2) != HAL_OK)
|
||||
{
|
||||
Error_Handler();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
|
||||
@ -80,6 +100,33 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
|
||||
|
||||
/* USER CODE END USART1_MspInit 1 */
|
||||
}
|
||||
else if(uartHandle->Instance==USART2)
|
||||
{
|
||||
/* USER CODE BEGIN USART2_MspInit 0 */
|
||||
|
||||
/* USER CODE END USART2_MspInit 0 */
|
||||
/* USART2 clock enable */
|
||||
__HAL_RCC_USART2_CLK_ENABLE();
|
||||
|
||||
__HAL_RCC_GPIOA_CLK_ENABLE();
|
||||
/**USART2 GPIO Configuration
|
||||
PA2 ------> USART2_TX
|
||||
PA3 ------> USART2_RX
|
||||
*/
|
||||
GPIO_InitStruct.Pin = MODEM_TX_Pin;
|
||||
GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
|
||||
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
|
||||
HAL_GPIO_Init(MODEM_TX_GPIO_Port, &GPIO_InitStruct);
|
||||
|
||||
GPIO_InitStruct.Pin = MODEM_RX_Pin;
|
||||
GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
|
||||
GPIO_InitStruct.Pull = GPIO_NOPULL;
|
||||
HAL_GPIO_Init(MODEM_RX_GPIO_Port, &GPIO_InitStruct);
|
||||
|
||||
/* USER CODE BEGIN USART2_MspInit 1 */
|
||||
|
||||
/* USER CODE END USART2_MspInit 1 */
|
||||
}
|
||||
}
|
||||
|
||||
void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)
|
||||
@ -105,6 +152,24 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)
|
||||
|
||||
/* USER CODE END USART1_MspDeInit 1 */
|
||||
}
|
||||
else if(uartHandle->Instance==USART2)
|
||||
{
|
||||
/* USER CODE BEGIN USART2_MspDeInit 0 */
|
||||
|
||||
/* USER CODE END USART2_MspDeInit 0 */
|
||||
/* Peripheral clock disable */
|
||||
__HAL_RCC_USART2_CLK_DISABLE();
|
||||
|
||||
/**USART2 GPIO Configuration
|
||||
PA2 ------> USART2_TX
|
||||
PA3 ------> USART2_RX
|
||||
*/
|
||||
HAL_GPIO_DeInit(GPIOA, MODEM_TX_Pin|MODEM_RX_Pin);
|
||||
|
||||
/* USER CODE BEGIN USART2_MspDeInit 1 */
|
||||
|
||||
/* USER CODE END USART2_MspDeInit 1 */
|
||||
}
|
||||
}
|
||||
|
||||
/* USER CODE BEGIN 1 */
|
||||
|
||||
@ -97,14 +97,11 @@ 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
|
||||
User/Src/networkAbstractionLayer_wifi.c
|
||||
endif
|
||||
|
||||
# ASM sources
|
||||
@ -184,7 +181,7 @@ endif
|
||||
# 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
|
||||
CFLAGS = $(MCU) $(C_DEFS) $(C_INCLUDES) $(OPT) -DNETWORK=$(NETWORK) -DVERSION="\"$(VERSION)\"" -Wall -Werror -fdata-sections -ffunction-sections
|
||||
|
||||
ifeq ($(DEBUG), 1)
|
||||
CFLAGS += -g -gdwarf-2
|
||||
|
||||
@ -2,11 +2,10 @@
|
||||
#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_ */
|
||||
|
||||
@ -12,7 +12,7 @@ typedef enum {
|
||||
LED_BLUE
|
||||
} signalPin_t;
|
||||
|
||||
typedef enum { ON, OFF, TOGGLE, BLINK, BLINK_FAST } signalAction_t;
|
||||
typedef enum { ON, OFF, TOGGLE, BLINK } signalAction_t;
|
||||
|
||||
void showInit();
|
||||
void show(signalPin_t signalPin, signalAction_t action);
|
||||
|
||||
@ -7,9 +7,10 @@
|
||||
|
||||
|
||||
int wizInit();
|
||||
bool wizIsNetworkAvailable();
|
||||
bool isNetworkAvailable();
|
||||
uint8_t* wizGetIPAddress();
|
||||
bool wizDnsQuery(char *name, uint8_t *ip);
|
||||
uint64_t wizSntpQuery();
|
||||
|
||||
|
||||
#endif // _WIZHELPER_H_
|
||||
|
||||
@ -48,7 +48,7 @@ void counterMinuteTick(void *handle) {
|
||||
minuteBuffer->s.totalRunningHours = deviceStats->totalRunningHours;
|
||||
minuteBuffer->s.totalPowercycles = deviceStats->totalPowercycles;
|
||||
minuteBuffer->s.totalWatchdogResets = deviceStats->totalWatchdogResets;
|
||||
minuteBuffer->s.version = strtoll(VERSION, NULL, 16);
|
||||
minuteBuffer->s.version = strtol(VERSION, NULL, 16);
|
||||
|
||||
|
||||
memset(minuteBuffer->s.deviceId, 0, sizeof(minuteBuffer->s.deviceId));
|
||||
|
||||
@ -1,12 +1,62 @@
|
||||
#include <modemCom.h>
|
||||
#include <main.h>
|
||||
#include <usart.h>
|
||||
|
||||
|
||||
|
||||
void modemTxCpltCallback(UART_HandleTypeDef *huart) {
|
||||
|
||||
}
|
||||
void modemISR() {
|
||||
uint32_t isrflags = READ_REG(modemUart.Instance->SR);
|
||||
uint32_t cr1its = READ_REG(modemUart.Instance->CR1);
|
||||
|
||||
void modemRxCpltCallback(UART_HandleTypeDef *huart) {
|
||||
|
||||
// RXNEIE doesn't need to be considered since it is always on and more over the
|
||||
// RXNE flag is cleared by reading the DR, which is done in any case
|
||||
if (((isrflags & USART_SR_RXNE) != RESET) || ((isrflags & (USART_SR_ORE | USART_SR_FE | USART_SR_PE | USART_SR_NE)) != RESET)) {
|
||||
// Error flags are only valid together with the RX flag.
|
||||
// They will be cleared by reading SR (already done above) followed by reading DR (below).
|
||||
bool errorFound = false;
|
||||
if ((isrflags & USART_SR_ORE) != RESET) {
|
||||
mbusCommStats.uartOverrunCnt += 1;
|
||||
errorFound = true;
|
||||
}
|
||||
if ((isrflags & USART_SR_FE) != RESET) {
|
||||
mbusCommStats.uartFramingErrCnt += 1;
|
||||
errorFound = true;
|
||||
}
|
||||
if ((isrflags & USART_SR_PE) != RESET) {
|
||||
mbusCommStats.uartParityErrCnt += 1;
|
||||
errorFound = true;
|
||||
}
|
||||
if ((isrflags & USART_SR_NE) != RESET) {
|
||||
mbusCommStats.uartNoiseErrCnt += 1;
|
||||
errorFound = true;
|
||||
}
|
||||
mbusCommStats.uartOctetCnt += 1;
|
||||
// it is required to read the DR in any case here, not only when the buffer has space
|
||||
// otherwise the interrupt flag won't be reset, particularly important in case of ORE
|
||||
uint8_t data = (uint8_t)(mbusUart.Instance->DR & (uint8_t)0x00FF);
|
||||
if ((! errorFound) &&
|
||||
(mbusCommHandle.receiveBuffer.writeIdx < mbusCommHandle.receiveBuffer.size)) {
|
||||
mbusCommHandle.receiveBuffer.buffer[mbusCommHandle.receiveBuffer.writeIdx] = data;
|
||||
mbusCommHandle.receiveBuffer.writeIdx += 1;
|
||||
}
|
||||
}
|
||||
|
||||
// TXEIE needs to be considered since TXE is cleared by writing the DR, which isn't done
|
||||
// after the last octet sent
|
||||
if (((isrflags & USART_SR_TXE) != RESET) && ((cr1its & USART_CR1_TXEIE) != RESET)) {
|
||||
if (mbusCommHandle.sendBuffer.readIdx < mbusCommHandle.sendBuffer.writeIdx) {
|
||||
mbusUart.Instance->DR = mbusCommHandle.sendBuffer.buffer[mbusCommHandle.sendBuffer.readIdx];
|
||||
mbusCommHandle.sendBuffer.readIdx += 1;
|
||||
if (mbusCommHandle.sendBuffer.readIdx == mbusCommHandle.sendBuffer.writeIdx) {
|
||||
__HAL_UART_DISABLE_IT(&mbusUart, UART_IT_TXE);
|
||||
__HAL_UART_ENABLE_IT(&mbusUart, UART_IT_TC);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// advance the state for the engine only when the last octet is shifted out completely
|
||||
if (((isrflags & USART_SR_TC) != RESET) && ((cr1its & USART_CR1_TCIE) != RESET)) {
|
||||
__HAL_UART_DISABLE_IT(&mbusUart, UART_IT_TC);
|
||||
mbusCommHandle.state = MBCS_SENDING_DONE;
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
#include <iwdg.h>
|
||||
#include <logger.h>
|
||||
#include <sinkStruct.h>
|
||||
#include <show.h>
|
||||
#include <config.h>
|
||||
|
||||
#include <networkAbstractionLayer_impl.h>
|
||||
@ -15,13 +14,12 @@ 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()) {
|
||||
if (! seconds.valid) {
|
||||
coloredMsg(LOG_YELLOW, "nsh, initially querying time");
|
||||
uint64_t tmpSeconds = networkSntpQuery();
|
||||
if (tmpSeconds != 0) {
|
||||
@ -29,7 +27,6 @@ static void networkSecondsHandler(void *handle) {
|
||||
seconds.seconds = tmpSeconds;
|
||||
seconds.missedUpdates = 0;
|
||||
seconds.valid = true;
|
||||
show(LED_GREEN, ON);
|
||||
} else {
|
||||
coloredMsg(LOG_YELLOW, "nsh, failed");
|
||||
seconds.missedUpdates += 1;
|
||||
@ -41,7 +38,6 @@ static void networkSecondsHandler(void *handle) {
|
||||
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;
|
||||
|
||||
@ -1,199 +1,17 @@
|
||||
#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;
|
||||
return wizSntpQuery();
|
||||
}
|
||||
|
||||
|
||||
extern uint8_t SINK_SOCK;
|
||||
|
||||
int8_t networkUdpSend(char *hostname, uint16_t port, uint8_t *buf, uint16_t bufLen) {
|
||||
@ -220,11 +38,6 @@ int8_t networkUdpSend(char *hostname, uint16_t port, uint8_t *buf, uint16_t bufL
|
||||
return 1;
|
||||
}
|
||||
|
||||
bool isNetworkAvailable() {
|
||||
return wizIsNetworkAvailable();
|
||||
}
|
||||
|
||||
void networkImplInit() {
|
||||
config = getConfig();
|
||||
wizInit();
|
||||
}
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
#include <main.h>
|
||||
#include <show.h>
|
||||
#include <PontCoopScheduler.h>
|
||||
#include <show.h>
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
@ -25,20 +24,9 @@ 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++;
|
||||
@ -55,5 +43,5 @@ void show(signalPin_t signalPin, signalAction_t action) {
|
||||
}
|
||||
|
||||
void showInit() {
|
||||
schAdd(showHandler, NULL, 0, 100);
|
||||
schAdd(showHandler, NULL, 0, 250);
|
||||
}
|
||||
@ -26,14 +26,18 @@ static uint8_t dhcpBuffer[DHCP_BUFFER_SIZE];
|
||||
static uint8_t dnsBuffer[DNS_BUFFER_SIZE];
|
||||
|
||||
|
||||
static uint8_t sntpBuffer[MAX_SNTP_BUF_SIZE];
|
||||
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 wizIsNetworkAvailable() {
|
||||
bool isNetworkAvailable() {
|
||||
return networkAvailable;
|
||||
}
|
||||
|
||||
@ -86,7 +90,7 @@ static void wizDHCPAssign() {
|
||||
coloredMsg(LOG_BLUE, "wizda, set netinfo again");
|
||||
|
||||
networkAvailable = true;
|
||||
show(LED_GREEN, BLINK_FAST);
|
||||
show(LED_GREEN, ON);
|
||||
coloredMsg(LOG_BLUE, "wizda, network is available");
|
||||
}
|
||||
|
||||
@ -129,6 +133,40 @@ bool wizDnsQuery(char *name, uint8_t *ip) {
|
||||
}
|
||||
|
||||
|
||||
uint64_t wizSntpQuery() {
|
||||
uint64_t seconds = 0;
|
||||
|
||||
if (networkAvailable) {
|
||||
coloredMsg(LOG_BLUE, "wizsq, about to call SNTP");
|
||||
|
||||
uint8_t ntpServer[4];
|
||||
if (wizDnsQuery(config->ntpServer, ntpServer)) {
|
||||
SNTP_init(SNTP_SOCK, ntpServer, 0, sntpBuffer);
|
||||
uint16_t cycles = 0;
|
||||
uint32_t startTime = HAL_GetTick();
|
||||
while (1) {
|
||||
cycles += 1;
|
||||
datetime curTime;
|
||||
if (1 == SNTP_run(&curTime)) {
|
||||
seconds = curTime.seconds - UNIX_NTP_EPOCH_DIFF;
|
||||
coloredMsg(LOG_BLUE, "wizsq, cycles: %u, curTime: %lu", cycles, seconds);
|
||||
uint32_t stopTime = HAL_GetTick();
|
||||
coloredMsg(LOG_BLUE, "wizsq, duration: %u ms", stopTime - startTime);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (seconds == 0) {
|
||||
coloredMsg(LOG_BLUE, "wizsq, time update failed");
|
||||
}
|
||||
} else {
|
||||
coloredMsg(LOG_BLUE, "wizsq, error when querying ntp server name");
|
||||
}
|
||||
}
|
||||
|
||||
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();
|
||||
|
||||
@ -13,35 +13,39 @@ Mcu.IP4=SPI2
|
||||
Mcu.IP5=SYS
|
||||
Mcu.IP6=TIM1
|
||||
Mcu.IP7=USART1
|
||||
Mcu.IPNb=8
|
||||
Mcu.IP8=USART2
|
||||
Mcu.IPNb=9
|
||||
Mcu.Name=STM32F103C(8-B)Tx
|
||||
Mcu.Package=LQFP48
|
||||
Mcu.Pin0=PC13-TAMPER-RTC
|
||||
Mcu.Pin1=PC14-OSC32_IN
|
||||
Mcu.Pin10=PB11
|
||||
Mcu.Pin11=PB12
|
||||
Mcu.Pin12=PB13
|
||||
Mcu.Pin13=PB14
|
||||
Mcu.Pin14=PB15
|
||||
Mcu.Pin15=PA8
|
||||
Mcu.Pin16=PA9
|
||||
Mcu.Pin17=PA10
|
||||
Mcu.Pin18=PA12
|
||||
Mcu.Pin19=PA13
|
||||
Mcu.Pin10=PA6
|
||||
Mcu.Pin11=PA7
|
||||
Mcu.Pin12=PB10
|
||||
Mcu.Pin13=PB11
|
||||
Mcu.Pin14=PB12
|
||||
Mcu.Pin15=PB13
|
||||
Mcu.Pin16=PB14
|
||||
Mcu.Pin17=PB15
|
||||
Mcu.Pin18=PA8
|
||||
Mcu.Pin19=PA9
|
||||
Mcu.Pin2=PC15-OSC32_OUT
|
||||
Mcu.Pin20=PA14
|
||||
Mcu.Pin21=PB5
|
||||
Mcu.Pin22=PB6
|
||||
Mcu.Pin23=VP_IWDG_VS_IWDG
|
||||
Mcu.Pin24=VP_SYS_VS_Systick
|
||||
Mcu.Pin20=PA10
|
||||
Mcu.Pin21=PA12
|
||||
Mcu.Pin22=PA13
|
||||
Mcu.Pin23=PA14
|
||||
Mcu.Pin24=PB5
|
||||
Mcu.Pin25=PB6
|
||||
Mcu.Pin26=VP_IWDG_VS_IWDG
|
||||
Mcu.Pin27=VP_SYS_VS_Systick
|
||||
Mcu.Pin3=PD0-OSC_IN
|
||||
Mcu.Pin4=PD1-OSC_OUT
|
||||
Mcu.Pin5=PA4
|
||||
Mcu.Pin6=PA5
|
||||
Mcu.Pin7=PA6
|
||||
Mcu.Pin8=PA7
|
||||
Mcu.Pin9=PB10
|
||||
Mcu.PinsNb=25
|
||||
Mcu.Pin5=PA1
|
||||
Mcu.Pin6=PA2
|
||||
Mcu.Pin7=PA3
|
||||
Mcu.Pin8=PA4
|
||||
Mcu.Pin9=PA5
|
||||
Mcu.PinsNb=28
|
||||
Mcu.ThirdPartyNb=0
|
||||
Mcu.UserConstants=eepromSpi,hspi1;etherSpi,hspi2;debugUart,huart1;mainsCnt,htim1
|
||||
Mcu.UserName=STM32F103C8Tx
|
||||
@ -61,6 +65,10 @@ NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
|
||||
NVIC.TIM1_CC_IRQn=true\:0\:0\:false\:false\:true\:true\:true
|
||||
NVIC.USART1_IRQn=true\:0\:0\:false\:false\:true\:true\:true
|
||||
NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
|
||||
PA1.GPIOParameters=GPIO_Label
|
||||
PA1.GPIO_Label=MODEM_RES
|
||||
PA1.Locked=true
|
||||
PA1.Signal=GPIO_Output
|
||||
PA10.GPIOParameters=GPIO_Label
|
||||
PA10.GPIO_Label=Debug_RX
|
||||
PA10.Mode=Asynchronous
|
||||
@ -72,6 +80,14 @@ PA13.Mode=Serial_Wire
|
||||
PA13.Signal=SYS_JTMS-SWDIO
|
||||
PA14.Mode=Serial_Wire
|
||||
PA14.Signal=SYS_JTCK-SWCLK
|
||||
PA2.GPIOParameters=GPIO_Label
|
||||
PA2.GPIO_Label=MODEM_TX
|
||||
PA2.Mode=Asynchronous
|
||||
PA2.Signal=USART2_TX
|
||||
PA3.GPIOParameters=GPIO_Label
|
||||
PA3.GPIO_Label=MODEM_RX
|
||||
PA3.Mode=Asynchronous
|
||||
PA3.Signal=USART2_RX
|
||||
PA4.GPIOParameters=GPIO_Label
|
||||
PA4.GPIO_Label=EEPROM_CS
|
||||
PA4.Locked=true
|
||||
@ -171,7 +187,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,8-MX_USART2_UART_Init-USART2-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
|
||||
RCC.ADCFreqValue=36000000
|
||||
RCC.AHBFreq_Value=72000000
|
||||
RCC.APB1CLKDivider=RCC_HCLK_DIV2
|
||||
@ -214,6 +230,8 @@ TIM1.IPParameters=Channel-Input_Capture1_from_TI1,Prescaler,ClockDivision
|
||||
TIM1.Prescaler=13
|
||||
USART1.IPParameters=VirtualMode
|
||||
USART1.VirtualMode=VM_ASYNC
|
||||
USART2.IPParameters=VirtualMode
|
||||
USART2.VirtualMode=VM_ASYNC
|
||||
VP_IWDG_VS_IWDG.Mode=IWDG_Activate
|
||||
VP_IWDG_VS_IWDG.Signal=IWDG_VS_IWDG
|
||||
VP_SYS_VS_Systick.Mode=SysTick
|
||||
|
||||
BIN
docs/ntp.pcap
BIN
docs/ntp.pcap
Binary file not shown.
BIN
docs/ntp2.pcap
BIN
docs/ntp2.pcap
Binary file not shown.
@ -49,7 +49,10 @@ cp $IT_C $IT_C_BAK
|
||||
echo "// $PROCESSED" > $IT_C
|
||||
cat $IT_C_BAK | \
|
||||
sed -e 's,\(/\* USER CODE BEGIN Includes \*/\),\1\n#include "main2.h"\n,' \
|
||||
-e 's,\(/\* USER CODE BEGIN PFP \*/\),\1\nvoid modemISR();\n,' \
|
||||
-e 's,\(/\* USER CODE BEGIN SysTick_IRQn 1 \*/\),\1\n SYSTICK_Callback();\n,' \
|
||||
-e 's,\(HAL_UART_IRQHandler(&huart2);\),// \1,' \
|
||||
-e 's,\(/\* USER CODE BEGIN UART5_IRQn 1 \*/\),\1\n modemISR();\n,' \
|
||||
>> $IT_C
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user