diff --git a/bsp/fm3/info.c b/bsp/fm3/info.c index e9a065b6defd834c071b9a52b216de611576d743..b0b9e56adcfef414647e5f3ad0a135040359f640 100644 --- a/bsp/fm3/info.c +++ b/bsp/fm3/info.c @@ -100,11 +100,13 @@ static rt_bool_t view_event_handler(struct rtgui_widget* widget, struct rtgui_ev char str[16]; struct rtgui_dc* dc; struct rtgui_rect rect; + struct rtgui_event_command* ecmd; + rt_uint8_t major,minor; dc = rtgui_dc_begin_drawing(widget); if (dc == RT_NULL) return RT_FALSE; - struct rtgui_event_command* ecmd = (struct rtgui_event_command*)event; + ecmd = (struct rtgui_event_command*)event; switch (ecmd->command_id) { case ADC_UPDATE: @@ -117,7 +119,6 @@ static rt_bool_t view_event_handler(struct rtgui_widget* widget, struct rtgui_ev rtgui_dc_draw_text(dc, str, &rect); break; case CPU_UPDATE: - rt_uint8_t major,minor; cpu_usage_get(&major, &minor); rect.x1 = 1; rect.y1 = 12; diff --git a/bsp/fm3/project.uvopt b/bsp/fm3/project.uvopt index 3d8d226134147c6f3ac87ba73e38b7c97268a20d..a646c4c838498e307ee464ad1120f1c093f49798 100644 --- a/bsp/fm3/project.uvopt +++ b/bsp/fm3/project.uvopt @@ -196,6 +196,90 @@ .\startup.c startup.c + + 1 + 0 + 1 + 0 + 0 + 0 + 0 + 4 + 4 + 0 + .\adc.c + adc.c + + + 1 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + .\cpuusage.c + cpuusage.c + + + 1 + 0 + 1 + 0 + 0 + 0 + 0 + 77 + 77 + 0 + .\info.c + info.c + + + 1 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + .\key.c + key.c + + + 1 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + .\lcd.c + lcd.c + + + 1 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + .\led.c + led.c + @@ -471,4 +555,809 @@ + + Rtgui + 0 + 0 + 0 + + 0 + 0 + 1 + 0 + 0 + 17 + 0 + 207 + 227 + 0 + ..\..\components\rtgui\common\asc12font.c + asc12font.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 272 + 272 + 0 + ..\..\components\rtgui\common\asc16font.c + asc16font.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\blit.c + blit.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\color.c + color.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\dc.c + dc.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\dc_buffer.c + dc_buffer.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\dc_client.c + dc_client.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\dc_hw.c + dc_hw.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\filerw.c + filerw.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\font.c + font.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\font_bmp.c + font_bmp.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\font_freetype.c + font_freetype.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\font_hz_bmp.c + font_hz_bmp.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\font_hz_file.c + font_hz_file.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\image.c + image.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\image_bmp.c + image_bmp.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\image_container.c + image_container.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\image_hdc.c + image_hdc.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\image_jpg.c + image_jpg.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\image_png.c + image_png.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\image_xpm.c + image_xpm.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\region.c + region.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\rtgui_object.c + rtgui_object.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\rtgui_system.c + rtgui_system.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\rtgui_theme.c + rtgui_theme.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\common\rtgui_xml.c + rtgui_xml.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\server\driver.c + driver.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\server\mouse.c + mouse.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\server\panel.c + panel.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\server\server.c + server.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\server\topwin.c + topwin.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\about_view.c + about_view.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\box.c + box.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\button.c + button.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\checkbox.c + checkbox.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\combobox.c + combobox.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\container.c + container.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\filelist_view.c + filelist_view.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\iconbox.c + iconbox.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\label.c + label.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\list_view.c + list_view.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\listbox.c + listbox.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\listctrl.c + listctrl.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\menu.c + menu.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\notebook.c + notebook.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\progressbar.c + progressbar.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\radiobox.c + radiobox.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\scrollbar.c + scrollbar.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\slider.c + slider.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\staticline.c + staticline.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\textbox.c + textbox.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\title.c + title.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\toplevel.c + toplevel.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\view.c + view.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\widget.c + widget.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\window.c + window.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\components\rtgui\widgets\workbench.c + workbench.c + + + diff --git a/bsp/fm3/project.uvproj b/bsp/fm3/project.uvproj index 93371269a17c6302feca85065a40c52d62466c84..15aa6b8f6e0c388f6286607eaea961360489b088 100644 --- a/bsp/fm3/project.uvproj +++ b/bsp/fm3/project.uvproj @@ -346,7 +346,7 @@ - .\CMSIS;.;..\..\libcpu\arm\fm3;..\..\include + .\CMSIS;.;..\..\libcpu\arm\fm3;..\..\include;..\..\components\rtgui\include @@ -401,6 +401,36 @@ 1 .\startup.c + + adc.c + 1 + .\adc.c + + + cpuusage.c + 1 + .\cpuusage.c + + + info.c + 1 + .\info.c + + + key.c + 1 + .\key.c + + + lcd.c + 1 + .\lcd.c + + + led.c + 1 + .\led.c + @@ -508,6 +538,296 @@ + + Rtgui + + + asc12font.c + 1 + ..\..\components\rtgui\common\asc12font.c + + + asc16font.c + 1 + ..\..\components\rtgui\common\asc16font.c + + + blit.c + 1 + ..\..\components\rtgui\common\blit.c + + + color.c + 1 + ..\..\components\rtgui\common\color.c + + + dc.c + 1 + ..\..\components\rtgui\common\dc.c + + + dc_buffer.c + 1 + ..\..\components\rtgui\common\dc_buffer.c + + + dc_client.c + 1 + ..\..\components\rtgui\common\dc_client.c + + + dc_hw.c + 1 + ..\..\components\rtgui\common\dc_hw.c + + + filerw.c + 1 + ..\..\components\rtgui\common\filerw.c + + + font.c + 1 + ..\..\components\rtgui\common\font.c + + + font_bmp.c + 1 + ..\..\components\rtgui\common\font_bmp.c + + + font_freetype.c + 1 + ..\..\components\rtgui\common\font_freetype.c + + + font_hz_bmp.c + 1 + ..\..\components\rtgui\common\font_hz_bmp.c + + + font_hz_file.c + 1 + ..\..\components\rtgui\common\font_hz_file.c + + + image.c + 1 + ..\..\components\rtgui\common\image.c + + + image_bmp.c + 1 + ..\..\components\rtgui\common\image_bmp.c + + + image_container.c + 1 + ..\..\components\rtgui\common\image_container.c + + + image_hdc.c + 1 + ..\..\components\rtgui\common\image_hdc.c + + + image_jpg.c + 1 + ..\..\components\rtgui\common\image_jpg.c + + + image_png.c + 1 + ..\..\components\rtgui\common\image_png.c + + + image_xpm.c + 1 + ..\..\components\rtgui\common\image_xpm.c + + + region.c + 1 + ..\..\components\rtgui\common\region.c + + + rtgui_object.c + 1 + ..\..\components\rtgui\common\rtgui_object.c + + + rtgui_system.c + 1 + ..\..\components\rtgui\common\rtgui_system.c + + + rtgui_theme.c + 1 + ..\..\components\rtgui\common\rtgui_theme.c + + + rtgui_xml.c + 1 + ..\..\components\rtgui\common\rtgui_xml.c + + + driver.c + 1 + ..\..\components\rtgui\server\driver.c + + + mouse.c + 1 + ..\..\components\rtgui\server\mouse.c + + + panel.c + 1 + ..\..\components\rtgui\server\panel.c + + + server.c + 1 + ..\..\components\rtgui\server\server.c + + + topwin.c + 1 + ..\..\components\rtgui\server\topwin.c + + + about_view.c + 1 + ..\..\components\rtgui\widgets\about_view.c + + + box.c + 1 + ..\..\components\rtgui\widgets\box.c + + + button.c + 1 + ..\..\components\rtgui\widgets\button.c + + + checkbox.c + 1 + ..\..\components\rtgui\widgets\checkbox.c + + + combobox.c + 1 + ..\..\components\rtgui\widgets\combobox.c + + + container.c + 1 + ..\..\components\rtgui\widgets\container.c + + + filelist_view.c + 1 + ..\..\components\rtgui\widgets\filelist_view.c + + + iconbox.c + 1 + ..\..\components\rtgui\widgets\iconbox.c + + + label.c + 1 + ..\..\components\rtgui\widgets\label.c + + + list_view.c + 1 + ..\..\components\rtgui\widgets\list_view.c + + + listbox.c + 1 + ..\..\components\rtgui\widgets\listbox.c + + + listctrl.c + 1 + ..\..\components\rtgui\widgets\listctrl.c + + + menu.c + 1 + ..\..\components\rtgui\widgets\menu.c + + + notebook.c + 1 + ..\..\components\rtgui\widgets\notebook.c + + + progressbar.c + 1 + ..\..\components\rtgui\widgets\progressbar.c + + + radiobox.c + 1 + ..\..\components\rtgui\widgets\radiobox.c + + + scrollbar.c + 1 + ..\..\components\rtgui\widgets\scrollbar.c + + + slider.c + 1 + ..\..\components\rtgui\widgets\slider.c + + + staticline.c + 1 + ..\..\components\rtgui\widgets\staticline.c + + + textbox.c + 1 + ..\..\components\rtgui\widgets\textbox.c + + + title.c + 1 + ..\..\components\rtgui\widgets\title.c + + + toplevel.c + 1 + ..\..\components\rtgui\widgets\toplevel.c + + + view.c + 1 + ..\..\components\rtgui\widgets\view.c + + + widget.c + 1 + ..\..\components\rtgui\widgets\widget.c + + + window.c + 1 + ..\..\components\rtgui\widgets\window.c + + + workbench.c + 1 + ..\..\components\rtgui\widgets\workbench.c + + +