add more UI files into radio.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@151 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
parent
852f73f7a0
commit
eb24e9da00
|
@ -46,44 +46,6 @@
|
|||
#include <rtgui/rtgui_system.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
key_enter PA0
|
||||
key_down PA1
|
||||
key_up PA2
|
||||
key_right PC2
|
||||
key_left PC3
|
||||
*/
|
||||
#define key_enter_GETVALUE() GPIO_ReadInputDataBit(GPIOA,GPIO_Pin_0)
|
||||
#define key_down_GETVALUE() GPIO_ReadInputDataBit(GPIOA,GPIO_Pin_1)
|
||||
#define key_up_GETVALUE() GPIO_ReadInputDataBit(GPIOA,GPIO_Pin_2)
|
||||
#define key_right_GETVALUE() GPIO_ReadInputDataBit(GPIOC,GPIO_Pin_2)
|
||||
#define key_left_GETVALUE() GPIO_ReadInputDataBit(GPIOC,GPIO_Pin_3)
|
||||
|
||||
void rt_key_entry(void *parameter)
|
||||
{
|
||||
GPIO_InitTypeDef GPIO_InitStructure;
|
||||
|
||||
RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOA | RCC_APB2Periph_GPIOC,ENABLE);
|
||||
|
||||
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU;
|
||||
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
|
||||
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2;
|
||||
GPIO_Init(GPIOA,&GPIO_InitStructure);
|
||||
|
||||
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_2 | GPIO_Pin_3;
|
||||
GPIO_Init(GPIOC,&GPIO_InitStructure);
|
||||
|
||||
while (1)
|
||||
{
|
||||
if ( key_enter_GETVALUE() == 0 )rt_kprintf("key_enter\r\n");
|
||||
if ( key_down_GETVALUE() == 0 )rt_kprintf("key_down\r\n");
|
||||
if ( key_up_GETVALUE() == 0 )rt_kprintf("key_up\r\n");
|
||||
if ( key_right_GETVALUE() == 0 )rt_kprintf("key_right\r\n");
|
||||
if ( key_left_GETVALUE() == 0 )rt_kprintf("key_left\r\n");
|
||||
rt_thread_delay(20);
|
||||
}
|
||||
}
|
||||
|
||||
/* thread phase init */
|
||||
void rt_init_thread_entry(void *parameter)
|
||||
{
|
||||
|
@ -153,6 +115,9 @@ void rt_init_thread_entry(void *parameter)
|
|||
rtgui_panel_register("main", &rect);
|
||||
|
||||
rt_hw_lcd_init();
|
||||
|
||||
info_init();
|
||||
today_init();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
@ -174,14 +139,8 @@ int rt_application_init()
|
|||
#endif
|
||||
if (init_thread != RT_NULL) rt_thread_startup(init_thread);
|
||||
|
||||
/* create keypad thread */
|
||||
{
|
||||
rt_thread_t key_tid;
|
||||
key_tid = rt_thread_create("key",
|
||||
rt_key_entry, RT_NULL,
|
||||
512, 30, 5);
|
||||
if (key_tid != RT_NULL) rt_thread_startup(key_tid);
|
||||
}
|
||||
rt_hw_key_init();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -138,7 +138,7 @@ void rt_hw_timer_handler(void)
|
|||
/**
|
||||
* This function will initial STM32 Radio board.
|
||||
*/
|
||||
extern void FSMC_SRAM_Init(void);
|
||||
extern void FSMC_SRAM_Init(void);
|
||||
void rt_hw_board_init()
|
||||
{
|
||||
NAND_IDTypeDef NAND_ID;
|
||||
|
|
|
@ -182,8 +182,8 @@ static void rtgui_demo_workbench_entry(void* parameter)
|
|||
struct rtgui_box *box = rtgui_box_create(RTGUI_VERTICAL, &rtgui_empty_rect);
|
||||
struct rtgui_box *hbox = rtgui_box_create(RTGUI_HORIZONTAL, &rtgui_empty_rect);
|
||||
struct rtgui_button* button = rtgui_button_create("OK");
|
||||
struct rtgui_textbox *textbox = rtgui_textbox_create("긍서움");
|
||||
struct rtgui_iconbox *iconbox = rtgui_iconbox_create(image, "暠깃",
|
||||
struct rtgui_textbox *textbox = rtgui_textbox_create("text edit box");
|
||||
struct rtgui_iconbox *iconbox = rtgui_iconbox_create(image, "icon",
|
||||
RTGUI_ICONBOX_TEXT_RIGHT);
|
||||
|
||||
RTGUI_WIDGET_BACKGROUND(RTGUI_WIDGET(view)) = RTGUI_RGB(255, 255, 224);
|
||||
|
|
|
@ -40,7 +40,7 @@ void rt_hw_lcd_set_pixel(rtgui_color_t *c, rt_base_t x, rt_base_t y)
|
|||
unsigned short p;
|
||||
|
||||
/* get color pixel */
|
||||
p = rtgui_color_to_565(*c);
|
||||
p = rtgui_color_to_565p(*c);
|
||||
|
||||
/* set X point */
|
||||
LCD_ADDR = 0x02;
|
||||
|
@ -57,6 +57,8 @@ void rt_hw_lcd_set_pixel(rtgui_color_t *c, rt_base_t x, rt_base_t y)
|
|||
|
||||
void rt_hw_lcd_get_pixel(rtgui_color_t *c, rt_base_t x, rt_base_t y)
|
||||
{
|
||||
unsigned short p;
|
||||
|
||||
/* set X point */
|
||||
LCD_ADDR = 0x02;
|
||||
LCD_DATA = x;
|
||||
|
@ -67,7 +69,9 @@ void rt_hw_lcd_get_pixel(rtgui_color_t *c, rt_base_t x, rt_base_t y)
|
|||
|
||||
/* read pixel */
|
||||
LCD_ADDR = 0x0F;
|
||||
LCD_DATA16_READ(*c);
|
||||
LCD_DATA16_READ(p);
|
||||
|
||||
*c = rtgui_color_from_565p(p);
|
||||
}
|
||||
|
||||
void rt_hw_lcd_draw_hline(rtgui_color_t *c, rt_base_t x1, rt_base_t x2, rt_base_t y)
|
||||
|
|
Loading…
Reference in New Issue