Init nochmal verkürzt.

diff --git a/badge/main.c b/badge/main.c
index 77ce342..33c2a6b 100644 (file)
--- a/badge/main.c
+++ b/badge/main.c
@@ -87,76 +87,68 @@ void backlightInit(void) {
 }
 
 void rbInit() {
-    // TODO FIXME special port disable ? LEDs BTNs ?
-
-    // prepare power
-    // TODO FIXME more power init needed ? chrg + volt input ?
-    // enable external vcc
-    gpioSetDir(RB_PWR_GOOD, gpioDirection_Output);
-    gpioSetValue (RB_PWR_GOOD, 0);
-
-    // Disable USB Connect (we don't want USB by default)
-    gpioSetDir(USB_CONNECT, gpioDirection_Output);
-    gpioSetValue(USB_CONNECT, 1);
-
-    struct {
-      int port;
-      int pin;
-      uint32_t volatile *reg;
-    } const input_pins[] = {
-      { RB_BTN0, &RB_BTN0_IO },
-      { RB_BTN1, &RB_BTN1_IO },
-      { RB_BTN2, &RB_BTN2_IO },
-      { RB_BTN3, &RB_BTN3_IO },
-      { RB_BTN4, &RB_BTN4_IO },
-      { RB_HB3 , &RB_HB3_IO  },
-      { RB_HB4 , &RB_HB4_IO  },
-      { RB_PWR_CHRG, &RB_PWR_CHRG_IO }
-    };
+  struct {
+    int port;
+    int pin;
+    uint32_t volatile *reg;
+  } const input_pins[] = {
+    { RB_BTN0    , &RB_BTN0_IO     },
+    { RB_BTN1    , &RB_BTN1_IO     },
+    { RB_BTN2    , &RB_BTN2_IO     },
+    { RB_BTN3    , &RB_BTN3_IO     },
+    { RB_BTN4    , &RB_BTN4_IO     },
+    { RB_HB3     , &RB_HB3_IO      },
+    { RB_HB4     , &RB_HB4_IO      },
+    { RB_PWR_CHRG, &RB_PWR_CHRG_IO }
+  };
     
-    //    RB_HB3_IO = IOCON_PIO0_2_FUNC_GPIO | IOCON_PIO0_2_MODE_PULLUP | 0xc0;    
-
-    for(int i = 0; i < ARRAY_SIZE(input_pins); ++i) {
-        gpioSetDir(input_pins[i].port, input_pins[i].pin, gpioDirection_Input);
-        gpioSetPullup(input_pins[i].reg, gpioPullupMode_PullUp);
-    }
+  for(int i = 0; i < ARRAY_SIZE(input_pins); ++i) {
+    gpioSetDir(input_pins[i].port, input_pins[i].pin, gpioDirection_Input);
+    gpioSetPullup(input_pins[i].reg, gpioPullupMode_PullUp);
+  }
 
-    // LED3 zur Bestimmung der Umgebungshelligkeit.
-    gpioSetDir(RB_LED3, gpioDirection_Input);
-    RB_LED3_IO = (RB_LED3_IO & IOCON_PIO1_11_FUNC_MASK) | IOCON_PIO1_11_FUNC_AD7;
-
-    // prepare LEDs
-    IOCON_JTAG_TDI_PIO0_11 &= ~IOCON_JTAG_TDI_PIO0_11_FUNC_MASK;
-    IOCON_JTAG_TDI_PIO0_11 |=  IOCON_JTAG_TDI_PIO0_11_FUNC_GPIO;
-
-    struct {
-      int port;
-      int pin;
-      int value;
-    } const output_pins[] = {
-      { RB_LED0   , 0 },
-      { RB_LED1   , 0 },
-      { RB_LED2   , 0 },
-      { RB_SPI_SS2, 1 },
-      { RB_SPI_SS3, 1 },
-      { RB_SPI_SS4, 1 },
-      { RB_SPI_SS5, 1 },
-      { RB_LCD_BL , 0 }
-    };
-
-    for(int i = 0; i < ARRAY_SIZE(output_pins); ++i) {
-        gpioSetDir  (output_pins[i].port, output_pins[i].pin, gpioDirection_Output);
-        gpioSetValue(output_pins[i].port, output_pins[i].pin, output_pins[i].value);
-    }
+  // LED3 zur Bestimmung der Umgebungshelligkeit.
+  gpioSetDir(RB_LED3, gpioDirection_Input);
+  RB_LED3_IO = (RB_LED3_IO & IOCON_PIO1_11_FUNC_MASK) | IOCON_PIO1_11_FUNC_AD7;
+
+  // prepare LEDs
+  IOCON_JTAG_TDI_PIO0_11 &= ~IOCON_JTAG_TDI_PIO0_11_FUNC_MASK;
+  IOCON_JTAG_TDI_PIO0_11 |=  IOCON_JTAG_TDI_PIO0_11_FUNC_GPIO;
+
+  struct {
+    int port;
+    int pin;
+    int value;
+  } const output_pins[] = {
+    { RB_PWR_GOOD, 0 },
+    { USB_CONNECT, 1 },
+    { RB_LED0    , 0 },
+    { RB_LED1    , 0 },
+    { RB_LED2    , 0 },
+    { RB_SPI_SS2 , 1 },
+    { RB_SPI_SS3 , 1 },
+    { RB_SPI_SS4 , 1 },
+    { RB_SPI_SS5 , 1 },
+    { RB_LCD_BL  , 0 },
+    { RB_HB0     , 1 },
+    { RB_HB1     , 1 },
+    { RB_HB2     , 1 },
+    { RB_HB5     , 1 }
+  };
+
+  for(int i = 0; i < ARRAY_SIZE(output_pins); ++i) {
+    gpioSetDir  (output_pins[i].port, output_pins[i].pin, gpioDirection_Output);
+    gpioSetValue(output_pins[i].port, output_pins[i].pin, output_pins[i].value);
+  }
 
-    // Set P0.0 to GPIO
-    RB_PWR_LCDBL_IO &= ~RB_PWR_LCDBL_IO_FUNC_MASK;
-    RB_PWR_LCDBL_IO |=  RB_PWR_LCDBL_IO_FUNC_GPIO;
+  // Set P0.0 to GPIO
+  RB_PWR_LCDBL_IO &= ~RB_PWR_LCDBL_IO_FUNC_MASK;
+  RB_PWR_LCDBL_IO |=  RB_PWR_LCDBL_IO_FUNC_GPIO;
 
-    gpioSetDir   ( RB_PWR_LCDBL   , gpioDirection_Input);
-    gpioSetPullup(&RB_PWR_LCDBL_IO, gpioPullupMode_Inactive);
+  gpioSetDir   ( RB_PWR_LCDBL   , gpioDirection_Input);
+  gpioSetPullup(&RB_PWR_LCDBL_IO, gpioPullupMode_Inactive);
 
-    backlightInit();
+  backlightInit();
 }