Ahmad Kobeissi
/
Controllify
Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: X_NUCLEO_IKS01A1 mbed
Fork of
Sensors_Reader_JACKLENZ
by 
Giacomo Lanza
Revision 3:c35414b03a65, committed 2015-04-20
- Comitter:
- Wolfgang Betz
- Date:
- Mon Apr 20 11:42:38 2015 +0200
- Parent:
- 2:00f62b148a07
- Child:
- 4:81037ace7f27
- Commit message:
- Make X_NUCLEO_IKS01A1 compatible with all Arduino base boards
Changed in this revision
| main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/main.cpp Thu Apr 16 10:38:54 2015 +0200
+++ b/main.cpp Mon Apr 20 11:42:38 2015 +0200
@@ -66,12 +66,6 @@
/*** Macros ------------------------------------------------------------------- ***/
#define APP_LOOP_PERIOD 1300 // in ms
-#if defined(TARGET_K64F)
-#define USER_BUTTON (SW2)
-#elif defined(TARGET_LPC11U68)
-#define USER_BUTTON (P0_16)
-#endif // !TARGET_MCU_K64F
-
/*** Typedefs ----------------------------------------------------------------- ***/
typedef struct {
@@ -89,13 +83,8 @@
#endif // DBG_MCU
static X_NUCLEO_IKS01A1 *mems_expansion_board = X_NUCLEO_IKS01A1::Instance();
-
static Ticker ticker;
-static InterruptIn button(USER_BUTTON);
-
static volatile bool timer_irq_triggered = false;
-static volatile bool button_irq_triggered = false;
-
static DigitalOut myled(LED1);
/*** Helper Functions (1/2) ------------------------------------------------------------ ***/
@@ -107,23 +96,8 @@
timer_irq_triggered = true;
}
-/* Called in interrupt context, therefore just set a trigger variable */
-static void button_irq(void) {
- button_irq_triggered = true;
- button.disable_irq();
-}
-
/*** Interrupt Handler Bottom-Halves ------------------------------------------------- ***/
-/* Handle button irq
- (here we are in "normal" context, i.e. not in IRQ context)
-*/
-static void handle_button_irq(void) {
- /* TODO */
-
- /* Re-enable button irq */
- button.enable_irq();
-}
/*** Helper Functions (2/2) ------------------------------------------------------------ ***/
@@ -145,10 +119,6 @@
static void init(void) {
uint8_t hts221_id;
- /* Set mode & irq handler for button */
- button.mode(PullNone);
- button.fall(button_irq);
-
/* Determine ID of Humidity & Tempreture Sensor */
mems_expansion_board->ht_sensor.ReadID(&hts221_id);
printf("HTS221_ID = 0x%x (%u)\n", hts221_id, hts221_id);
@@ -214,10 +184,6 @@
timer_irq_triggered = false;
__enable_irq();
main_cycle();
- } else if(button_irq_triggered) {
- button_irq_triggered = false;
- __enable_irq();
- handle_button_irq();
} else {
__WFI();
__enable_irq(); /* do NOT enable irqs before WFI to avoid