From 4c60bc9e681865fcfc149775a1ed7ccd2613d5bf Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Sun, 23 May 2021 17:30:58 +0100 Subject: New port: Shanling Q1 native - Audio playback works - Touchscreen and buttons work - Bootloader works and is capable of dual boot - Plugins are working - Cabbiev2 theme has been ported - Stable for general usage Thanks to Marc Aarts for porting Cabbiev2 and plugin bitmaps. There's a few minor known issues: - Bootloader must be installed manually using 'usbboot' as there is no support in jztool yet. - Keymaps may be lacking, need further testing and feedback. - Some plugins may not be fully adapted to the screen size and could benefit from further tweaking. - LCD shows abnormal effects under some circumstances: for example, after viewing a mostly black screen an afterimage appears briefly when going back to a brightly-lit screen. Sudden power-off without proper shutdown of the backlight causes a "dissolving" effect. - CW2015 battery reporting driver is buggy, and disabled for now. Battery reporting is currently voltage-based using the AXP192. Change-Id: I635e83f02a880192c5a82cb0861ad3a61c137c3a --- wps/AUTHORS | 1 + wps/WPSLIST | 5 ++ wps/cabbiev2.360x400x16.wps | 81 ++++++++++++++++++++++++++++++++ wps/cabbiev2/battery-360x400x16.bmp | Bin 0 -> 58054 bytes wps/cabbiev2/lock-360x400x16.bmp | Bin 0 -> 6782 bytes wps/cabbiev2/pb-360x400x16.bmp | Bin 0 -> 6654 bytes wps/cabbiev2/playmode-360x400x16.bmp | Bin 0 -> 15714 bytes wps/cabbiev2/repeat-360x400x16.bmp | Bin 0 -> 9798 bytes wps/cabbiev2/shuffle-360x400x16.bmp | Bin 0 -> 4926 bytes wps/cabbiev2/volume-360x400x16.bmp | Bin 0 -> 44134 bytes wps/cabbiev2/wpsbackdrop-360x400x16.bmp | Bin 0 -> 432054 bytes 11 files changed, 87 insertions(+) create mode 100644 wps/cabbiev2.360x400x16.wps create mode 100644 wps/cabbiev2/battery-360x400x16.bmp create mode 100644 wps/cabbiev2/lock-360x400x16.bmp create mode 100644 wps/cabbiev2/pb-360x400x16.bmp create mode 100644 wps/cabbiev2/playmode-360x400x16.bmp create mode 100644 wps/cabbiev2/repeat-360x400x16.bmp create mode 100644 wps/cabbiev2/shuffle-360x400x16.bmp create mode 100644 wps/cabbiev2/volume-360x400x16.bmp create mode 100644 wps/cabbiev2/wpsbackdrop-360x400x16.bmp (limited to 'wps') diff --git a/wps/AUTHORS b/wps/AUTHORS index 4f0d852286..0afa5b9896 100644 --- a/wps/AUTHORS +++ b/wps/AUTHORS @@ -16,6 +16,7 @@ Cabbie v2.0: Johannes Voggenthaler Jonathan Gordon Keith Perri + Marc Aarts Marc Guay Marcin Bukat Marianne Arnold diff --git a/wps/WPSLIST b/wps/WPSLIST index 70970dee58..efb1030585 100644 --- a/wps/WPSLIST +++ b/wps/WPSLIST @@ -82,6 +82,7 @@ RSBS: no wps.800x480x(16|24): cabbiev2.800x480x16.wps wps.480x800x(16|24): cabbiev2.480x800x16.wps wps.400x240x(16|24): cabbiev2.400x240x16.wps +wps.360x400x16: cabbiev2.360x400x16.wps wps.320x480x(16|24): cabbiev2.320x480x16.wps wps.320x240x(16|24|32): cabbiev2.320x240x16.wps wps.240x400x(16|24): cabbiev2.240x400x16.wps @@ -111,6 +112,7 @@ fms.128x128x2: cabbiev2-128x128x2.fms Font.800x480x(16|24): 35-Adobe-Helvetica.fnt Font.480x800x(16|24): 35-Adobe-Helvetica.fnt Font.400x240x(16|24): 15-Adobe-Helvetica.fnt +Font.360x400x16: 18-Adobe-Helvetica.fnt Font.320x480x(16|24): 27-Adobe-Helvetica.fnt Font.320x240x(16|24): 15-Adobe-Helvetica.fnt Font.240x400x(16|24): 16-Adobe-Helvetica.fnt @@ -144,6 +146,7 @@ filetype colours: - backdrop.800x480x(16|24): backdrops/cabbiev2.800x480x16.bmp backdrop.480x800x(16|24): backdrops/cabbiev2.480x800x16.bmp backdrop.400x240x(16|24): backdrops/cabbiev2.400x240x16.bmp +backdrop.360x400x16: backdrops/cabbiev2.360x400x16.bmp backdrop.320x480x(16|24): backdrops/cabbiev2.320x480x16.bmp backdrop.320x240x(16|24): backdrops/cabbiev2.320x240x16.bmp backdrop.128x128x(16|24): backdrops/cabbiev2.128x128x16.bmp @@ -170,6 +173,7 @@ selector type..+x2: bar (inverse) iconset.800x480x(16|24): icons/tango_icons.32x32.bmp iconset.480x800x(16|24): icons/tango_icons.32x32.bmp iconset.400x240x(16|24): icons/tango_icons.16x16.bmp +iconset.360x400x16: icons/tango_icons.32x32.bmp iconset.320x480x(16|24): icons/tango_icons.24x24.bmp iconset.320x240x(16|24|32): icons/tango_icons.16x16.bmp iconset.128x128x(16|24): icons/tango_icons.12x12.bmp @@ -189,6 +193,7 @@ iconset..+x2: icons/tango_small_mono.bmp viewers iconset.800x480x(16|24): icons/tango_icons_viewers.32x32.bmp viewers iconset.480x800x(16|24): icons/tango_icons_viewers.32x32.bmp viewers iconset.400x240x(16|24): icons/tango_icons_viewers.16x16.bmp +viewers iconset.360x400x16: icons/tango_icons_viewers.32x32.bmp viewers iconset.320x480x(16|24): icons/tango_icons_viewers.24x24.bmp viewers iconset.320x240x(16|24): icons/tango_icons_viewers.16x16.bmp viewers iconset.128x128x(16|24): icons/tango_icons_viewers.12x12.bmp diff --git a/wps/cabbiev2.360x400x16.wps b/wps/cabbiev2.360x400x16.wps new file mode 100644 index 0000000000..163d749e50 --- /dev/null +++ b/wps/cabbiev2.360x400x16.wps @@ -0,0 +1,81 @@ +# Cabbie v2.0 +# (C) 2007-2012 The Authors (see /rockbox/wps/AUTHORS) +# Derived from "cabbie" (C) Yohann Misquitta +# +# Disable Status Bar +%wd +# +# Load Backdrop +%X(wpsbackdrop-360x400x16.bmp) +# +# Preload Images +%xl(A,lock-360x400x16.bmp,0,0,2) +%xl(B,battery-360x400x16.bmp,0,0,10) +%xl(C,volume-360x400x16.bmp,0,0,10) +%xl(D,shuffle-360x400x16.bmp,0,0) +%xl(E,repeat-360x400x16.bmp,0,0,4) +%xl(F,playmode-360x400x16.bmp,0,0,5) +# +# Album Art/Info Viewport Conditional +%?C<%Vd(a)|%Vd(b)> +# +# Progress Bar +%V(33,316,300,20,-) +%pb(0,0,-,20,pb-360x400x16.bmp) +# +# Hold +%V(16,365,38,29,-) +%?mh<%xd(Aa)|%xd(Ab)> +# +# Battery +%V(69,365,66,29,-) +%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> +# +# Volume +%V(147,365,50,29,-) +%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)> +# +# Shuffle +%V(208,365,55,29,-) +%?ps<%xd(D)> +# +# Repeat +%V(273,365,27,29,-) +%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)> +# +# Playmode +%V(309,365,36,29,-) +%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)> +# +# Time Elapsed/Remaining +%V(32,339,300,20,-) +%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr +# +# Album Art +%ax%Vl(a,82,38,195,161,-) +%Cl(0,0,195,161,c,c) +%Cd +# +# Track Info - Album Art +%ax%Vl(a,0,206,-,98,1) +%s%ac%?it<%it|%fn> +%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>> +%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>> + +%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn> +# +# Track Info - No Album Art +%Vl(b,0,56,-,247,1) +%s%ac%?it<%it|%fn> +%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>> +%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>> +%ac%?iy<%iy|> + +%ac%?ig<%ig|> +%ac%?fv<%(vbr%) |>%fb kbit/s %fc + + +%ac%Sx(Next Track:) +%ac%s%?It<%It|%Fn> +%s%ac%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> +%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>> diff --git a/wps/cabbiev2/battery-360x400x16.bmp b/wps/cabbiev2/battery-360x400x16.bmp new file mode 100644 index 0000000000..d00b4c1c5d Binary files /dev/null and b/wps/cabbiev2/battery-360x400x16.bmp differ diff --git a/wps/cabbiev2/lock-360x400x16.bmp b/wps/cabbiev2/lock-360x400x16.bmp new file mode 100644 index 0000000000..70c419e875 Binary files /dev/null and b/wps/cabbiev2/lock-360x400x16.bmp differ diff --git a/wps/cabbiev2/pb-360x400x16.bmp b/wps/cabbiev2/pb-360x400x16.bmp new file mode 100644 index 0000000000..6b5884d059 Binary files /dev/null and b/wps/cabbiev2/pb-360x400x16.bmp differ diff --git a/wps/cabbiev2/playmode-360x400x16.bmp b/wps/cabbiev2/playmode-360x400x16.bmp new file mode 100644 index 0000000000..148376b127 Binary files /dev/null and b/wps/cabbiev2/playmode-360x400x16.bmp differ diff --git a/wps/cabbiev2/repeat-360x400x16.bmp b/wps/cabbiev2/repeat-360x400x16.bmp new file mode 100644 index 0000000000..f6fb08d909 Binary files /dev/null and b/wps/cabbiev2/repeat-360x400x16.bmp differ diff --git a/wps/cabbiev2/shuffle-360x400x16.bmp b/wps/cabbiev2/shuffle-360x400x16.bmp new file mode 100644 index 0000000000..1b16153176 Binary files /dev/null and b/wps/cabbiev2/shuffle-360x400x16.bmp differ diff --git a/wps/cabbiev2/volume-360x400x16.bmp b/wps/cabbiev2/volume-360x400x16.bmp new file mode 100644 index 0000000000..7d8b8e40e8 Binary files /dev/null and b/wps/cabbiev2/volume-360x400x16.bmp differ diff --git a/wps/cabbiev2/wpsbackdrop-360x400x16.bmp b/wps/cabbiev2/wpsbackdrop-360x400x16.bmp new file mode 100644 index 0000000000..aa7399bd53 Binary files /dev/null and b/wps/cabbiev2/wpsbackdrop-360x400x16.bmp differ -- cgit v1.2.3