Skip to content

HardwareTimer: remove usage of TIMER_OUTPUT_COMPARE mode #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 3, 2020
Merged

HardwareTimer: remove usage of TIMER_OUTPUT_COMPARE mode #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4984100
HardwareTimer: remove usage of TIMER_OUTPUT_COMPARE mode
ABOSTM Dec 3, 2020
ea18d12
Run astyle
ABOSTM Dec 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/lwipopts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@

/* LwIP specific configuration options. */
#if __has_include("STM32lwipopts.h")
#include "STM32lwipopts.h"
#include "STM32lwipopts.h"
#else
#if __has_include("lwipopts_extra.h")
#include "lwipopts_extra.h"
#endif
#include "lwipopts_default.h"
#if __has_include("lwipopts_extra.h")
#include "lwipopts_extra.h"
#endif
#include "lwipopts_default.h"
#endif

#endif /* _ARDUINO_LWIPOPTS_H */
Expand Down
56 changes: 28 additions & 28 deletions src/lwipopts_default.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,35 +151,35 @@ The STM32F4x7 allows computing and verifying the IP, UDP, TCP and ICMP checksums


#ifdef CHECKSUM_BY_HARDWARE
/* CHECKSUM_GEN_IP==0: Generate checksums by hardware for outgoing IP packets.*/
#define CHECKSUM_GEN_IP 0
/* CHECKSUM_GEN_UDP==0: Generate checksums by hardware for outgoing UDP packets.*/
#define CHECKSUM_GEN_UDP 0
/* CHECKSUM_GEN_TCP==0: Generate checksums by hardware for outgoing TCP packets.*/
#define CHECKSUM_GEN_TCP 0
/* CHECKSUM_CHECK_IP==0: Check checksums by hardware for incoming IP packets.*/
#define CHECKSUM_CHECK_IP 0
/* CHECKSUM_CHECK_UDP==0: Check checksums by hardware for incoming UDP packets.*/
#define CHECKSUM_CHECK_UDP 0
/* CHECKSUM_CHECK_TCP==0: Check checksums by hardware for incoming TCP packets.*/
#define CHECKSUM_CHECK_TCP 0
/* CHECKSUM_CHECK_ICMP==0: Check checksums by hardware for incoming ICMP packets.*/
#define CHECKSUM_GEN_ICMP 0
/* CHECKSUM_GEN_IP==0: Generate checksums by hardware for outgoing IP packets.*/
#define CHECKSUM_GEN_IP 0
/* CHECKSUM_GEN_UDP==0: Generate checksums by hardware for outgoing UDP packets.*/
#define CHECKSUM_GEN_UDP 0
/* CHECKSUM_GEN_TCP==0: Generate checksums by hardware for outgoing TCP packets.*/
#define CHECKSUM_GEN_TCP 0
/* CHECKSUM_CHECK_IP==0: Check checksums by hardware for incoming IP packets.*/
#define CHECKSUM_CHECK_IP 0
/* CHECKSUM_CHECK_UDP==0: Check checksums by hardware for incoming UDP packets.*/
#define CHECKSUM_CHECK_UDP 0
/* CHECKSUM_CHECK_TCP==0: Check checksums by hardware for incoming TCP packets.*/
#define CHECKSUM_CHECK_TCP 0
/* CHECKSUM_CHECK_ICMP==0: Check checksums by hardware for incoming ICMP packets.*/
#define CHECKSUM_GEN_ICMP 0
#else
/* CHECKSUM_GEN_IP==1: Generate checksums in software for outgoing IP packets.*/
#define CHECKSUM_GEN_IP 1
/* CHECKSUM_GEN_UDP==1: Generate checksums in software for outgoing UDP packets.*/
#define CHECKSUM_GEN_UDP 1
/* CHECKSUM_GEN_TCP==1: Generate checksums in software for outgoing TCP packets.*/
#define CHECKSUM_GEN_TCP 1
/* CHECKSUM_CHECK_IP==1: Check checksums in software for incoming IP packets.*/
#define CHECKSUM_CHECK_IP 1
/* CHECKSUM_CHECK_UDP==1: Check checksums in software for incoming UDP packets.*/
#define CHECKSUM_CHECK_UDP 1
/* CHECKSUM_CHECK_TCP==1: Check checksums in software for incoming TCP packets.*/
#define CHECKSUM_CHECK_TCP 1
/* CHECKSUM_CHECK_ICMP==1: Check checksums by hardware for incoming ICMP packets.*/
#define CHECKSUM_GEN_ICMP 1
/* CHECKSUM_GEN_IP==1: Generate checksums in software for outgoing IP packets.*/
#define CHECKSUM_GEN_IP 1
/* CHECKSUM_GEN_UDP==1: Generate checksums in software for outgoing UDP packets.*/
#define CHECKSUM_GEN_UDP 1
/* CHECKSUM_GEN_TCP==1: Generate checksums in software for outgoing TCP packets.*/
#define CHECKSUM_GEN_TCP 1
/* CHECKSUM_CHECK_IP==1: Check checksums in software for incoming IP packets.*/
#define CHECKSUM_CHECK_IP 1
/* CHECKSUM_CHECK_UDP==1: Check checksums in software for incoming UDP packets.*/
#define CHECKSUM_CHECK_UDP 1
/* CHECKSUM_CHECK_TCP==1: Check checksums in software for incoming TCP packets.*/
#define CHECKSUM_CHECK_TCP 1
/* CHECKSUM_CHECK_ICMP==1: Check checksums by hardware for incoming ICMP packets.*/
#define CHECKSUM_GEN_ICMP 1
#endif


