Skip to content

Commit

Permalink
Support ARMGCC
Browse files Browse the repository at this point in the history
  • Loading branch information
ojousima committed Sep 21, 2018
1 parent 71b566c commit 5cdde7f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
10 changes: 8 additions & 2 deletions targets/ruuvitag_b/armgcc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -116,17 +116,21 @@ SRC_FILES += \
$(PROJ_DIR)/ruuvi.drivers.c/interfaces/spi/ruuvi_interface_spi_bme280.c \
$(PROJ_DIR)/ruuvi.drivers.c/interfaces/spi/ruuvi_interface_spi_lis2dh12.c \
$(PROJ_DIR)/ruuvi.drivers.c/nrf5_sdk15_platform/adc/ruuvi_platform_adc_mcu.c \
$(PROJ_DIR)/ruuvi.drivers.c/nrf5_sdk15_platform/communication/ruuvi_platform_communication_radio.c \
$(PROJ_DIR)/ruuvi.drivers.c/nrf5_sdk15_platform/communication/ruuvi_platform_communication_ble4_advertising.c \
$(PROJ_DIR)/ruuvi.drivers.c/nrf5_sdk15_platform/environmental/ruuvi_platform_environmental_mcu.c \
$(PROJ_DIR)/ruuvi.drivers.c/nrf5_sdk15_platform/gpio/ruuvi_platform_gpio.c \
$(PROJ_DIR)/ruuvi.drivers.c/nrf5_sdk15_platform/gpio/ruuvi_platform_gpio_interrupt.c \
$(PROJ_DIR)/ruuvi.drivers.c/nrf5_sdk15_platform/log/ruuvi_platform_log.c \
$(PROJ_DIR)/ruuvi.drivers.c/nrf5_sdk15_platform/ruuvi_platform_error.c \
$(PROJ_DIR)/ruuvi.drivers.c/nrf5_sdk15_platform/rtc/ruuvi_platform_rtc_mcu.c \
$(PROJ_DIR)/ruuvi.drivers.c/nrf5_sdk15_platform/ruuvi_platform_error.c \
$(PROJ_DIR)/ruuvi.drivers.c/nrf5_sdk15_platform/spi/ruuvi_platform_spi.c \
$(PROJ_DIR)/ruuvi.drivers.c/nrf5_sdk15_platform/yield/ruuvi_platform_yield.c \
$(PROJ_DIR)/ruuvi.drivers.c/STMems_Standard_C_drivers/lis2dh12_STdC/driver/lis2dh12_reg.c \
$(PROJ_DIR)/ruuvi.endpoints.c/ruuvi_endpoint_3.c \
$(PROJ_DIR)/tasks/task_acceleration.c \
$(PROJ_DIR)/tasks/task_adc.c \
$(PROJ_DIR)/tasks/task_advertisement.c \
$(PROJ_DIR)/tasks/task_button.c \
$(PROJ_DIR)/tasks/task_environmental.c \
$(PROJ_DIR)/tasks/task_led.c \
Expand Down Expand Up @@ -216,18 +220,20 @@ INC_FOLDERS += \
$(SDK_ROOT)/integration/nrfx \
$(PROJ_DIR)/application_config \
$(PROJ_DIR)/ruuvi.boards.c \
$(PROJ_DIR)/ruuvi.drivers.c/ \
$(PROJ_DIR)/ruuvi.drivers.c \
$(PROJ_DIR)/ruuvi.drivers.c/BME280_driver \
$(PROJ_DIR)/ruuvi.drivers.c/BME280_driver/selftest \
$(PROJ_DIR)/ruuvi.drivers.c/interfaces/acceleration \
$(PROJ_DIR)/ruuvi.drivers.c/interfaces/adc \
$(PROJ_DIR)/ruuvi.drivers.c/interfaces/communication \
$(PROJ_DIR)/ruuvi.drivers.c/interfaces/environmental \
$(PROJ_DIR)/ruuvi.drivers.c/interfaces/gpio \
$(PROJ_DIR)/ruuvi.drivers.c/interfaces/log \
$(PROJ_DIR)/ruuvi.drivers.c/interfaces/rtc \
$(PROJ_DIR)/ruuvi.drivers.c/interfaces/spi \
$(PROJ_DIR)/ruuvi.drivers.c/interfaces/yield \
$(PROJ_DIR)/ruuvi.drivers.c/nrf5_sdk15_platform \
$(PROJ_DIR)/ruuvi.endpoints.c \
$(PROJ_DIR)/ruuvi.drivers.c/STMems_Standard_C_drivers/lis2dh12_STdC/driver/ \
$(PROJ_DIR)/tasks/ \
$(PROJ_DIR)/tests/
Expand Down
1 change: 0 additions & 1 deletion tasks/task_advertisement.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ ruuvi_driver_status_t task_advertisement_send_3(void)
err_code |= task_environmental_data_get(&environmental);
err_code |= task_adc_data_get(&battery);

uint8_t tx_buffer[] = {0};
ruuvi_endpoint_3_data_t data;
data.accelerationx_g = acclereration.x_g;
data.accelerationy_g = acclereration.y_g;
Expand Down

0 comments on commit 5cdde7f

Please sign in to comment.