aaron/discoverpixy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_aaron' into emulator

Browse Source
This commit is contained in:
t-moe
2015-06-01 22:16:00 +02:00
parent 06227dadad caa7b5c50f
commit 3b95affd93
8 changed files with 277 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/app/app.c
View File

@@ -14,7 +14,6 @@ void app_init() {
gui_screen_navigate(get_screen_main());
}
//app event loop
void app_process() {

4
common/app/screen_guitest.c
View File

@@ -104,14 +104,14 @@ static void enter(void* screen) {
n_updown.max=11;
n_updown.min =-5;
n_updown.callback=n_updown_cb;
gui_numupdown_add(&n_updown);
//gui_numupdown_add(&n_updown);
}
static void leave(void* screen) {
gui_button_remove(&b_back);
gui_checkbox_remove(&c_cbox);
gui_numupdown_remove(&n_updown);
//gui_numupdown_remove(&n_updown);
touch_unregister_area(&a_area);
}

2
common/app/screen_main.c
View File

@@ -77,7 +77,7 @@ static void enter(void* screen) {
b_ref_tracking.txtcolor=WHITE;
b_ref_tracking.bgcolor=HEX(0xFF2151);
b_ref_tracking.font=0;
b_ref_tracking.text="Reference Tracking";
b_ref_tracking.text="Ref Tracking";
b_ref_tracking.callback=b_ref_tracking_cb;
gui_button_add(&b_ref_tracking);

4
common/app/screen_pixytest.c
View File

@@ -264,7 +264,7 @@ static void enter(void* screen) {
n_led_powerlimit.max=40;
n_led_powerlimit.min =0;
n_led_powerlimit.callback=n_led_powerlimit_cb;
gui_numupdown_add(&n_led_powerlimit);
//gui_numupdown_add(&n_led_powerlimit);
@@ -283,7 +283,7 @@ static void leave(void* screen) {
gui_button_remove(&b_led_red);
gui_button_remove(&b_led_green);
gui_button_remove(&b_led_blue);
gui_numupdown_remove(&n_led_powerlimit);
//gui_numupdown_remove(&n_led_powerlimit);
}