1 files changed, 22 insertions, 17 deletions
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c
index 8b0519d9d0..d130ab6108 100644
--- a/apps/plugins/invadrox.c
+++ b/apps/plugins/invadrox.c
@@ -141,14 +141,6 @@
 #define RIGHT BUTTON_RIGHT
 #define FIRE BUTTON_SELECT
 
-#elif CONFIG_KEYPAD == TATUNG_TPJ1022_PAD
-
-/* TODO: Figure out which buttons to use for Tatung Elio TPJ-1022 */
-#define QUIT BUTTON_AB
-#define LEFT BUTTON_LEFT
-#define RIGHT BUTTON_RIGHT
-#define FIRE BUTTON_MENU
-
 #elif CONFIG_KEYPAD == GIGABEAT_S_PAD
 
 #define QUIT BUTTON_BACK
@@ -163,13 +155,6 @@
 #define RIGHT BUTTON_PLUS
 #define FIRE BUTTON_MENU
 
-#elif CONFIG_KEYPAD == IAUDIO67_PAD
-
-#define QUIT BUTTON_POWER
-#define LEFT BUTTON_LEFT
-#define RIGHT BUTTON_RIGHT
-#define FIRE BUTTON_PLAY
-
 #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
 
 #define QUIT BUTTON_BACK
@@ -303,6 +288,9 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define RIGHT BUTTON_RIGHT
 #define FIRE  BUTTON_SELECT
 
+#elif CONFIG_KEYPAD == SHANLING_Q1_PAD
+/* use touchscreen */
+
 #else
     #error INVADROX: Unsupported keypad
 #endif
@@ -621,7 +609,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 
 #elif (LCD_WIDTH == 220) && (LCD_HEIGHT == 176)
 
-/* TPJ1022, H300, iPod Color: 220x176x16
+/* H300, iPod Color: 220x176x16
  * ============================
  * X: 0p padding at left/right gives 220p playfield in middle.
  *    8p "border" gives 204p actual playfield. UFO use full 220p.
@@ -655,6 +643,23 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define LIVES_X 8
 #define MAX_Y 15
 
+#elif (LCD_WIDTH == 360) && (LCD_HEIGHT == 400)
+
+/* Shanling Q1
+ */
+#define ARCADISH_GRAPHICS
+#define PLAYFIELD_X 32
+#define SHIP_Y (PLAYFIELD_Y - 3 * SHIP_HEIGHT)
+#define ALIEN_START_Y (UFO_Y + 3 * ALIEN_HEIGHT)
+/* Redefine SCORE_Y */
+#undef SCORE_Y
+#define SCORE_Y 80
+#define SCORENUM_X (PLAYFIELD_X + NUMBERS_WIDTH)
+#define SCORENUM_Y SCORE_Y + (2 * (FONT_HEIGHT + 1) + 1)
+#define HISCORENUM_X (LCD_WIDTH - PLAYFIELD_X - 1 - 6 * NUMBERS_WIDTH - 5 * NUM_SPACING)
+#define SHIELD_Y (PLAYFIELD_Y - 6 * SHIP_HEIGHT)
+#define LIVES_X 10
+#define MAX_Y 18
 
 #else
     #error INVADROX: Unsupported LCD type
@@ -780,7 +785,7 @@ static fb_data *lcd_fb;
 /* No standard get_pixel function yet, use this hack instead */
 #if (LCD_DEPTH >= 8)
 
-#if   defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE
+#if LCD_STRIDEFORMAT == VERTICAL_STRIDE
 static inline fb_data get_pixel(int x, int y)
 {
     return lcd_fb[x*LCD_HEIGHT+y];