Expand Down
2 changes: 1 addition & 1 deletion src/utility/ethernetif.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
#include "lwip/igmp.h"
#include "stm32_eth.h"
#if !defined(STM32_CORE_VERSION) || (STM32_CORE_VERSION <= 0x01050000)
#include "variant.h"
#include "variant.h"
#endif

#ifdef __cplusplus
Expand Down
15 changes: 7 additions & 8 deletions src/utility/stm32_eth.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
* They could be used for this library when available
*/
#ifndef DEFAULT_ETHERNET_TIMER
#define DEFAULT_ETHERNET_TIMER TIM14
#warning "Default timer used to call ethernet scheduler at regular interval: TIM14"
#define DEFAULT_ETHERNET_TIMER TIM14
#warning "Default timer used to call ethernet scheduler at regular interval: TIM14"
#endif

/* Ethernet configuration: user parameters */
Expand Down Expand Up @@ -93,8 +93,8 @@ static uint8_t DHCP_Started_by_user = 0;
static uint32_t gEhtLinkTickStart = 0;

#if !defined(STM32_CORE_VERSION) || (STM32_CORE_VERSION <= 0x01060100)
/* Handler for stimer */
static stimer_t TimHandle;
/* Handler for stimer */
static stimer_t TimHandle;
#endif

/*************************** Function prototype *******************************/
Expand Down Expand Up @@ -137,11 +137,11 @@ static void Netif_Config(void)
* @retval None
*/
#if !defined(STM32_CORE_VERSION) || (STM32_CORE_VERSION <= 0x01060100)
static void scheduler_callback(stimer_t *htim)
static void scheduler_callback(stimer_t *htim)
#elif (STM32_CORE_VERSION <= 0x01080000)
static void scheduler_callback(HardwareTimer *htim)
static void scheduler_callback(HardwareTimer *htim)
#else
static void scheduler_callback(void)
static void scheduler_callback(void)
#endif
{
#if (STM32_CORE_VERSION <= 0x01080000)
Expand Down Expand Up @@ -176,7 +176,6 @@ static void TIM_scheduler_Config(void)
{
/* Configure HardwareTimer */
HardwareTimer *EthTim = new HardwareTimer(DEFAULT_ETHERNET_TIMER);
EthTim->setMode(1, TIMER_OUTPUT_COMPARE);

/* Timer set to 1ms */
EthTim->setOverflow(1000, MICROSEC_FORMAT);
Expand Down
32 changes: 16 additions & 16 deletions src/utility/stm32_eth.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ struct tcp_struct {
#define MAX_CLIENT 32

#ifdef ETH_INPUT_USE_IT
extern struct netif gnetif;
extern struct netif gnetif;
#endif


Expand All @@ -125,22 +125,22 @@ void stm32_eth_scheduler(void);
void User_notification(struct netif *netif);

#if LWIP_DHCP
void stm32_DHCP_Process(struct netif *netif);
void stm32_DHCP_Periodic_Handle(struct netif *netif);
void stm32_DHCP_manual_config(void);
uint8_t stm32_get_DHCP_lease_state(void);
void stm32_set_DHCP_state(uint8_t state);
uint8_t stm32_get_DHCP_state(void);
uint8_t stm32_dhcp_started(void);
void stm32_DHCP_Process(struct netif *netif);
void stm32_DHCP_Periodic_Handle(struct netif *netif);
void stm32_DHCP_manual_config(void);
uint8_t stm32_get_DHCP_lease_state(void);
void stm32_set_DHCP_state(uint8_t state);
uint8_t stm32_get_DHCP_state(void);
uint8_t stm32_dhcp_started(void);
#else
#error "LWIP_DHCP must be enabled in lwipopts.h"
#error "LWIP_DHCP must be enabled in lwipopts.h"
#endif

#if LWIP_DNS
void stm32_dns_init(const uint8_t *dnsaddr);
int8_t stm32_dns_gethostbyname(const char *hostname, uint32_t *ipaddr);
void stm32_dns_init(const uint8_t *dnsaddr);
int8_t stm32_dns_gethostbyname(const char *hostname, uint32_t *ipaddr);
#else
#error "LWIP_DNS must be enabled in lwipopts.h"
#error "LWIP_DNS must be enabled in lwipopts.h"
#endif

#if LWIP_UDP
Expand All @@ -164,11 +164,11 @@ ip_addr_t *u8_to_ip_addr(uint8_t *ipu8, ip_addr_t *ipaddr);
uint32_t ip_addr_to_u32(ip_addr_t *ipaddr);

#if LWIP_TCP
err_t tcp_connected_callback(void *arg, struct tcp_pcb *tpcb, err_t err);
err_t tcp_accept_callback(void *arg, struct tcp_pcb *newpcb, err_t err);
void tcp_connection_close(struct tcp_pcb *tpcb, struct tcp_struct *tcp);
err_t tcp_connected_callback(void *arg, struct tcp_pcb *tpcb, err_t err);
err_t tcp_accept_callback(void *arg, struct tcp_pcb *newpcb, err_t err);
void tcp_connection_close(struct tcp_pcb *tpcb, struct tcp_struct *tcp);
#else
#error "LWIP_TCP must be enabled in lwipopts.h"
#error "LWIP_TCP must be enabled in lwipopts.h"
#endif

#endif /* __STM32_ETH_H__ */