diff options
| author | bnewbold <bnewbold@robocracy.org> | 2010-09-02 19:23:22 -0400 |
|---|---|---|
| committer | bnewbold <bnewbold@robocracy.org> | 2010-09-02 19:23:22 -0400 |
| commit | 6783e66eb168034880a9ef4847e901a6d4c911d8 (patch) | |
| tree | 01aee2cd737051814c47b5dfa3a6990d4c927996 | |
| parent | 800b8ca1c1463dd85101e242a94c7ca0ec8c459d (diff) | |
| download | librambutan-6783e66eb168034880a9ef4847e901a6d4c911d8.tar.gz librambutan-6783e66eb168034880a9ef4847e901a6d4c911d8.zip | |
added 'unused' attribs and reset default target
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | libmaple/libmaple.h | 7 | ||||
| -rw-r--r-- | wirish/boards.h | 7 |
3 files changed, 9 insertions, 7 deletions
@@ -2,7 +2,7 @@ # Valid BOARDs: maple, maple_native, ... BOARD ?= maple -MEMORY_TARGET ?= ram +MEMORY_TARGET ?= flash # USB ID for DFU upload VENDOR_ID := 1EAF diff --git a/libmaple/libmaple.h b/libmaple/libmaple.h index 3a4042a..db05c96 100644 --- a/libmaple/libmaple.h +++ b/libmaple/libmaple.h @@ -37,7 +37,8 @@ #define MAPLE_DEBUG 1 // MCU-specific configuration -#ifdef MCU_STM32F103RB // eg, LeafLabs Maple +#ifdef MCU_STM32F103RB + // eg, LeafLabs Maple // Number of GPIO ports (GPIOA, GPIOB, etc), definately used #define NR_GPIO_PORTS 4 @@ -130,8 +131,8 @@ // Make sure MCU-specific settings were defined #ifndef NR_GPIO_PORTS -#error Error: No MCU type specified. Add something like -DMCU_STM32F103RB \ - to your compiler arguments (probably in a Makefile). +#error "No MCU type specified. Add something like -DMCU_STM32F103RB " \ + "to your compiler arguments (probably in a Makefile)." #endif // Requires board configuration info diff --git a/wirish/boards.h b/wirish/boards.h index 11d1774..617a7ad 100644 --- a/wirish/boards.h +++ b/wirish/boards.h @@ -148,7 +148,7 @@ typedef struct ExtiInfo { #define MAPLE_RELOAD_VAL 72000 // TODO: - static PinMapping PIN_MAP[NR_GPIO_PINS] = { + static __attribute__ ((unused)) PinMapping PIN_MAP[NR_GPIO_PINS] = { {GPIOA_BASE, 3, ADC3, TIMER2_CH4_CCR}, // D0/PA3 {GPIOA_BASE, 2, ADC2, TIMER2_CH3_CCR}, // D1/PA2 {GPIOA_BASE, 0, ADC0, TIMER2_CH1_CCR}, // D2/PA0 @@ -192,7 +192,8 @@ typedef struct ExtiInfo { {GPIOC_BASE, 9, ADC_INVALID, TIMER_INVALID} // D38/PC9 (BUT) }; - static ExtiInfo PIN_TO_EXTI_CHANNEL[NR_GPIO_PINS] = { + static __attribute__ ((unused)) ExtiInfo PIN_TO_EXTI_CHANNEL[NR_GPIO_PINS] = + { {EXTI3, EXTI_CONFIG_PORTA}, // D0/PA3 {EXTI2, EXTI_CONFIG_PORTA}, // D1/PA2 {EXTI0, EXTI_CONFIG_PORTA}, // D2/PA0 @@ -211,7 +212,7 @@ typedef struct ExtiInfo { #endif #ifndef CYCLES_PER_MICROSECOND -#error Board type has not been selected correctly. +#error "Board type has not been selected correctly." #endif #ifdef __cplusplus |