search

ruuvi / ruuvitag_fw

RuuviTag firmware projects
120 stars 76 forks source link

Duplicate entry in bootloader production Makefile #160

Open DG12 opened 5 years ago

DG12 commented 5 years ago

$(SDK_ROOT)/components/drivers_nrf/rng/nrf_drv_rng.c \ is included twice in bootloader/ruuvitag_b_production/armgcc/Makefile

There seems to be an extraneous $(SDK_ROOT)/components/drivers_nrf/rng/ \ Notice it's a directory

Additionally Makefile in ruuvi_examples/ruuvi_firmware/ruuvitag_b/s132/armgcc includes duplicate entries:

$(SDK_ROOT)/components/drivers_nrf/delay \
$(SDK_ROOT)/components/drivers_nrf/gpiote/nrf_drv_gpiote.c \
$(SDK_ROOT)/components/libraries/scheduler \
$(SDK_ROOT)/components/libraries/timer \
ojousima commented 5 years ago

Thanks for pointing this out. Can you open a pull request with the duplicates removed? I can do it too at some point if needed.

DG12 commented 5 years ago

I'm a little unclear on how to do that. I have a fork that is "This branch is 5 commits ahead, 35 commits behind ruuvi:master." Do I need to delete my fork, refork it, make the change and then issue the pull request?

ojousima commented 5 years ago

You probably could sort the fork out with some rebases, but maybe it's easier if I remove the duplicates later