len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify controls in order to resolve impossible combos on several targets. Now uses a similar system as bounce: use left/right (or equivalent) to select the axis to adjust, and up/down (or the equivalent) to change speed/angle. * Show angle instead of speed in angle adjust mode (i.e. pause). * Better event handling when paused (button_get_w_tmo()). * Includes touchscreen fixup.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_0@18595 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2008-09-23 20:13:22 +00:00
parent 620d48469d
commit afdc728ef2
1 changed files with 168 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

441
apps/plugins/cube.c
View file

@ -34,50 +34,41 @@ PLUGIN_HEADER
/* variable button definitions */ /* variable button definitions */
#if CONFIG_KEYPAD == RECORDER_PAD #if CONFIG_KEYPAD == RECORDER_PAD
#define CUBE_QUIT BUTTON_OFF #define CUBE_QUIT BUTTON_OFF
#define CUBE_X_INC BUTTON_RIGHT #define CUBE_NEXT BUTTON_RIGHT
#define CUBE_X_DEC BUTTON_LEFT #define CUBE_PREV BUTTON_LEFT
#define CUBE_Y_INC BUTTON_UP #define CUBE_INC BUTTON_UP
#define CUBE_Y_DEC BUTTON_DOWN #define CUBE_DEC BUTTON_DOWN
#define CUBE_Z_INC BUTTON_F2 #define CUBE_MODE BUTTON_F1
#define CUBE_Z_DEC BUTTON_F1
#define CUBE_MODE BUTTON_F3
#define CUBE_PAUSE BUTTON_PLAY #define CUBE_PAUSE BUTTON_PLAY
#define CUBE_HIGHSPEED BUTTON_ON #define CUBE_HIGHSPEED BUTTON_ON
#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
#define CUBE_QUIT BUTTON_OFF #define CUBE_QUIT BUTTON_OFF
#define CUBE_X_INC BUTTON_RIGHT #define CUBE_NEXT BUTTON_RIGHT
#define CUBE_X_DEC BUTTON_LEFT #define CUBE_PREV BUTTON_LEFT
#define CUBE_Y_INC BUTTON_UP #define CUBE_INC BUTTON_UP
#define CUBE_Y_DEC BUTTON_DOWN #define CUBE_DEC BUTTON_DOWN
#define CUBE_Z_INC BUTTON_F2 #define CUBE_MODE BUTTON_F1
#define CUBE_Z_DEC BUTTON_F1
#define CUBE_MODE BUTTON_F3
#define CUBE_PAUSE BUTTON_SELECT #define CUBE_PAUSE BUTTON_SELECT
#define CUBE_HIGHSPEED BUTTON_ON #define CUBE_HIGHSPEED BUTTON_ON
#elif CONFIG_KEYPAD == PLAYER_PAD #elif CONFIG_KEYPAD == PLAYER_PAD
#define CUBE_QUIT BUTTON_STOP #define CUBE_QUIT BUTTON_STOP
#define CUBE_X_INC BUTTON_RIGHT #define CUBE_INC BUTTON_RIGHT
#define CUBE_X_DEC BUTTON_LEFT #define CUBE_DEC BUTTON_LEFT
#define CUBE_Y_INC (BUTTON_ON | BUTTON_RIGHT) #define CUBE_NEXT (BUTTON_ON | BUTTON_RIGHT)
#define CUBE_Y_DEC (BUTTON_ON | BUTTON_LEFT) #define CUBE_PREV (BUTTON_ON | BUTTON_LEFT)
#define CUBE_Z_INC (BUTTON_MENU | BUTTON_RIGHT) #define CUBE_MODE BUTTON_MENU
#define CUBE_Z_DEC (BUTTON_MENU | BUTTON_LEFT)
#define CUBE_MODE_PRE BUTTON_MENU
#define CUBE_MODE (BUTTON_MENU | BUTTON_REL)
#define CUBE_PAUSE BUTTON_PLAY #define CUBE_PAUSE BUTTON_PLAY
#define CUBE_HIGHSPEED_PRE BUTTON_ON #define CUBE_HIGHSPEED_PRE BUTTON_ON
#define CUBE_HIGHSPEED (BUTTON_ON | BUTTON_REL) #define CUBE_HIGHSPEED (BUTTON_ON | BUTTON_REL)
#elif CONFIG_KEYPAD == ONDIO_PAD #elif CONFIG_KEYPAD == ONDIO_PAD
#define CUBE_QUIT BUTTON_OFF #define CUBE_QUIT BUTTON_OFF
#define CUBE_X_INC BUTTON_RIGHT #define CUBE_NEXT BUTTON_RIGHT
#define CUBE_X_DEC BUTTON_LEFT #define CUBE_PREV BUTTON_LEFT
#define CUBE_Y_INC BUTTON_UP #define CUBE_INC BUTTON_UP
#define CUBE_Y_DEC BUTTON_DOWN #define CUBE_DEC BUTTON_DOWN
#define CUBE_Z_INC (BUTTON_MENU | BUTTON_UP)
#define CUBE_Z_DEC (BUTTON_MENU | BUTTON_DOWN)
#define CUBE_MODE_PRE BUTTON_MENU #define CUBE_MODE_PRE BUTTON_MENU
#define CUBE_MODE (BUTTON_MENU | BUTTON_REL) #define CUBE_MODE (BUTTON_MENU | BUTTON_REL)
#define CUBE_PAUSE (BUTTON_MENU | BUTTON_LEFT) #define CUBE_PAUSE (BUTTON_MENU | BUTTON_LEFT)
@ -86,15 +77,12 @@ PLUGIN_HEADER
#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
(CONFIG_KEYPAD == IRIVER_H300_PAD) (CONFIG_KEYPAD == IRIVER_H300_PAD)
#define CUBE_QUIT BUTTON_OFF #define CUBE_QUIT BUTTON_OFF
#define CUBE_X_INC BUTTON_RIGHT #define CUBE_NEXT BUTTON_RIGHT
#define CUBE_X_DEC BUTTON_LEFT #define CUBE_PREV BUTTON_LEFT
#define CUBE_Y_INC BUTTON_UP #define CUBE_INC BUTTON_UP
#define CUBE_Y_DEC BUTTON_DOWN #define CUBE_DEC BUTTON_DOWN
#define CUBE_Z_INC (BUTTON_ON | BUTTON_UP)
#define CUBE_Z_DEC (BUTTON_ON | BUTTON_DOWN)
#define CUBE_MODE BUTTON_MODE #define CUBE_MODE BUTTON_MODE
#define CUBE_PAUSE_PRE BUTTON_ON #define CUBE_PAUSE BUTTON_ON
#define CUBE_PAUSE (BUTTON_ON | BUTTON_REL)
#define CUBE_HIGHSPEED BUTTON_SELECT #define CUBE_HIGHSPEED BUTTON_SELECT
#define CUBE_RC_QUIT BUTTON_RC_STOP #define CUBE_RC_QUIT BUTTON_RC_STOP
@ -102,143 +90,114 @@ PLUGIN_HEADER
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \
(CONFIG_KEYPAD == IPOD_3G_PAD) || \ (CONFIG_KEYPAD == IPOD_3G_PAD) || \
(CONFIG_KEYPAD == IPOD_1G2G_PAD) (CONFIG_KEYPAD == IPOD_1G2G_PAD)
#define CUBE_QUIT BUTTON_MENU #define CUBE_QUIT (BUTTON_SELECT | BUTTON_MENU)
#define CUBE_X_INC BUTTON_RIGHT #define CUBE_NEXT BUTTON_RIGHT
#define CUBE_X_DEC BUTTON_LEFT #define CUBE_PREV BUTTON_LEFT
#define CUBE_Y_INC BUTTON_SCROLL_FWD #define CUBE_INC BUTTON_SCROLL_FWD
#define CUBE_Y_DEC BUTTON_SCROLL_BACK #define CUBE_DEC BUTTON_SCROLL_BACK
#define CUBE_Z_INC (BUTTON_SELECT | BUTTON_RIGHT) #define CUBE_MODE BUTTON_MENU
#define CUBE_Z_DEC (BUTTON_SELECT | BUTTON_LEFT) #define CUBE_PAUSE BUTTON_PLAY
#define CUBE_MODE (BUTTON_SELECT | BUTTON_MENU) #define CUBE_HIGHSPEED_PRE BUTTON_SELECT
#define CUBE_PAUSE_PRE BUTTON_PLAY #define CUBE_HIGHSPEED (BUTTON_SELECT | BUTTON_REL)
#define CUBE_PAUSE (BUTTON_PLAY | BUTTON_REL)
#define CUBE_HIGHSPEED (BUTTON_SELECT | BUTTON_PLAY)
#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
#define CUBE_QUIT BUTTON_PLAY #define CUBE_QUIT BUTTON_PLAY
#define CUBE_X_INC BUTTON_RIGHT #define CUBE_NEXT BUTTON_RIGHT
#define CUBE_X_DEC BUTTON_LEFT #define CUBE_PREV BUTTON_LEFT
#define CUBE_Y_INC BUTTON_UP #define CUBE_INC BUTTON_UP
#define CUBE_Y_DEC BUTTON_DOWN #define CUBE_DEC BUTTON_DOWN
#define CUBE_Z_INC BUTTON_MODE #define CUBE_MODE BUTTON_MODE
#define CUBE_Z_DEC BUTTON_EQ #define CUBE_PAUSE BUTTON_SELECT
#define CUBE_MODE (BUTTON_SELECT | BUTTON_REPEAT) #define CUBE_HIGHSPEED BUTTON_EQ
#define CUBE_PAUSE (BUTTON_SELECT | BUTTON_REL)
#define CUBE_HIGHSPEED (BUTTON_MODE | BUTTON_EQ) /* TODO: this is impossible */
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define CUBE_QUIT BUTTON_POWER #define CUBE_QUIT BUTTON_POWER
#define CUBE_X_INC BUTTON_LEFT #define CUBE_NEXT BUTTON_RIGHT
#define CUBE_X_DEC BUTTON_RIGHT #define CUBE_PREV BUTTON_LEFT
#define CUBE_Y_INC BUTTON_UP #define CUBE_INC BUTTON_UP
#define CUBE_Y_DEC BUTTON_DOWN #define CUBE_DEC BUTTON_DOWN
#define CUBE_Z_INC (BUTTON_PLAY | BUTTON_UP) #define CUBE_MODE BUTTON_REC
#define CUBE_Z_DEC (BUTTON_PLAY | BUTTON_DOWN) #define CUBE_PAUSE BUTTON_PLAY
#define CUBE_MODE BUTTON_SELECT #define CUBE_HIGHSPEED BUTTON_SELECT
#define CUBE_PAUSE_PRE BUTTON_PLAY
#define CUBE_PAUSE (BUTTON_PLAY | BUTTON_REL)
#define CUBE_HIGHSPEED (BUTTON_REC | BUTTON_REL)
#elif (CONFIG_KEYPAD == GIGABEAT_PAD) #elif (CONFIG_KEYPAD == GIGABEAT_PAD)
#define CUBE_QUIT BUTTON_POWER #define CUBE_QUIT BUTTON_POWER
#define CUBE_X_INC BUTTON_LEFT #define CUBE_NEXT BUTTON_RIGHT
#define CUBE_X_DEC BUTTON_RIGHT #define CUBE_PREV BUTTON_LEFT
#define CUBE_Y_INC BUTTON_UP #define CUBE_INC BUTTON_UP
#define CUBE_Y_DEC BUTTON_DOWN #define CUBE_DEC BUTTON_DOWN
#define CUBE_Z_INC BUTTON_VOL_UP
#define CUBE_Z_DEC BUTTON_VOL_DOWN
#define CUBE_MODE BUTTON_MENU #define CUBE_MODE BUTTON_MENU
#define CUBE_PAUSE BUTTON_SELECT #define CUBE_PAUSE BUTTON_SELECT
#define CUBE_HIGHSPEED BUTTON_A #define CUBE_HIGHSPEED BUTTON_A
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) #elif (CONFIG_KEYPAD == SANSA_E200_PAD)
#define CUBE_QUIT BUTTON_POWER #define CUBE_QUIT BUTTON_POWER
#define CUBE_X_INC BUTTON_LEFT #define CUBE_NEXT BUTTON_RIGHT
#define CUBE_X_DEC BUTTON_RIGHT #define CUBE_PREV BUTTON_LEFT
#define CUBE_Y_INC BUTTON_SCROLL_FWD #define CUBE_INC BUTTON_SCROLL_FWD
#define CUBE_Y_DEC BUTTON_SCROLL_BACK #define CUBE_DEC BUTTON_SCROLL_BACK
#define CUBE_Z_INC BUTTON_UP #define CUBE_MODE BUTTON_DOWN
#define CUBE_Z_DEC BUTTON_DOWN #define CUBE_PAUSE BUTTON_UP
#define CUBE_MODE_PRE BUTTON_SELECT #define CUBE_HIGHSPEED BUTTON_SELECT
#define CUBE_MODE (BUTTON_SELECT|BUTTON_REPEAT)
#define CUBE_PAUSE_PRE BUTTON_SELECT
#define CUBE_PAUSE (BUTTON_SELECT|BUTTON_REL)
#define CUBE_HIGHSPEED BUTTON_REC
#elif (CONFIG_KEYPAD == SANSA_C200_PAD) #elif (CONFIG_KEYPAD == SANSA_C200_PAD)
#define CUBE_QUIT BUTTON_POWER #define CUBE_QUIT BUTTON_POWER
#define CUBE_X_INC BUTTON_LEFT #define CUBE_NEXT BUTTON_RIGHT
#define CUBE_X_DEC BUTTON_RIGHT #define CUBE_PREV BUTTON_LEFT
#define CUBE_Y_INC BUTTON_VOL_UP #define CUBE_INC BUTTON_VOL_UP
#define CUBE_Y_DEC BUTTON_VOL_DOWN #define CUBE_DEC BUTTON_VOL_DOWN
#define CUBE_Z_INC BUTTON_UP #define CUBE_MODE BUTTON_DOWN
#define CUBE_Z_DEC BUTTON_DOWN #define CUBE_PAUSE BUTTON_UP
#define CUBE_MODE_PRE BUTTON_SELECT #define CUBE_HIGHSPEED BUTTON_SELECT
#define CUBE_MODE (BUTTON_SELECT|BUTTON_REPEAT)
#define CUBE_PAUSE_PRE BUTTON_SELECT
#define CUBE_PAUSE (BUTTON_SELECT|BUTTON_REL)
#define CUBE_HIGHSPEED BUTTON_REC
#elif (CONFIG_KEYPAD == IRIVER_H10_PAD) #elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
#define CUBE_QUIT BUTTON_POWER #define CUBE_QUIT BUTTON_POWER
#define CUBE_X_INC BUTTON_LEFT #define CUBE_NEXT BUTTON_RIGHT
#define CUBE_X_DEC BUTTON_RIGHT #define CUBE_PREV BUTTON_LEFT
#define CUBE_Y_INC BUTTON_SCROLL_UP #define CUBE_INC BUTTON_SCROLL_UP
#define CUBE_Y_DEC BUTTON_SCROLL_DOWN #define CUBE_DEC BUTTON_SCROLL_DOWN
#define CUBE_Z_INC (BUTTON_PLAY | BUTTON_SCROLL_UP)
#define CUBE_Z_DEC (BUTTON_PLAY | BUTTON_SCROLL_DOWN)
#define CUBE_MODE BUTTON_REW #define CUBE_MODE BUTTON_REW
#define CUBE_PAUSE_PRE BUTTON_PLAY #define CUBE_PAUSE BUTTON_PLAY
#define CUBE_PAUSE (BUTTON_PLAY | BUTTON_REL) #define CUBE_HIGHSPEED BUTTON_FF
#define CUBE_HIGHSPEED (BUTTON_FF | BUTTON_REL)
#elif CONFIG_KEYPAD == MROBE500_PAD #elif CONFIG_KEYPAD == MROBE500_PAD
#define CUBE_QUIT BUTTON_POWER #define CUBE_QUIT BUTTON_POWER
#define CUBE_X_INC BUTTON_LEFT #define CUBE_NEXT BUTTON_RIGHT
#define CUBE_X_DEC BUTTON_RIGHT #define CUBE_PREV BUTTON_LEFT
#define CUBE_Y_INC BUTTON_RC_PLAY #define CUBE_INC BUTTON_RC_VOL_UP
#define CUBE_Y_DEC BUTTON_RC_DOWN #define CUBE_DEC BUTTON_RC_VOL_DOWN
#define CUBE_Z_INC BUTTON_RC_VOL_UP
#define CUBE_Z_DEC BUTTON_RC_VOL_DOWN
#define CUBE_MODE BUTTON_RC_MODE #define CUBE_MODE BUTTON_RC_MODE
#define CUBE_PAUSE_PRE BUTTON_RC_HEART #define CUBE_PAUSE_PRE BUTTON_RC_HEART
#define CUBE_PAUSE (BUTTON_RC_HEART | BUTTON_REL) #define CUBE_PAUSE (BUTTON_RC_HEART | BUTTON_REL)
#define CUBE_HIGHSPEED BUTTON_RC_HEART #define CUBE_HIGHSPEED BUTTON_RC_HEART /* fixme: clashes with pause */
#elif CONFIG_KEYPAD == GIGABEAT_S_PAD #elif CONFIG_KEYPAD == GIGABEAT_S_PAD
#define CUBE_QUIT BUTTON_BACK #define CUBE_QUIT BUTTON_BACK
#define CUBE_X_INC BUTTON_LEFT #define CUBE_NEXT BUTTON_RIGHT
#define CUBE_X_DEC BUTTON_RIGHT #define CUBE_PREV BUTTON_LEFT
#define CUBE_Y_INC BUTTON_UP #define CUBE_INC BUTTON_UP
#define CUBE_Y_DEC BUTTON_DOWN #define CUBE_DEC BUTTON_DOWN
#define CUBE_Z_INC BUTTON_VOL_UP #define CUBE_MODE BUTTON_MENU
#define CUBE_Z_DEC BUTTON_VOL_DOWN #define CUBE_PAUSE BUTTON_PLAY
#define CUBE_MODE BUTTON_PREV #define CUBE_HIGHSPEED BUTTON_SELECT
#define CUBE_PAUSE_PRE BUTTON_PLAY
#define CUBE_PAUSE (BUTTON_PLAY | BUTTON_REL)
#define CUBE_HIGHSPEED (BUTTON_NEXT | BUTTON_REL)
#elif (CONFIG_KEYPAD == MROBE100_PAD) #elif (CONFIG_KEYPAD == MROBE100_PAD)
#define CUBE_QUIT BUTTON_POWER #define CUBE_QUIT BUTTON_POWER
#define CUBE_X_INC BUTTON_LEFT #define CUBE_NEXT BUTTON_RIGHT
#define CUBE_X_DEC BUTTON_RIGHT #define CUBE_PREV BUTTON_LEFT
#define CUBE_Y_INC BUTTON_UP #define CUBE_INC BUTTON_UP
#define CUBE_Y_DEC BUTTON_DOWN #define CUBE_DEC BUTTON_DOWN
#define CUBE_Z_INC (BUTTON_DISPLAY | BUTTON_UP)
#define CUBE_Z_DEC (BUTTON_DISPLAY | BUTTON_DOWN)
#define CUBE_MODE BUTTON_MENU #define CUBE_MODE BUTTON_MENU
#define CUBE_PAUSE BUTTON_PLAY #define CUBE_PAUSE BUTTON_PLAY
#define CUBE_HIGHSPEED BUTTON_SELECT #define CUBE_HIGHSPEED BUTTON_SELECT
#elif (CONFIG_KEYPAD == IAUDIO_M3_PAD) #elif (CONFIG_KEYPAD == IAUDIO_M3_PAD)
#define CUBE_QUIT BUTTON_RC_REC #define CUBE_QUIT BUTTON_RC_REC
#define CUBE_X_INC BUTTON_RC_FF #define CUBE_NEXT BUTTON_RC_FF
#define CUBE_X_DEC BUTTON_RC_REW #define CUBE_PREV BUTTON_RC_REW
#define CUBE_Y_INC BUTTON_RC_VOL_UP #define CUBE_INC BUTTON_RC_VOL_UP
#define CUBE_Y_DEC BUTTON_RC_VOL_DOWN #define CUBE_DEC BUTTON_RC_VOL_DOWN
#define CUBE_Z_INC BUTTON_VOL_UP /* FIXME: quick hack */
#define CUBE_Z_DEC BUTTON_VOL_DOWN
#define CUBE_MODE BUTTON_RC_MODE #define CUBE_MODE BUTTON_RC_MODE
#define CUBE_PAUSE BUTTON_RC_PLAY #define CUBE_PAUSE BUTTON_RC_PLAY
#define CUBE_HIGHSPEED BUTTON_RC_MENU #define CUBE_HIGHSPEED BUTTON_RC_MENU
@ -251,37 +210,29 @@ PLUGIN_HEADER
#endif #endif
#ifdef HAVE_TOUCHSCREEN #ifdef HAVE_TOUCHSCREEN
// not enough touchfields, so CUBE_QUIT have to be #ifndef CUBE_QUIT
// mapped to a real button #define CUBE_QUIT BUTTON_TOPLEFT
//ifndef CUBE_QUIT
//#define CUBE_QUIT BUTTON_TOPLEFT
//#endif
#ifndef CUBE_X_INC
#define CUBE_X_INC BUTTON_MIDRIGHT
#endif #endif
#ifndef CUBE_X_DEC #ifndef CUBE_NEXT
#define CUBE_X_DEC BUTTON_MIDLEFT #define CUBE_NEXT BUTTON_MIDRIGHT
#endif #endif
#ifndef CUBE_Y_INC #ifndef CUBE_PREV
#define CUBE_Y_INC BUTTON_TOPMIDDLE #define CUBE_PREV BUTTON_MIDLEFT
#endif #endif
#ifndef CUBE_Y_DEC #ifndef CUBE_INC
#define CUBE_Y_DEC BUTTON_BOTTOMMIDDLE #define CUBE_INC BUTTON_TOPMIDDLE
#endif #endif
#ifndef CUBE_Z_INC #ifndef CUBE_DEC
#define CUBE_Z_INC BUTTON_BOTTOMRIGHT #define CUBE_DEC BUTTON_BOTTOMMIDDLE
#endif
#ifndef CUBE_Z_DEC
#define CUBE_Z_DEC BUTTON_BOTTOMLEFT
#endif #endif
#ifndef CUBE_MODE #ifndef CUBE_MODE
#define CUBE_MODE BUTTON_TOPRIGHT #define CUBE_MODE BUTTON_TOPRIGHT
#endif #endif
#ifndef CUBE_PAUSE #ifndef CUBE_PAUSE
#define CUBE_PAUSE (BUTTON_CENTER | BUTTON_REL) #define CUBE_PAUSE BUTTON_CENTER
#endif #endif
#ifndef CUBE_HIGHSPEED #ifndef CUBE_HIGHSPEED
#define CUBE_HIGHSPEED BUTTON_TOPLEFT #define CUBE_HIGHSPEED BUTTON_BOTTOMRIGHT
#endif #endif
#endif #endif
@ -420,6 +371,18 @@ enum {
static int mode = 0; static int mode = 0;
struct counter {
const char *label;
short speed;
short angle;
};
static struct counter axes[] = {
{"x-axis", 1, 0},
{"y-axis", 3, 0},
{"z-axis", 2, 0}
};
static struct point_3D point3D[8]; static struct point_3D point3D[8];
static struct point_2D point2D[8]; static struct point_2D point2D[8];
static long matrice[3][3]; static long matrice[3][3];
@ -594,12 +557,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame
int button; int button;
int lastbutton = BUTTON_NONE; int lastbutton = BUTTON_NONE;
int xa = 0; int curr = 0;
int ya = 0;
int za = 0;
int xs = 1;
int ys = 3;
int zs = 1;
bool highspeed = false; bool highspeed = false;
bool paused = false; bool paused = false;
bool redraw = true; bool redraw = true;
@ -638,20 +596,15 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame
rb->splash(HZ*2, "Old LCD :("); rb->splash(HZ*2, "Old LCD :(");
return PLUGIN_OK; return PLUGIN_OK;
} }
pgfx_display(3, 0); pgfx_display(0, 0);
#endif #endif
while(!exit) while(!exit)
{ {
if (highspeed)
rb->yield();
else
rb->sleep(4);
if (redraw) if (redraw)
{ {
MYLCD(clear_display)(); MYLCD(clear_display)();
cube_rotate(xa, ya, za); cube_rotate(axes[0].angle, axes[1].angle, axes[2].angle);
cube_viewport(); cube_viewport();
cube_draw(); cube_draw();
redraw = false; redraw = false;
@ -661,8 +614,10 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame
if (t_disp > 0) if (t_disp > 0)
{ {
t_disp--; t_disp--;
rb->snprintf(buffer, sizeof(buffer), "x:%d y:%d z:%d h:%d", rb->snprintf(buffer, sizeof(buffer), "%s: %d %s",
xs, ys, zs, highspeed); axes[curr].label,
paused ? axes[curr].angle : axes[curr].speed,
highspeed ? "(hs)" : "");
MYLCD(putsxy)(0, LCD_HEIGHT-8, buffer); MYLCD(putsxy)(0, LCD_HEIGHT-8, buffer);
if (t_disp == 0) if (t_disp == 0)
redraw = true; redraw = true;
@ -672,21 +627,17 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame
{ {
if (t_disp == DISP_TIME) if (t_disp == DISP_TIME)
{ {
rb->snprintf(buffer, sizeof(buffer), "x%d", xs); rb->lcd_puts(5, 0, axes[curr].label);
rb->lcd_puts(0, 0, buffer); rb->snprintf(buffer, sizeof(buffer), "%d %c",
rb->snprintf(buffer, sizeof(buffer), "y%d", ys); paused ? axes[curr].angle : axes[curr].speed,
rb->lcd_puts(0, 1, buffer); highspeed ? 'H' : ' ');
pgfx_display(3, 0); rb->lcd_puts(5, 1, buffer);
rb->snprintf(buffer, sizeof(buffer), "z%d", zs);
rb->lcd_puts(8, 0, buffer);
rb->snprintf(buffer, sizeof(buffer), "h%d", highspeed);
rb->lcd_puts(8, 1, buffer);
} }
t_disp--; t_disp--;
if (t_disp == 0) if (t_disp == 0)
{ {
rb->lcd_clear_display(); rb->lcd_clear_display();
pgfx_display(3, 0); pgfx_display(0, 0);
} }
} }
#endif #endif
@ -701,129 +652,73 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame
if (!paused) if (!paused)
{ {
xa += xs; int i;
if (xa > 359)
xa -= 360;
else if (xa < 0)
xa += 360;
ya += ys; for (i = 0; i < 3; i++)
if (ya > 359) {
ya -= 360; axes[i].angle += axes[i].speed;
else if (ya < 0) if (axes[i].angle > 359)
ya += 360; axes[i].angle -= 360;
else if (axes[i].angle < 0)
za += zs; axes[i].angle += 360;
if (za > 359) }
za -= 360;
else if (za < 0)
za += 360;
redraw = true; redraw = true;
if (highspeed)
rb->yield();
else
rb->sleep(HZ/25);
button = rb->button_get(false);
}
else
{
button = rb->button_get_w_tmo(HZ/25);
} }
button = rb->button_get(false);
switch (button) switch (button)
{ {
case CUBE_X_INC: case CUBE_INC:
case (CUBE_X_INC|BUTTON_REPEAT): case CUBE_INC|BUTTON_REPEAT:
if( !paused ) if (!paused)
{ {
if( xs < 10) if (axes[curr].speed < 10)
xs++; axes[curr].speed++;
} }
else else
{ {
xa++; if (++axes[curr].angle > 359)
if( xa > 359 ) axes[curr].angle -= 360;
xa -= 360;
} }
t_disp = DISP_TIME; t_disp = DISP_TIME;
redraw = true; redraw = true;
break; break;
case CUBE_X_DEC: case CUBE_DEC:
case (CUBE_X_DEC|BUTTON_REPEAT): case CUBE_DEC|BUTTON_REPEAT:
if( !paused ) if (!paused)
{ {
if (xs > -10) if (axes[curr].speed > -10)
xs--; axes[curr].speed--;
} }
else else
{ {
xa--; if (--axes[curr].angle < 0)
if( xa < 0 ) axes[curr].angle += 360;
xa += 360;
} }
t_disp = DISP_TIME; t_disp = DISP_TIME;
redraw = true; redraw = true;
break; break;
case CUBE_Y_INC: case CUBE_NEXT:
case (CUBE_Y_INC|BUTTON_REPEAT): if (++curr > 2)
if( !paused ) curr = 0;
{
if (ys < 10)
ys++;
}
else
{
ya++;
if( ya > 359 )
ya -= 360;
}
t_disp = DISP_TIME; t_disp = DISP_TIME;
redraw = true;
break; break;
case CUBE_Y_DEC: case CUBE_PREV:
case (CUBE_Y_DEC|BUTTON_REPEAT): if (--curr < 0)
if( !paused ) curr = 2;
{
if (ys > -10)
ys--;
}
else
{
ya--;
if( ya < 0 )
ya += 360;
}
t_disp = DISP_TIME; t_disp = DISP_TIME;
redraw = true;
break;
case CUBE_Z_INC:
case (CUBE_Z_INC|BUTTON_REPEAT):
if( !paused )
{
if (zs < 10)
zs++;
}
else
{
za++;
if( za > 359 )
za -= 360;
}
t_disp = DISP_TIME;
redraw = true;
break;
case CUBE_Z_DEC:
case (CUBE_Z_DEC|BUTTON_REPEAT):
if( !paused )
{
if (zs > -10)
zs--;
}
else
{
za--;
if( za < 0 )
za += 360;
}
t_disp = DISP_TIME;
redraw = true;
break; break;
case CUBE_MODE: case CUBE_MODE: