Compare commits

..

No commits in common. "a1c89c96d594635fc08559d985daa3370e100c23" and "2e01aa6877937e8f90efe27c42513ab0861cdf6b" have entirely different histories.

24 changed files with 75 additions and 422 deletions

28
.vscode/tasks.json vendored
View File

@ -1,25 +1,21 @@
{ {
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0", "version": "2.0.0",
"options": { "options": {
"env": { "env": {
// "APPLICATION": "blinky", "PLATFORM": "nrf52",
// "PLATFORM": "posix",
"APPLICATION": "blinky",
// "APPLICATION": "spi", // "APPLICATION": "spi",
// "APPLICATION": "st7789_lcd", // "APPLICATION": "st7789_lcd",
"APPLICATION": "sys_tick",
"${BUILD_CMD}": "eval docker run --env PLATFORM=${PLATFORM} --env APPLICATION=${APPLICATION} -t --rm -v '${workspaceFolder}':/work --user $(id -u):$(id -g) arm-none-eabi.buildenv",
}, },
}, },
"presentation": {
"focus": true,
"reveal": "always",
"panel": "shared",
"clear": true,
},
"tasks": [ "tasks": [
{ {
"label": "all", "label": "all",
"type":"shell", "type":"shell",
"command": "${BUILD_CMD} make all -j8", "command": "make all -j8",
"problemMatcher": { "problemMatcher": {
"base": "$gcc", "base": "$gcc",
"owner": "gcc", "owner": "gcc",
@ -53,7 +49,7 @@
{ {
"label": "clean", "label": "clean",
"type":"shell", "type":"shell",
"command": "${BUILD_CMD} make clean -j8", "command": "make clean -j8",
"problemMatcher": { "problemMatcher": {
"base": "$gcc", "base": "$gcc",
"owner": "gcc", "owner": "gcc",
@ -70,7 +66,7 @@
{ {
"label": "distclean", "label": "distclean",
"type":"shell", "type":"shell",
"command": "${BUILD_CMD} make distclean", "command": "make distclean",
"problemMatcher": { "problemMatcher": {
"base": "$gcc", "base": "$gcc",
"owner": "gcc", "owner": "gcc",
@ -101,5 +97,11 @@
"isDefault": true "isDefault": true
} }
} }
] ],
"presentation": {
"focus": true,
"reveal": "always",
"panel": "shared",
"clear": true,
}
} }

View File

@ -3,18 +3,12 @@
APPLICATION ?= blinky APPLICATION ?= blinky
PLATFORM ?= nrf52 PLATFORM ?= nrf52
ifneq "$(findstring $(PLATFORM), nrf52)" ""
CORE = cm4
endif
TARGET_FILE ?= $(APPLICATION).elf TARGET_FILE ?= $(APPLICATION).elf
CC = $(CROSS_COMPILE)gcc CC = $(CROSS_COMPILE)gcc
CPP = $(CROSS_COMPILE)cpp CPP = $(CROSS_COMPILE)cpp
CXX = $(CROSS_COMPILE)g++ CXX = $(CROSS_COMPILE)g++
OBJCOPY = $(CROSS_COMPILE)objcopy OBJCOPY = $(CROSS_COMPILE)objcopy
OBJDUMP = $(CROSS_COMPILE)objdump
SIZE = $(CROSS_COMPILE)size SIZE = $(CROSS_COMPILE)size
CHECK = cppcheck CHECK = cppcheck
@ -30,7 +24,6 @@ C_SRCS += $(wildcard $(SRC_DIR)/application/$(APPLICATION)/*.c)
C_OBJS = $(patsubst $(SRC_DIR)%,$(OBJ_DIR)%,$(patsubst %.c,%.c.o,$(C_SRCS))) C_OBJS = $(patsubst $(SRC_DIR)%,$(OBJ_DIR)%,$(patsubst %.c,%.c.o,$(C_SRCS)))
CC_SRCS = $(wildcard $(SRC_DIR)/*.cc) CC_SRCS = $(wildcard $(SRC_DIR)/*.cc)
CC_SRCS += $(wildcard $(SRC_DIR)/platform/$(CORE)/*.cc)
CC_SRCS += $(wildcard $(SRC_DIR)/platform/$(PLATFORM)/*.cc) CC_SRCS += $(wildcard $(SRC_DIR)/platform/$(PLATFORM)/*.cc)
CC_SRCS += $(wildcard $(SRC_DIR)/application/$(APPLICATION)/*.cc) CC_SRCS += $(wildcard $(SRC_DIR)/application/$(APPLICATION)/*.cc)
CC_OBJS = $(patsubst $(SRC_DIR)%,$(OBJ_DIR)%,$(patsubst %.cc,%.cc.o,$(CC_SRCS))) CC_OBJS = $(patsubst $(SRC_DIR)%,$(OBJ_DIR)%,$(patsubst %.cc,%.cc.o,$(CC_SRCS)))
@ -82,11 +75,9 @@ check: $(C_SRCS)
$(TARGET): $(OBJS) $(THIS_MAKEFILE) $(TARGET): $(OBJS) $(THIS_MAKEFILE)
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(CXX) $(CXX_FLAGS) $(LD_FLAGS) $(OBJS) $(addprefix -l,$(LIBS)) -Wl,-Map=$@.map -o $@ $(CXX) $(CXX_FLAGS) $(LD_FLAGS) $(OBJS) $(addprefix -l,$(LIBS)) -o $@
$(OBJDUMP) --disassemble-all --section=.text --source -EL -C --wide --line-numbers --inlines $@ > $@.text.disassemble
ln -sf $(shell pwd)/$@ $(shell pwd)/bin/firmware.elf ln -sf $(shell pwd)/$@ $(shell pwd)/bin/firmware.elf
$(SIZE) -x $@ > $@.size $(SIZE) -x $@
@cat $@.size
$(TARGET_HEX): $(TARGET) $(THIS_MAKEFILE) $(TARGET_HEX): $(TARGET) $(THIS_MAKEFILE)
$(OBJCOPY) -O ihex $(TARGET) $(TARGET_HEX) $(OBJCOPY) -O ihex $(TARGET) $(TARGET_HEX)

View File

@ -25,9 +25,9 @@ C_FLAGS += -DFLOAT_ABI_HARD
C_FLAGS += -DNRF52 C_FLAGS += -DNRF52
C_FLAGS += -DNRF52832_XXAA C_FLAGS += -DNRF52832_XXAA
C_FLAGS += -DNRF52_PAN_74 C_FLAGS += -DNRF52_PAN_74
# C_FLAGS += -DNRF_SD_BLE_API_VERSION=7 C_FLAGS += -DNRF_SD_BLE_API_VERSION=7
# C_FLAGS += -DS132 C_FLAGS += -DS132
# C_FLAGS += -DSOFTDEVICE_PRESENT C_FLAGS += -DSOFTDEVICE_PRESENT
C_FLAGS += -mcpu=$(CPU) C_FLAGS += -mcpu=$(CPU)
C_FLAGS += -mthumb -mabi=aapcs C_FLAGS += -mthumb -mabi=aapcs
C_FLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16 C_FLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
@ -42,9 +42,9 @@ CXX_FLAGS += -DFLOAT_ABI_HARD
CXX_FLAGS += -DNRF52 CXX_FLAGS += -DNRF52
CXX_FLAGS += -DNRF52832_XXAA CXX_FLAGS += -DNRF52832_XXAA
CXX_FLAGS += -DNRF52_PAN_74 CXX_FLAGS += -DNRF52_PAN_74
# CXX_FLAGS += -DNRF_SD_BLE_API_VERSION=7 CXX_FLAGS += -DNRF_SD_BLE_API_VERSION=7
# CXX_FLAGS += -DS132 CXX_FLAGS += -DS132
# CXX_FLAGS += -DSOFTDEVICE_PRESENT CXX_FLAGS += -DSOFTDEVICE_PRESENT
CXX_FLAGS += -mcpu=$(CPU) CXX_FLAGS += -mcpu=$(CPU)
CXX_FLAGS += -mthumb -mabi=aapcs CXX_FLAGS += -mthumb -mabi=aapcs
CXX_FLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16 CXX_FLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
@ -64,8 +64,8 @@ A_FLAGS += -DFLOAT_ABI_HARD
A_FLAGS += -DNRF52 A_FLAGS += -DNRF52
A_FLAGS += -DNRF52832_XXAA A_FLAGS += -DNRF52832_XXAA
A_FLAGS += -DNRF52_PAN_74 A_FLAGS += -DNRF52_PAN_74
# A_FLAGS += -DNRF_SD_BLE_API_VERSION=7 A_FLAGS += -DNRF_SD_BLE_API_VERSION=7
# A_FLAGS += -DS132 A_FLAGS += -DS132
# A_FLAGS += -DSOFTDEVICE_PRESENT # A_FLAGS += -DSOFTDEVICE_PRESENT
A_FLAGS += -D__HEAP_SIZE=8192 A_FLAGS += -D__HEAP_SIZE=8192
A_FLAGS += -D__HEAP_SIZE=8192 A_FLAGS += -D__HEAP_SIZE=8192

View File

@ -3,7 +3,7 @@
#include <cstdint> #include <cstdint>
namespace pinetime::interfaces { namespace interfaces {
class GpioInterface class GpioInterface
{ {

View File

@ -1,16 +0,0 @@
#ifndef __INTERFACES_INTERRUPT_INTERFACE_H__
#define __INTERFACES_INTERRUPT_INTERFACE_H__
namespace pinetime::interfaces {
class InterruptInterface
{
public:
virtual void handle() = 0;
virtual void enable() = 0;
virtual void disable() = 0;
};
}
#endif

View File

@ -3,7 +3,7 @@
#include <cstdint> #include <cstdint>
namespace pinetime::interfaces { namespace interfaces {
class SpiInterface class SpiInterface
{ {

View File

@ -1,12 +1,7 @@
#include <array> #include <array>
#include "delay.h" #include "delay.h"
#include "platform/hal.h"
#include "platform/nrf52/gpio.h"
#include "platform/nrf52/InterruptHandler.h"
#include "platform/nrf52/InterruptGuardian.h"
using namespace pinetime::platform::nrf52;
enum { enum {
PIN_NUMBER_LED_1 = 17, PIN_NUMBER_LED_1 = 17,
@ -15,20 +10,18 @@ enum {
PIN_NUMBER_LED_4 = 20 PIN_NUMBER_LED_4 = 20
}; };
Gpio led_1(PIN_NUMBER_LED_1); hal::Gpio led_1(PIN_NUMBER_LED_1);
Gpio led_2(PIN_NUMBER_LED_2); hal::Gpio led_2(PIN_NUMBER_LED_2);
Gpio led_3(PIN_NUMBER_LED_3); hal::Gpio led_3(PIN_NUMBER_LED_3);
Gpio led_4(PIN_NUMBER_LED_4); hal::Gpio led_4(PIN_NUMBER_LED_4);
std::array<Gpio *, 4> leds = {&led_1, &led_2, &led_3, &led_4}; std::array<hal::Gpio *, 4> leds = {&led_1, &led_2, &led_3, &led_4};
InterruptGuardian InterruptGuardian::instance;
int main(void) int main(void)
{ {
while(true) { while(true) {
for(auto it = std::begin(leds); it != std::end(leds); ++it) { for(auto it = std::begin(leds); it != std::end(leds); ++it) {
Gpio * tmp = *it; hal::Gpio * tmp = *it;
tmp->toggle(); tmp->toggle();
delay_ms(500); delay_ms(500);
} }

View File

@ -1,17 +1,11 @@
#include "delay.h" #include "delay.h"
#include "platform/hal.h"
#include "platform/nrf52/gpio.h" using namespace hal;
#include "platform/nrf52/spi.h"
#include "platform/nrf52/InterruptHandler.h"
#include "platform/nrf52/InterruptGuardian.h"
using namespace pinetime::platform::nrf52;
const uint8_t buf[] = "Test"; const uint8_t buf[] = "Test";
InterruptGuardian InterruptGuardian::instance;
int main(void) int main(void)
{ {
Gpio led_1(17); Gpio led_1(17);

View File

@ -1,25 +1,18 @@
#include "delay.h" #include "delay.h"
#include "platform/nrf52/gpio.h" #include "platform/hal.h"
#include "platform/nrf52/spi.h"
#include "platform/nrf52/InterruptHandler.h"
#include "platform/nrf52/InterruptGuardian.h"
#include "st7789.h" #include "st7789.h"
using namespace pinetime::platform::nrf52; hal::Gpio led_1(17);
Gpio led_1(17); hal::Gpio lcd_reset(26);
hal::Gpio lcd_data_command(18);
Gpio lcd_reset(26); hal::Gpio lcd_backlight(23);
Gpio lcd_data_command(18); hal::Gpio lcd_chip_select(25);
Gpio lcd_backlight(23); hal::Spi lcd_spi(0, 2, 3, 4, lcd_chip_select);
Gpio lcd_chip_select(25);
Spi lcd_spi(0, 2, 3, 4, lcd_chip_select);
St7789 lcd(lcd_spi, lcd_reset, lcd_data_command, lcd_backlight); St7789 lcd(lcd_spi, lcd_reset, lcd_data_command, lcd_backlight);
InterruptGuardian InterruptGuardian::instance;
int main(void) int main(void)
{ {
lcd.init(); lcd.init();

View File

@ -1,47 +0,0 @@
#include <array>
extern "C" {
#include "nrf52.h"
}
#include "platform/nrf52/gpio.h"
#include "platform/nrf52/InterruptHandler.h"
#include "platform/nrf52/InterruptGuardian.h"
#include "platform/cm4/SystemTick.h"
using namespace pinetime::platform::nrf52;
enum {
PIN_NUMBER_LED_1 = 17,
PIN_NUMBER_LED_2 = 18,
PIN_NUMBER_LED_3 = 19,
PIN_NUMBER_LED_4 = 20
};
Gpio led_1(PIN_NUMBER_LED_1);
Gpio led_2(PIN_NUMBER_LED_2);
Gpio led_3(PIN_NUMBER_LED_3);
Gpio led_4(PIN_NUMBER_LED_4);
std::array<Gpio *, 4> leds = {&led_1, &led_2, &led_3, &led_4};
InterruptGuardian InterruptGuardian::instance;
pinetime::platform::cm4::SystemTick ticker;
int main(void)
{
ticker.enable();
uint32_t last_tick = 0;
while(true) {
for(auto it = std::begin(leds); it != std::end(leds); ++it) {
uint32_t tick = ticker.tick() / 1000;
if(tick != last_tick) {
Gpio * tmp = *it;
tmp->toggle();
last_tick = tick;
}
}
}
return 0;
}

View File

@ -1,35 +0,0 @@
extern "C" {
#include "nrf52.h"
}
#include "platform/cm4/SystemTick.h"
#include "platform/nrf52/InterruptGuardian.h"
using namespace pinetime::platform::cm4;
using namespace pinetime::platform::nrf52;
SystemTick::SystemTick()
: InterruptHandler(InterruptGuardian::Nrf52IrqN::SYS_TICK_IRQ)
, sys_tick(0)
{
}
void SystemTick::handle()
{
this->sys_tick++;
}
void SystemTick::enable()
{
SysTick_Config(SystemCoreClock / 1000);
}
void SystemTick::disable()
{
SysTick->CTRL = 0;
}
uint32_t SystemTick::tick()
{
return this->sys_tick;
}

View File

@ -1,23 +0,0 @@
#ifndef __PLATFORM_CM4_SYSTEMTICK_H__
#define __PLATFORM_CM4_SYSTEMTICK_H__
#include "platform/nrf52/InterruptHandler.h"
namespace pinetime::platform::cm4 {
class SystemTick : public pinetime::platform::nrf52::InterruptHandler
{
public:
SystemTick();
void handle();
void enable();
void disable();
uint32_t tick();
private:
uint32_t sys_tick;
};
}
#endif

11
src/platform/hal.h Normal file
View File

@ -0,0 +1,11 @@
#ifndef __PLATFORM_GPIO_H__
#define __PLATFORM_GPIO_H__
#if defined(PLATFORM_nrf52)
#include "platform/nrf52/gpio.h"
#include "platform/nrf52/spi.h"
namespace hal = platform::nrf52;
#endif
#endif

View File

@ -1,13 +0,0 @@
#include "platform/nrf52/InterruptHandler.h"
#include "platform/nrf52/InterruptGuardian.h"
using namespace pinetime::platform::nrf52;
InterruptGuardian::InterruptGuardian()
{
}
void InterruptGuardian::register_handler(Nrf52IrqN irq_nr, InterruptHandler &handler)
{
this->nrf52_vector[irq_nr] = &handler;
}

View File

@ -1,82 +0,0 @@
#ifndef __PINETIME_PLATFORM_NRF52_INTERRUPTGUARDIAN_H__
#define __PINETIME_PLATFORM_NRF52_INTERRUPTGUARDIAN_H__
#include <array>
extern "C" {
#include "nrf52.h"
}
namespace pinetime::platform::nrf52 {
class InterruptGuardian
{
public:
InterruptGuardian();
enum Nrf52IrqN {
// CM4 interrupts
RESET_IRQ = 0, //!< -15 Reset Vector, invoked on Power up and warm reset
NON_MASKABLE_INT_IRQ, //!< -14 Non maskable Interrupt, cannot be stopped or preempted
HARD_FAULT_IRQ, //!< -13 Hard Fault, all classes of Fault
MEMORY_MANAGEMENT_IRQ, //!< -12 Memory Management, MPU mismatch, including Access Violation and No Match
BUS_FAULT_IRQ, //!< -11 Bus Fault, Pre-Fetch-, Memory Access Fault, other address/memory related Fault
USAGE_FAULT_IRQ, //!< -10 Usage Fault, i.e. Undef Instruction, Illegal State Transition
SV_CALL_IRQ, //!< -5 System Service Call via SVC instruction
DEBUG_MONITOR_IRQ, //!< -4 Debug Monitor
PEND_SV_IRQ, //!< -2 Pendable request for system service
SYS_TICK_IRQ, //!< -1 System Tick Timer
// nrf52 interrupts
POWER_CLOCK_IRQn, //!< 0 POWER_CLOCK
RADIO_IRQn, //!< 1 RADIO
UARTE0_UART0_IRQn, //!< 2 UARTE0_UART0
SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0_IRQn, //!< 3 SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0
SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1_IRQn, //!< 4 SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1
NFCT_IRQn, //!< 5 NFCT
GPIOTE_IRQn, //!< 6 GPIOTE
SAADC_IRQn, //!< 7 SAADC
TIMER0_IRQn, //!< 8 TIMER0
TIMER1_IRQn, //!< 9 TIMER1
TIMER2_IRQn, //!< 10 TIMER2
RTC0_IRQn, //!< 11 RTC0
TEMP_IRQn, //!< 12 TEMP
RNG_IRQn, //!< 13 RNG
ECB_IRQn, //!< 14 ECB
CCM_AAR_IRQn, //!< 15 CCM_AAR
WDT_IRQn, //!< 16 WDT
RTC1_IRQn, //!< 17 RTC1
QDEC_IRQn, //!< 18 QDEC
COMP_LPCOMP_IRQn, //!< 19 COMP_LPCOMP
SWI0_EGU0_IRQn, //!< 20 SWI0_EGU0
SWI1_EGU1_IRQn, //!< 21 SWI1_EGU1
SWI2_EGU2_IRQn, //!< 22 SWI2_EGU2
SWI3_EGU3_IRQn, //!< 23 SWI3_EGU3
SWI4_EGU4_IRQn, //!< 24 SWI4_EGU4
SWI5_EGU5_IRQn, //!< 25 SWI5_EGU5
TIMER3_IRQn, //!< 26 TIMER3
TIMER4_IRQn, //!< 27 TIMER4
PWM0_IRQn, //!< 28 PWM0
PDM_IRQn, //!< 29 PDM
MWU_IRQn, //!< 32 MWU
PWM1_IRQn, //!< 33 PWM1
PWM2_IRQn, //!< 34 PWM2
SPIM2_SPIS2_SPI2_IRQn, //!< 35 SPIM2_SPIS2_SPI2
RTC2_IRQn, //!< 36 RTC2
I2S_IRQn, //!< 37 I2S
FPU_IRQn //!< 38 FPU
};
enum {
NRF52_HANDLER_COUNT = FPU_IRQn + 1,
};
void register_handler(Nrf52IrqN irq_nr, InterruptHandler &);
static InterruptGuardian instance;
std::array<InterruptHandler *, NRF52_HANDLER_COUNT> nrf52_vector;
};
}
#endif

View File

@ -1,27 +0,0 @@
#include <assert.h>
#include "platform/nrf52/InterruptHandler.h"
#include "platform/nrf52/InterruptGuardian.h"
using namespace pinetime::platform::nrf52;
InterruptHandler::InterruptHandler(uint32_t irq_nr)
{
InterruptGuardian::instance.register_handler(static_cast<InterruptGuardian::Nrf52IrqN>(irq_nr), *this);
}
void InterruptHandler::handle()
{
asm volatile("nop");
assert(false);
}
void InterruptHandler::enable()
{
assert(false);
}
void InterruptHandler::disable()
{
assert(false);
}

View File

@ -1,22 +0,0 @@
#ifndef __PINETIME_PLATFORM_NRF52_INTERRUPTHANDLER_H__
#define __PINETIME_PLATFORM_NRF52_INTERRUPTHANDLER_H__
#include <cstdint>
#include "interrupt_interface.h"
namespace pinetime::platform::nrf52 {
class InterruptHandler : public pinetime::interfaces::InterruptInterface
{
public:
InterruptHandler(uint32_t);
void handle() override;
void enable() override;
void disable() override;
};
}
#endif

View File

@ -7,7 +7,7 @@ extern "C" {
NRF_GPIO_Type *const GPIO_REGS = reinterpret_cast<NRF_GPIO_Type *>(NRF_P0_BASE); NRF_GPIO_Type *const GPIO_REGS = reinterpret_cast<NRF_GPIO_Type *>(NRF_P0_BASE);
} }
using namespace pinetime::platform::nrf52; using namespace platform::nrf52;
Gpio::Gpio(uint32_t pin) Gpio::Gpio(uint32_t pin)
: pin_number(pin) : pin_number(pin)

View File

@ -3,9 +3,9 @@
#include "gpio_interface.h" #include "gpio_interface.h"
namespace pinetime::platform::nrf52 { namespace platform::nrf52 {
class Gpio : public pinetime::interfaces::GpioInterface class Gpio : public interfaces::GpioInterface
{ {
public: public:
inline Gpio() {} inline Gpio() {}

View File

@ -1,66 +0,0 @@
#include <cassert>
#include "platform/nrf52/InterruptHandler.h"
#include "platform/nrf52/InterruptGuardian.h"
extern "C" {
void NMI_Handler(void);
void HardFault_Handler(void);
void MemoryManagement_Handler(void);
void BusFault_Handler(void);
void UsageFault_Handler(void);
void SVC_Handler(void);
void DebugMon_Handler(void);
void PendSV_Handler(void);
void SysTick_Handler(void);
void POWER_CLOCK_IRQHandler(void);
void RADIO_IRQHandler(void);
void UARTE0_UART0_IRQHandler(void);
void SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0_IRQHandler(void);
void SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1_IRQHandler(void);
void NFCT_IRQHandler(void);
void GPIOTE_IRQHandler(void);
void SAADC_IRQHandler(void);
void TIMER0_IRQHandler(void);
void TIMER1_IRQHandler(void);
void TIMER2_IRQHandler(void);
void RTC0_IRQHandler(void);
void TEMP_IRQHandler(void);
void RNG_IRQHandler(void);
void ECB_IRQHandler(void);
void CCM_AAR_IRQHandler(void);
void WDT_IRQHandler(void);
void RTC1_IRQHandler(void);
void QDEC_IRQHandler(void);
void COMP_LPCOMP_IRQHandler(void);
void SWI0_EGU0_IRQHandler(void);
void SWI1_EGU1_IRQHandler(void);
void SWI2_EGU2_IRQHandler(void);
void SWI3_EGU3_IRQHandler(void);
void SWI4_EGU4_IRQHandler(void);
void SWI5_EGU5_IRQHandler(void);
void TIMER3_IRQHandler(void);
void TIMER4_IRQHandler(void);
void PWM0_IRQHandler(void);
void PDM_IRQHandler(void);
void MWU_IRQHandler(void);
void PWM1_IRQHandler(void);
void PWM2_IRQHandler(void);
void SPIM2_SPIS2_SPI2_IRQHandler(void);
void RTC2_IRQHandler(void);
void I2S_IRQHandler(void);
void FPU_IRQHandler(void);
}
using namespace pinetime::platform::nrf52;
void SysTick_Handler(void)
{
uint32_t irq_nr = InterruptGuardian::Nrf52IrqN::SYS_TICK_IRQ;
InterruptHandler *h = InterruptGuardian::instance.nrf52_vector[irq_nr];
assert(h != nullptr);
h->handle();
}

View File

@ -9,9 +9,9 @@ extern "C" {
NRF_SPI_Type *SPI_REGS = reinterpret_cast<NRF_SPI_Type *>(NRF_SPI0_BASE); NRF_SPI_Type *SPI_REGS = reinterpret_cast<NRF_SPI_Type *>(NRF_SPI0_BASE);
} }
using namespace pinetime::platform::nrf52; using namespace platform::nrf52;
Spi::Spi(uint32_t instance, uint32_t sck, uint32_t mosi, uint32_t miso, pinetime::interfaces::GpioInterface & cs) Spi::Spi(uint32_t instance, uint32_t sck, uint32_t mosi, uint32_t miso, interfaces::GpioInterface & cs)
: chip_select(cs) : chip_select(cs)
{ {
assert(instance < 3); assert(instance < 3);

View File

@ -4,12 +4,12 @@
#include "gpio_interface.h" #include "gpio_interface.h"
#include "spi_interface.h" #include "spi_interface.h"
namespace pinetime::platform::nrf52 { namespace platform::nrf52 {
class Spi : public pinetime::interfaces::SpiInterface class Spi : public interfaces::SpiInterface
{ {
public: public:
Spi(uint32_t instance, uint32_t sck, uint32_t mosi, uint32_t miso, pinetime::interfaces::GpioInterface & cs); Spi(uint32_t instance, uint32_t sck, uint32_t mosi, uint32_t miso, interfaces::GpioInterface & cs);
~Spi(); ~Spi();
void send(const uint8_t * buffer, uint32_t len) override; void send(const uint8_t * buffer, uint32_t len) override;
void recv(uint8_t * buffer, uint32_t len) override; void recv(uint8_t * buffer, uint32_t len) override;
@ -17,7 +17,7 @@ public:
private: private:
uint32_t transfer(uint32_t); uint32_t transfer(uint32_t);
pinetime::interfaces::GpioInterface & chip_select; interfaces::GpioInterface & chip_select;
}; };
} }

View File

@ -3,10 +3,10 @@
#include "delay.h" #include "delay.h"
#include "st7789.h" #include "st7789.h"
St7789::St7789(pinetime::interfaces::SpiInterface & spi_if, St7789::St7789(interfaces::SpiInterface & spi_if,
pinetime::interfaces::GpioInterface & rst, interfaces::GpioInterface & rst,
pinetime::interfaces::GpioInterface & dc, interfaces::GpioInterface & dc,
pinetime::interfaces::GpioInterface & bl) interfaces::GpioInterface & bl)
: spi(spi_if) : spi(spi_if)
, reset(rst) , reset(rst)
, data_command(dc) , data_command(dc)

View File

@ -8,19 +8,19 @@
class St7789 class St7789
{ {
public: public:
St7789(pinetime::interfaces::SpiInterface &, St7789(interfaces::SpiInterface &,
pinetime::interfaces::GpioInterface &, interfaces::GpioInterface &,
pinetime::interfaces::GpioInterface &, interfaces::GpioInterface &,
pinetime::interfaces::GpioInterface &); interfaces::GpioInterface &);
void init(); void init();
void clear(uint16_t Color); void clear(uint16_t Color);
private: private:
pinetime::interfaces::SpiInterface & spi; interfaces::SpiInterface & spi;
pinetime::interfaces::GpioInterface & reset; interfaces::GpioInterface & reset;
pinetime::interfaces::GpioInterface & data_command; interfaces::GpioInterface & data_command;
pinetime::interfaces::GpioInterface & backlight; interfaces::GpioInterface & backlight;
void send_cmd(uint8_t); void send_cmd(uint8_t);
void send_data(uint8_t); void send_data(uint8_t);