Revision 3106e8cc modules/NUCLEO-F103RB/module.h

View differences:

modules/NUCLEO-F103RB/module.h
149 149
/**
150 150
 * @brief   Event flag to be call dwt_isr() interrupt.
151 151
 */
152
#define MODULE_OS_IOEVENTFLAGS_DW1000_IRQn      AOS_IOEVENT_FLAG(GPIOB_ARD_D6)
152
#define MODULE_OS_IOEVENTFLAGS_DW1000_IRQn      AOS_IOEVENT_FLAG(PAL_PAD(LINE_ARD_D6))
153 153

  
154 154
/**
155 155
 * @brief   Event flag to be set on a USER_BUTTON interrupt.
156 156
 */
157
#define MODULE_OS_IOEVENTFLAGS_USERBUTTON       AOS_IOEVENT_FLAG(GPIOC_BUTTON)
157
#define MODULE_OS_IOEVENTFLAGS_USERBUTTON       AOS_IOEVENT_FLAG(PAL_PAD(LINE_BUTTON))
158 158

  
159 159

  
160 160
#if (AMIROOS_CFG_SHELL_ENABLE == true) || (AMIROOS_CFG_TESTS_ENABLE == true) || defined(__DOXYGEN__)
......
164 164
extern ROMCONST char* moduleShellPrompt;
165 165
#endif /* (AMIROOS_CFG_SHELL_ENABLE == true) || (AMIROOS_CFG_TESTS_ENABLE == true) */
166 166

  
167

  
168 167
/**
169 168
 * @brief   Interrupt initialization macro.
170 169
 * @note    SSSP related interrupt signals are already initialized in 'aos_system.c'.
171 170
 */
172 171
#define MODULE_INIT_INTERRUPTS() {                                            \
173 172
  /* user button */                                                           \
174
  palSetPadCallback(moduleGpioUserButton.gpio->port, moduleGpioUserButton.gpio->pad, _intCallback, &moduleGpioUserButton.gpio->pad);  \
175
  palEnablePadEvent(moduleGpioUserButton.gpio->port, moduleGpioUserButton.gpio->pad, APAL2CH_EDGE(moduleGpioUserButton.meta.edge));   \
173
  palSetLineCallback(moduleGpioUserButton.gpio->line, aosSysGetStdIntCallback(), &moduleGpioUserButton.gpio->line); \
174
  palEnableLineEvent(moduleGpioUserButton.gpio->line, APAL2CH_EDGE(moduleGpioUserButton.meta.edge));                \
176 175
  MODULE_INIT_INTERRUPTS_DW1000();                                            \
177 176
}
178 177
#if defined(AMIROLLD_CFG_DW1000)
179 178
  #define MODULE_INIT_INTERRUPTS_DW1000() {                                   \
180
    palSetPadCallback(moduleGpioDw1000Irqn.gpio->port, moduleGpioDw1000Irqn.gpio->pad, _intCallback, &moduleGpioDw1000Irqn.gpio->pad);  \
181
    palEnablePadEvent(moduleGpioDw1000Irqn.gpio->port, moduleGpioDw1000Irqn.gpio->pad, APAL2CH_EDGE(moduleGpioDw1000Irqn.meta.edge));   \
179
    palSetLineCallback(moduleGpioDw1000Irqn.gpio->line, aosSysGetStdIntCallback(), &moduleGpioDw1000Irqn.gpio->line); \
180
    palEnableLineEvent(moduleGpioDw1000Irqn.gpio->line, APAL2CH_EDGE(moduleGpioDw1000Irqn.meta.edge));                \
182 181
  }
183 182
#else /* defined(AMIROLLD_CFG_DW1000) */
184 183
  #define MODULE_INIT_INTERRUPTS_DW1000() {                                   \

Also available in: Unified diff