X-Git-Url: https://git.rohieb.name/hackover2013-badge-firmware.git/blobdiff_plain/a3e5d2958a9a1357e5943c36b7dbaad97cdcc7bb..d265161cb9c1651b365e447a654c6eabe6b5470d:/badge/main.c diff --git a/badge/main.c b/badge/main.c index 69402f0..25a4356 100644 --- a/badge/main.c +++ b/badge/main.c @@ -45,6 +45,7 @@ #include "core/pmu/pmu.h" #include "core/wdt/wdt.h" #include "core/gpio/gpio.h" +#include "core/ssp/ssp.h" #include "core/systick/systick.h" #include "core/usbhid-rom/usbmsc.h" @@ -52,41 +53,31 @@ #include "core/cmd/cmd.h" #endif +#include "init.h" #include "ui/display.h" #include "ui/sprite.h" #include "ui/event.h" +#include "ui/font.h" +#include "util/util.h" #include "jumpnrun/jumpnrun.h" -#include "r0ketports.h" -#include "drivers/fatfs/ff.h" - -#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof*(arr)) - -void backlightInit(void) { -#if HW_IS_PROTOTYPE - // prototype uses WDT CLKOUT to drive the LCD backlight - // init without a reset - wdtInit(false); +#include "dataflash/at45db041d.h" - // use the WDT clock as the default WDT frequency is best frequency - // XXX this register value is missing in lpc1343.h -#define SCB_CLKOUTCLKSEL_SOURCE_WDTCLOCK ((unsigned int) 0x00000002) // Use the WDT clock +#include "drivers/fatfs/ff.h" - SCB_CLKOUTCLKSEL = SCB_CLKOUTCLKSEL_SOURCE_WDTCLOCK; +#include "badge/pinconfig.h" +#include - // toggle from LOW to HIGH to update source - SCB_CLKOUTCLKUEN = SCB_CLKOUTCLKUEN_DISABLE; - SCB_CLKOUTCLKUEN = SCB_CLKOUTCLKUEN_UPDATE; +#ifdef R0KET - // divide by 30, to get almost 10 kHz - SCB_CLKOUTCLKDIV = 30; -#else +#include "r0ketports.h" +void rbBacklightInit(void) { /* Enable the clock for CT16B1 */ SCB_SYSAHBCLKCTRL |= (SCB_SYSAHBCLKCTRL_CT16B1); /* Configure PIO1.9 as Timer1_16 MAT0 Output */ IOCON_PIO1_9 &= ~IOCON_PIO1_9_FUNC_MASK; - IOCON_PIO1_9 |= IOCON_PIO1_9_FUNC_CT16B1_MAT0; + IOCON_PIO1_9 |= IOCON_PIO1_9_FUNC_CT16B1_MAT0; /* Set default duty cycle (MR1) */ TMR_TMR16B1MR0 = 0; //(0xFFFF * (100 - brightness)) / 100; @@ -103,49 +94,46 @@ void backlightInit(void) { // Enable Step-UP gpioSetDir(RB_PWR_LCDBL, gpioDirection_Output); gpioSetValue(RB_PWR_LCDBL, 0); -#endif } void rbInit() { -#if !HW_IS_PROTOTYPE RB_HB0_IO &= ~IOCON_SWDIO_PIO1_3_FUNC_MASK; RB_HB0_IO |= IOCON_SWDIO_PIO1_3_FUNC_GPIO; RB_HB1_IO &= ~IOCON_JTAG_TCK_PIO0_10_FUNC_MASK; RB_HB1_IO |= IOCON_JTAG_TCK_PIO0_10_FUNC_GPIO; -#endif struct { int port; int pin; uint32_t volatile *reg; + gpioPullupMode_t mode; } 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 }, -#if HW_IS_PROTOTYPE - { RB_BTN_A , &RB_BTN_A_IO }, - { RB_BTN_B , &RB_BTN_B_IO }, +#ifdef HOB_REV2 + { RB_BTN0 , &RB_BTN0_IO , gpioPullupMode_PullDown }, + { RB_BTN1 , &RB_BTN1_IO , gpioPullupMode_PullDown }, + { RB_BTN2 , &RB_BTN2_IO , gpioPullupMode_PullDown }, + { RB_BTN3 , &RB_BTN3_IO , gpioPullupMode_PullDown }, + { RB_BTN4 , &RB_BTN4_IO , gpioPullupMode_PullDown }, + { RB_HB0 , &RB_HB0_IO , gpioPullupMode_PullDown }, + { RB_HB1 , &RB_HB1_IO , gpioPullupMode_PullDown }, + { RB_PWR_CHRG, &RB_PWR_CHRG_IO, gpioPullupMode_PullDown } #else - { RB_HB0 , &RB_HB0_IO }, - { RB_HB1 , &RB_HB1_IO }, - { RB_PWR_CHRG, &RB_PWR_CHRG_IO } + { RB_BTN0 , &RB_BTN0_IO , gpioPullupMode_PullUp }, + { RB_BTN1 , &RB_BTN1_IO , gpioPullupMode_PullUp }, + { RB_BTN2 , &RB_BTN2_IO , gpioPullupMode_PullUp }, + { RB_BTN3 , &RB_BTN3_IO , gpioPullupMode_PullUp }, + { RB_BTN4 , &RB_BTN4_IO , gpioPullupMode_PullUp }, + { RB_HB0 , &RB_HB0_IO , gpioPullupMode_PullUp }, + { RB_HB1 , &RB_HB1_IO , gpioPullupMode_PullUp }, + { RB_PWR_CHRG, &RB_PWR_CHRG_IO, gpioPullupMode_PullUp } #endif }; - + 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); + gpioSetPullup(input_pins[i].reg, input_pins[i].mode); } -#if HW_IS_PROTOTYPE - IOCON_PIO0_1 &= ~(IOCON_PIO0_1_FUNC_MASK); - IOCON_PIO0_1 |= IOCON_PIO0_1_FUNC_CLKOUT; - - IOCON_JTAG_TMS_PIO1_0 &= ~(IOCON_JTAG_TMS_PIO1_0_FUNC_MASK); - IOCON_JTAG_TMS_PIO1_0 |= IOCON_JTAG_TMS_PIO1_0_FUNC_GPIO; -#else // 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; @@ -153,21 +141,20 @@ void rbInit() { // 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; -#endif struct { int port; int pin; int value; } const output_pins[] = { - { RB_PWR_GOOD, 0 }, - { USB_CONNECT, 1 }, + { RB_PWR_GOOD , 0 }, + { USB_CONNECT , 1 }, + { RB_LCD_CS , 1 }, + { RB_SPI_CS_DF, 1 }, { RB_SPI_SS2 , 1 }, { RB_SPI_SS3 , 1 }, { RB_SPI_SS4 , 1 }, { RB_SPI_SS5 , 1 }, - { RB_LCD_CS , 1 }, -#if !HW_IS_PROTOTYPE { RB_LED0 , 0 }, { RB_LED1 , 0 }, { RB_LED2 , 0 }, @@ -176,7 +163,6 @@ void rbInit() { { RB_HB3 , 1 }, { RB_HB4 , 1 }, { RB_HB5 , 1 } -#endif }; for(int i = 0; i < ARRAY_SIZE(output_pins); ++i) { @@ -184,18 +170,18 @@ void rbInit() { gpioSetValue(output_pins[i].port, output_pins[i].pin, output_pins[i].value); } -#if !HW_IS_PROTOTYPE // 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); -#endif - backlightInit(); + rbBacklightInit(); + badge_display_init(); } +#endif /**************************************************************************/ /*! @@ -213,47 +199,48 @@ int main(void) // pmuInit(); // adcInit(); +#ifdef R0KET rbInit(); +#else + badge_init(); +#endif - // usbMSCInit(); + /* + nrf_init(); - badge_display_init(); + for(uint8_t i = 1; ; ++i) { + badge_framebuffer fb = { { { 0 } } }; - gpioSetDir(0, 11, gpioDirection_Output); - gpioSetValue(0, 11, 0); + fb.data[2][86] = 0xff; + fb.data[3][87] = nrf_read_reg(R_CONFIG); + fb.data[4][86] = 0xff; + for(uint8_t j = 0; j < i; j += 3) { + fb.data[3][j / 3] = 0xff; + } + + SCB_CLKOUTCLKDIV = i; + badge_framebuffer_flush(&fb); + systickDelay(200); + } + */ + + FATFS fs; + f_mount(0, &fs); { - badge_framebuffer fb; - int res = 0; - FATFS fatvol; - - if(FR_OK == f_mount(0, &fatvol)) { - FIL fil; - if(FR_OK == (res = f_open(&fil, "sshot.dat", FA_OPEN_EXISTING | FA_READ))) { - UINT readbytes; - - if(FR_OK != f_read(&fil, &fb, sizeof(fb), &readbytes)) { - gpioSetDir(RB_LED3, gpioDirection_Output); - gpioSetValue(RB_LED3, 1); - } - - f_close(&fil); - } else { - fb.data[0][0] = res; - gpioSetDir(RB_LED1, gpioDirection_Output); - gpioSetValue(RB_LED1, 1); - } - } else { - gpioSetDir(RB_LED2, gpioDirection_Output); - gpioSetValue(RB_LED2, 1); - } + badge_framebuffer fb = { { { 0 } } }; + + fb.data[0][0] = badge_framebuffer_render_text(&fb, 2, 10, "foobar"); + fb.data[0][1] = badge_framebuffer_render_number(&fb, 10, 18, 99); badge_framebuffer_flush(&fb); } - for(;;); + if(badge_input_raw() & BADGE_EVENT_KEY_DOWN) { + usbMSCInit(); + for(;;); + } - /* badge_event_start(); for(;;) { @@ -262,7 +249,6 @@ int main(void) } } -/* uint8_t buttons = 0; for(uint8_t i = 0; ; ++i) { @@ -275,7 +261,7 @@ int main(void) } case BADGE_EVENT_GAME_TICK: { badge_sprite const sp = { 4, 4, (uint8_t const *) "\xff\xff" }; - badge_framebuffer fb = { { { 0 } } }; + badge_framebuffer fb = { { { 0x80 } } }; if(buttons & BADGE_EVENT_KEY_UP) { badge_framebuffer_blt(&fb, 30, 10, &sp, 0); } if(buttons & BADGE_EVENT_KEY_DOWN) { badge_framebuffer_blt(&fb, 30, 50, &sp, 0); } @@ -290,7 +276,6 @@ int main(void) } } } -*/ return 0; }