Revision 1a8fb642 modules/NUCLEO-F103RB/module.h

View differences:

modules/NUCLEO-F103RB/module.h
147 147
/**
148 148
 * @brief   Event flag to be call dwt_isr() interrupt.
149 149
 */
150
#define MODULE_OS_IOEVENTFLAGS_DW1000_IRQn      AOS_IOEVENT_FLAG(PAL_PAD(LINE_ARD_D14))
150
#define MODULE_OS_GPIOEVENTFLAG_DW1000_IRQn     AOS_GPIOEVENT_FLAG(PAL_PAD(LINE_ARD_D14))
151 151
//#endif /* (BOARD_DW1000_CONNECTED == true) */
152 152

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

  
158 158
#if (AMIROOS_CFG_SHELL_ENABLE == true) || defined(__DOXYGEN__)
159 159
/**
......
168 168
 */
169 169
#define MODULE_INIT_INTERRUPTS() {                                            \
170 170
  /* user button */                                                           \
171
  palSetLineCallback(moduleGpioUserButton.gpio->line, aosSysGetStdExtiCallback(), &moduleGpioUserButton.gpio->line);  \
171
  palSetLineCallback(moduleGpioUserButton.gpio->line, aosSysGetStdGpioCallback(), &moduleGpioUserButton.gpio->line);  \
172 172
  palEnableLineEvent(moduleGpioUserButton.gpio->line, APAL2CH_EDGE(moduleGpioUserButton.meta.edge));                  \
173 173
  MODULE_INIT_INTERRUPTS_DW1000();                                            \
174 174
}
175 175
#if (BOARD_DW1000_CONNECTED == true)
176 176
  #define MODULE_INIT_INTERRUPTS_DW1000() {                                   \
177
    palSetLineCallback(moduleGpioDw1000Irqn.gpio->line, aosSysGetStdExtiCallback(), &moduleGpioDw1000Irqn.gpio->line);  \
177
    palSetLineCallback(moduleGpioDw1000Irqn.gpio->line, aosSysGetStdGpioCallback(), &moduleGpioDw1000Irqn.gpio->line);  \
178 178
    palEnableLineEvent(moduleGpioDw1000Irqn.gpio->line, APAL2CH_EDGE(moduleGpioDw1000Irqn.meta.edge));                  \
179 179
  }
180 180
#else /* (BOARD_DW1000_CONNECTED == true) */
......
187 187
 * @brief   Test initialization hook.
188 188
 */
189 189
#define MODULE_INIT_TESTS() {                                                 \
190
  /* initialize tests and add to shell */                                     \
190
  /* add test commands to shell */                                            \
191 191
  aosShellAddCommand(&aos.shell, &moduleTestLedShellCmd);                     \
192 192
  aosShellAddCommand(&aos.shell, &moduleTestButtonShellCmd);                  \
193 193
  MODULE_INIT_TESTS_DW1000();                                                 \
......
228 228
 */
229 229
#define MODULE_SHUTDOWN_PERIPHERY_IF() {                                      \
230 230
  MODULE_SHUTDOWN_PERIPHERY_IF_DW1000();                                      \
231
  /* don't stop the serial driver so messages can still be printed */         \
231 232
}
232 233
#if (BOARD_DW1000_CONNECTED == true)
233 234
#define MODULE_SHUTDOWN_PERIPHERY_IF_DW1000() {                               \
......
242 243
/**
243 244
 * @brief   HOOK to toggle the LEDs when the user button is pressed.
244 245
 */
245
#define MODULE_MAIN_LOOP_IO_EVENT(eventflags) {                               \
246
  if (eventflags & MODULE_OS_IOEVENTFLAGS_USERBUTTON) {                       \
246
#define MODULE_MAIN_LOOP_GPIOEVENT(eventflags) {                              \
247
  if (eventflags & MODULE_OS_GPIOEVENTFLAG_USERBUTTON) {                      \
247 248
    apalControlGpioState_t buttonstate;                                       \
248 249
    apalControlGpioGet(&moduleGpioUserButton, &buttonstate);                  \
249 250
    apalControlGpioSet(&moduleGpioLed, buttonstate);                          \
250 251
  }                                                                           \
251
  MODULE_MAIN_LOOP_IO_EVENT_DW1000();                                         \
252
  MODULE_MAIN_LOOP_GPIOEVENT_DW1000();                                        \
252 253
}
253 254
#if (BOARD_DW1000_CONNECTED == true)
254 255
  /**
255 256
   * @brief   HOOK to call process_deca_irq() func when the dw1000 interrupt pin is activated.
256 257
   */
257
  #define MODULE_MAIN_LOOP_IO_EVENT_DW1000() {                                \
258
    if(eventflags & MODULE_OS_IOEVENTFLAGS_DW1000_IRQn) {                     \
258
  #define MODULE_MAIN_LOOP_GPIOEVENT_DW1000() {                               \
259
    if(eventflags & MODULE_GPOS_IOEVENTFLAG_DW1000_IRQn) {                    \
259 260
      /*apalGpioToggle(moduleGpioLed.gpio);*/ /* just for debug*/             \
260 261
      process_deca_irq();                                                     \
261 262
    }                                                                         \
262 263
  }
263 264
#else /* (BOARD_DW1000_CONNECTED == true) */
264
  #define MODULE_MAIN_LOOP_IO_EVENT_DW1000() {                                \
265
  #define MODULE_MAIN_LOOP_GPIOEVENT_DW1000() {                               \
265 266
  }
266 267
#endif /* (BOARD_DW1000_CONNECTED == true) */
267 268

  

Also available in: Unified diff