From b353e47506be60a067c54bb30dfabe413cc1a6d2 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Mon, 27 Sep 2021 17:51:52 -0400 Subject: remove unused ASF code --- make.mk | 7 ------- 1 file changed, 7 deletions(-) (limited to 'make.mk') diff --git a/make.mk b/make.mk index 461bef79..ae32f2da 100644 --- a/make.mk +++ b/make.mk @@ -31,8 +31,6 @@ LDFLAGS += -mcpu=cortex-m0plus -mthumb LDFLAGS += -Wl,--gc-sections LDFLAGS += -Wl,--script=$(TOP)//watch-library/linker/saml22j18.ld -# If you add any additional directories with headers, add them to this list, e.g. -# ../drivers/ INCLUDES += \ -I$(TOP)/tinyusb/src \ -I$(TOP)/boards/$(BOARD) \ @@ -54,7 +52,6 @@ INCLUDES += \ -I$(TOP)/watch-library/hpl/oscctrl/ \ -I$(TOP)/watch-library/hpl/pm/ \ -I$(TOP)/watch-library/hpl/port/ \ - -I$(TOP)/watch-library/hpl/rtc/ \ -I$(TOP)/watch-library/hpl/sercom/ \ -I$(TOP)/watch-library/hpl/slcd/ \ -I$(TOP)/watch-library/hpl/systick/ \ @@ -64,8 +61,6 @@ INCLUDES += \ -I$(TOP)/watch-library/watch/ \ -I$(TOP)/watch-library -# If you add any additional C files to your project, add them each to this list, e.g. -# ../drivers/st25dv.c SRCS += \ $(TOP)/tinyusb/src/tusb.c \ $(TOP)/tinyusb/src/common/tusb_fifo.c \ @@ -78,7 +73,6 @@ SRCS += \ $(TOP)/watch-library/hw/driver_init.c \ $(TOP)/watch-library/watch/watch.c \ $(TOP)/watch-library/hal/src/hal_atomic.c \ - $(TOP)/watch-library/hal/src/hal_calendar.c \ $(TOP)/watch-library/hal/src/hal_delay.c \ $(TOP)/watch-library/hal/src/hal_ext_irq.c \ $(TOP)/watch-library/hal/src/hal_gpio.c \ @@ -100,7 +94,6 @@ SRCS += \ $(TOP)/watch-library/hpl/osc32kctrl/hpl_osc32kctrl.c \ $(TOP)/watch-library/hpl/oscctrl/hpl_oscctrl.c \ $(TOP)/watch-library/hpl/pm/hpl_pm.c \ - $(TOP)/watch-library/hpl/rtc/hpl_rtc.c \ $(TOP)/watch-library/hpl/sercom/hpl_sercom.c \ $(TOP)/watch-library/hpl/slcd/hpl_slcd.c \ $(TOP)/watch-library/hpl/systick/hpl_systick.c \ -- cgit v1.2.3 From 39a17c99b988086396388a942889c78b84ad6891 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Tue, 28 Sep 2021 13:42:08 -0400 Subject: overdue refactor: compile all watch modules separately --- make.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'make.mk') diff --git a/make.mk b/make.mk index ae32f2da..299d9d31 100644 --- a/make.mk +++ b/make.mk @@ -71,6 +71,17 @@ SRCS += \ $(TOP)/watch-library/main.c \ $(TOP)/watch-library/startup_saml22.c \ $(TOP)/watch-library/hw/driver_init.c \ + $(TOP)/watch-library/watch/watch_rtc.c \ + $(TOP)/watch-library/watch/watch_slcd.c \ + $(TOP)/watch-library/watch/watch_extint.c \ + $(TOP)/watch-library/watch/watch_led.c \ + $(TOP)/watch-library/watch/watch_buzzer.c \ + $(TOP)/watch-library/watch/watch_adc.c \ + $(TOP)/watch-library/watch/watch_gpio.c \ + $(TOP)/watch-library/watch/watch_i2c.c \ + $(TOP)/watch-library/watch/watch_uart.c \ + $(TOP)/watch-library/watch/watch_deepsleep.c \ + $(TOP)/watch-library/watch/watch_private.c \ $(TOP)/watch-library/watch/watch.c \ $(TOP)/watch-library/hal/src/hal_atomic.c \ $(TOP)/watch-library/hal/src/hal_delay.c \ -- cgit v1.2.3 From 52c5747d2e873d4946d211c548c03498b72c1fb5 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Tue, 19 Oct 2021 10:14:24 -0400 Subject: getting the sensor watch dev board working --- make.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'make.mk') diff --git a/make.mk b/make.mk index 299d9d31..1c2a72f4 100644 --- a/make.mk +++ b/make.mk @@ -116,3 +116,7 @@ DEFINES += \ ifeq ($(LED), BLUE) CFLAGS += -DWATCH_SWAP_LED_PINS endif + +ifeq ($(BOARD), OSO-FEAL-A1-00) +CFLAGS += -DCRYSTALLESS +endif -- cgit v1.2.3 From 8f6cd8b29062622095c489235061287f13e74dda Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Sat, 23 Oct 2021 16:13:11 -0400 Subject: move weekday lookup to new utilities file --- make.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'make.mk') diff --git a/make.mk b/make.mk index 1c2a72f4..c9ef6534 100644 --- a/make.mk +++ b/make.mk @@ -81,6 +81,7 @@ SRCS += \ $(TOP)/watch-library/watch/watch_i2c.c \ $(TOP)/watch-library/watch/watch_uart.c \ $(TOP)/watch-library/watch/watch_deepsleep.c \ + $(TOP)/watch-library/watch/watch_utility.c \ $(TOP)/watch-library/watch/watch_private.c \ $(TOP)/watch-library/watch/watch.c \ $(TOP)/watch-library/hal/src/hal_atomic.c \ -- cgit v1.2.3