Skip to content

Commit 100603a

Browse files
dhalbertdhalbert
committed
neopixel_write merge; alphabetize stuff in Makefile
1 parent 4c3b4ca commit 100603a

2 files changed

Lines changed: 28 additions & 31 deletions

File tree

‎ports/nrf/Makefile‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -95,29 +95,29 @@ SRC_NRFX = $(addprefix nrfx/,\
9595
)
9696

9797
SRC_C += \
98-
mphalport.c \
99-
fatfs_port.c \
100-
tick.c \
10198
background.c \
99+
fatfs_port.c \
102100
internal_flash.c \
103-
drivers/bluetooth/ble_drv.c \
104-
drivers/bluetooth/ble_uart.c \
101+
mphalport.c \
102+
tick.c \
105103
boards/$(BOARD)/board.c \
106104
boards/$(BOARD)/pins.c \
107-
nrfx/mdk/system_$(MCU_SUB_VARIANT).c \
108-
nrfx/hal/nrf_nvmc.c \
109105
device/$(MCU_VARIANT)/startup_$(MCU_SUB_VARIANT).c \
106+
drivers/bluetooth/ble_drv.c \
107+
drivers/bluetooth/ble_uart.c \
108+
lib/libc/string0.c \
109+
lib/mp-readline/readline.c \
110110
lib/oofatfs/ff.c \
111111
lib/oofatfs/option/ccsbcs.c \
112112
lib/timeutils/timeutils.c \
113113
lib/utils/buffer_helper.c \
114114
lib/utils/context_manager_helpers.c \
115-
lib/utils/pyexec.c \
116115
lib/utils/interrupt_char.c \
116+
lib/utils/pyexec.c \
117117
lib/utils/stdout_helpers.c \
118118
lib/utils/sys_stdio_mphal.c \
119-
lib/libc/string0.c \
120-
lib/mp-readline/readline.c \
119+
nrfx/hal/nrf_nvmc.c \
120+
nrfx/mdk/system_$(MCU_SUB_VARIANT).c \
121121
peripherals/nrf/$(MCU_CHIP)/pins.c \
122122
supervisor/shared/memory.c
123123

@@ -135,30 +135,29 @@ DRIVERS_SRC_C += $(addprefix modules/,\
135135
)
136136

137137
SRC_COMMON_HAL += \
138-
board/__init__.c \
139-
digitalio/__init__.c \
140-
digitalio/DigitalInOut.c \
141-
microcontroller/__init__.c \
142-
microcontroller/Pin.c \
143-
microcontroller/Processor.c \
144-
neopixel_write/__init__.c \
145-
os/__init__.c \
146-
time/__init__.c \
147-
analogio/__init__.c \
148138
analogio/AnalogIn.c \
149139
analogio/AnalogOut.c \
150-
busio/__init__.c\
140+
analogio/__init__.c \
141+
board/__init__.c \
151142
busio/I2C.c \
152143
busio/SPI.c \
153144
busio/UART.c \
145+
busio/__init__.c\
146+
digitalio/DigitalInOut.c \
147+
digitalio/__init__.c \
148+
microcontroller/Pin.c \
149+
microcontroller/Processor.c \
150+
microcontroller/__init__.c \
154151
neopixel_write/__init__.c \
155-
pulseio/__init__.c \
152+
os/__init__.c \
153+
pulseio/PWMOut.c \
156154
pulseio/PulseIn.c \
157155
pulseio/PulseOut.c \
158-
pulseio/PWMOut.c \
156+
pulseio/__init__.c \
159157
storage/__init__.c \
160-
supervisor/__init__.c \
161158
supervisor/Runtime.c \
159+
supervisor/__init__.c \
160+
time/__init__.c \
162161

163162
ifneq ($(SD), )
164163
SRC_COMMON_HAL += \

‎ports/nrf/common-hal/neopixel_write/__init__.c‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ void common_hal_neopixel_write (const digitalio_digitalinout_obj_t* digitalinout
166166
// pwm->INTEN |= (PWM_INTEN_SEQEND0_Enabled<<PWM_INTEN_SEQEND0_Pos);
167167

168168
// PSEL must be configured before enabling PWM
169-
nrf_pwm_pins_set(pwm, (uint32_t[]) {digitalinout->pin->port*32 + digitalinout->pin->pin, 0xFFFFFFFFUL, 0xFFFFFFFFUL, 0xFFFFFFFFUL} );
169+
nrf_pwm_pins_set(pwm, (uint32_t[]) {digitalinout->pin->number, 0xFFFFFFFFUL, 0xFFFFFFFFUL, 0xFFFFFFFFUL} );
170170

171171
// Enable the PWM
172172
nrf_pwm_enable(pwm);
@@ -205,12 +205,10 @@ void common_hal_neopixel_write (const digitalio_digitalinout_obj_t* digitalinout
205205
// the LEDs and if you are not using the EasyDMA feature.
206206
__disable_irq();
207207

208-
#ifdef NRF_P1
209-
NRF_GPIO_Type* port = ( digitalinout->pin->port ? NRF_P1 : NRF_P0 );
210-
#else
211-
NRF_GPIO_Type* port = NRF_P0;
212-
#endif
213-
uint32_t pinMask = ( 1UL << digitalinout->pin->pin );
208+
uint32_t decoded_pin = digitalinout->pin->number;
209+
NRF_GPIO_Type* port = nrf_gpio_pin_port_decode(&decoded_pin);
210+
211+
uint32_t pinMask = ( 1UL << decoded_pin );
214212

215213
uint32_t CYCLES_X00 = CYCLES_800;
216214
uint32_t CYCLES_X00_T1H = CYCLES_800_T1H;

0 commit comments

Comments
 (0)