Multiple changes.

- Changed name to Gambatte-DMS (dot matrix simulator) to avoid confusion with other outdated forks - Added an extra button layout option (alternate 2) to mirror Select/Start buttons into X/Y - Added option to disable the Fast-Forward hotkey - Preliminary work on a future scaler for devices with VGA screens - Added support for low battery warnings on miyoo consoles (not used in normal builds) - Preliminary work for a future auto-shutdown feature (shuts down when battery level is too low) on miyoo consoles
bardeci · Jun 1, 2020 · 5a3dbad · 5a3dbad
1 parent efcf397
commit 5a3dbad
Show file tree

Hide file tree

Showing 22 changed files with 343 additions and 76 deletions.
diff --git a/Makefile.bittboy b/Makefile.bittboy
@@ -6,7 +6,7 @@ CXX = $(CROSS_COMPILE)g++
 SYSROOT     := $(CHAINPREFIX)/arm-miyoo-linux-musleabi/sysroot
 SDL_CFLAGS  := $(shell $(SYSROOT)/usr/bin/sdl-config --cflags)
 
-OUTPUTNAME = gambatte-bittboy
+OUTPUTNAME = gambatte-dms-bittboy
 
 DEFINES = -DHAVE_STDINT_H -DVERSION_BITTBOY
 INCLUDES = -Isrc/gambatte_sdl -Ilibgambatte -Icommon -Iinclude -Ilibgambatte/include -Ilibgambatte/src $(SDL_CFLAGS)

diff --git a/Makefile.pocketgo b/Makefile.pocketgo
@@ -6,7 +6,7 @@ CXX = $(CROSS_COMPILE)g++
 SYSROOT     := $(CHAINPREFIX)/arm-miyoo-linux-musleabi/sysroot
 SDL_CFLAGS  := $(shell $(SYSROOT)/usr/bin/sdl-config --cflags)
 
-OUTPUTNAME = gambatte-pocketgo
+OUTPUTNAME = gambatte-dms-pocketgo
 
 DEFINES = -DHAVE_STDINT_H -DVERSION_POCKETGO
 INCLUDES = -Isrc/gambatte_sdl -Ilibgambatte -Icommon -Iinclude -Ilibgambatte/include -Ilibgambatte/src $(SDL_CFLAGS)

diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+**Gambatte-DMS**
+
 Gameboy emulator for handheld devices, using a modified Gambatte core (based on r572).
 
 Working on the following systems:

diff --git a/build_multi_opk.sh b/build_multi_opk.sh
@@ -7,7 +7,7 @@ echo "cd libgambatte && scons"
 (cd libgambatte && scons -Q target=retrofw) || exit
 echo "cd gambatte_sdl && scons"
 (cd gambatte_sdl && scons -Q target=retrofw)
-mv gambatte_sdl/gambatte_sdl gambatte_sdl/gambatte.retrofw
+mv gambatte_sdl/gambatte_sdl gambatte_sdl/gambatte-dms.retrofw
 
 echo "cd gambatte_sdl && scons -c"
 (cd gambatte_sdl && scons -c)
@@ -24,11 +24,11 @@ echo "cd libgambatte && scons"
 (cd libgambatte && scons -Q target=opendingux) || exit
 echo "cd gambatte_sdl && scons"
 (cd gambatte_sdl && scons -Q target=opendingux)
-mv gambatte_sdl/gambatte_sdl gambatte_sdl/gambatte.opendingux
+mv gambatte_sdl/gambatte_sdl gambatte_sdl/gambatte-dms.opendingux
 
-rm -f gambatte-multi-r572u4-$BDAT.opk
+rm -f gambatte-dms-multi-r572u4-$BDAT.opk
 
-mksquashfs ./dist/gcw0/default.gcw0.desktop ./dist/retrofw/default.retrofw.desktop ./dist/retrofw/gb.retrofw.desktop ./dist/retrofw/gbc.retrofw.desktop ./gambatte_sdl/gambatte.opendingux ./gambatte_sdl/gambatte.retrofw ./dist/gcw0/gambatte.png ./dist/gcw0/manual.txt ./dist/retrofw/gambatte.man.txt gambatte-multi-r572u4-$BDAT.opk -all-root -no-xattrs -noappend -no-exports
+mksquashfs ./dist/gcw0/default.gcw0.desktop ./dist/retrofw/default.retrofw.desktop ./dist/retrofw/gb.retrofw.desktop ./dist/retrofw/gbc.retrofw.desktop ./gambatte_sdl/gambatte-dms.opendingux ./gambatte_sdl/gambatte-dms.retrofw ./dist/gcw0/gambatte.png ./dist/gcw0/manual.txt ./dist/retrofw/gambatte.man.txt gambatte-dms-multi-r572u4-$BDAT.opk -all-root -no-xattrs -noappend -no-exports
 
 echo "cd gambatte_sdl && scons -c"
 (cd gambatte_sdl && scons -c)
@@ -41,5 +41,5 @@ rm -rf *gambatte*/.scon*
 find . -type f -iname \*.o -delete
 find . -type f -iname gambatte_sdl -delete
 
-find . -type f -iname gambatte.retrofw -delete
-find . -type f -iname gambatte.opendingux -delete
+find . -type f -iname gambatte-dms.retrofw -delete
+find . -type f -iname gambatte-dms.opendingux -delete
diff --git a/build_opendingux.sh b/build_opendingux.sh
@@ -7,11 +7,11 @@ echo "cd libgambatte && scons"
 (cd libgambatte && scons -Q target=opendingux) || exit
 echo "cd gambatte_sdl && scons"
 (cd gambatte_sdl && scons -Q target=opendingux)
-mv gambatte_sdl/gambatte_sdl gambatte_sdl/gambatte.opendingux
+mv gambatte_sdl/gambatte_sdl gambatte_sdl/gambatte-dms.opendingux
 
-rm -f gambatte-opendingux-r572u4-$BDAT.opk
+rm -f gambatte-dms-opendingux-r572u4-$BDAT.opk
 
-mksquashfs ./dist/gcw0/default.gcw0.desktop ./gambatte_sdl/gambatte.opendingux ./dist/gcw0/gambatte.png ./dist/gcw0/manual.txt gambatte-opendingux-r572u4-$BDAT.opk -all-root -no-xattrs -noappend -no-exports
+mksquashfs ./dist/gcw0/default.gcw0.desktop ./gambatte_sdl/gambatte-dms.opendingux ./dist/gcw0/gambatte.png ./dist/gcw0/manual.txt gambatte-dms-opendingux-r572u4-$BDAT.opk -all-root -no-xattrs -noappend -no-exports
 
 echo "cd gambatte_sdl && scons -c"
 (cd gambatte_sdl && scons -c)
@@ -24,4 +24,4 @@ rm -rf *gambatte*/.scon*
 find . -type f -iname \*.o -delete
 find . -type f -iname gambatte_sdl -delete
 
-find . -type f -iname gambatte.opendingux -delete
+find . -type f -iname gambatte-dms.opendingux -delete
diff --git a/build_retrofw.sh b/build_retrofw.sh
@@ -10,14 +10,14 @@ echo "cd gambatte_sdl && scons"
 
 rm -rf /tmp/.gambatte-ipk/ && mkdir -p /tmp/.gambatte-ipk/root/home/retrofw/emus/gambatte /tmp/.gambatte-ipk/root/home/retrofw/apps/gmenu2x/sections/emulators /tmp/.gambatte-ipk/root/home/retrofw/apps/gmenu2x/sections/emulators.systems
 cp dist/retrofw/gambatte.man.txt dist/retrofw/gambatte.png /tmp/.gambatte-ipk/root/home/retrofw/emus/gambatte
-cp gambatte_sdl/gambatte_sdl /tmp/.gambatte-ipk/root/home/retrofw/emus/gambatte/gambatte.dge
+cp gambatte_sdl/gambatte_sdl /tmp/.gambatte-ipk/root/home/retrofw/emus/gambatte/gambatte-dms.dge
 cp dist/retrofw/gambatte.lnk /tmp/.gambatte-ipk/root/home/retrofw/apps/gmenu2x/sections/emulators
 cp dist/retrofw/gb.gambatte.lnk dist/retrofw/gbc.gambatte.lnk /tmp/.gambatte-ipk/root/home/retrofw/apps/gmenu2x/sections/emulators.systems
 sed "s/^Version:.*/Version: `date +%Y%m%d`/" dist/retrofw/control > /tmp/.gambatte-ipk/control
 tar --owner=0 --group=0 -czvf /tmp/.gambatte-ipk/control.tar.gz -C /tmp/.gambatte-ipk/ control
 tar --owner=0 --group=0 -czvf /tmp/.gambatte-ipk/data.tar.gz -C /tmp/.gambatte-ipk/root/ .
 echo 2.0 > /tmp/.gambatte-ipk/debian-binary
-ar r gambatte-retrofw-r572u4-$BDAT.ipk /tmp/.gambatte-ipk/control.tar.gz /tmp/.gambatte-ipk/data.tar.gz /tmp/.gambatte-ipk/debian-binary
+ar r gambatte-dms-retrofw-r572u4-$BDAT.ipk /tmp/.gambatte-ipk/control.tar.gz /tmp/.gambatte-ipk/data.tar.gz /tmp/.gambatte-ipk/debian-binary
 
 echo "cd gambatte_sdl && scons -c"
 (cd gambatte_sdl && scons -c)

diff --git a/dist/gcw0/default.gcw0.desktop b/dist/gcw0/default.gcw0.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
-Name=Gambatte
+Name=Gambatte-DMS
 Comment=GB/GBC emulator
-Exec=gambatte.opendingux %f
+Exec=gambatte-dms.opendingux %f
 Terminal=false
 Type=Application
 StartupNotify=true

diff --git a/dist/gcw0/manual.txt b/dist/gcw0/manual.txt
@@ -1,5 +1,5 @@
 
-Gambatte Emulator for OpenDingux devices
+Gambatte-DMS emulator for OpenDingux devices
 ------------------------------------------------
 
 Gambatte is an accuracy-focused, open-source, 
@@ -9,7 +9,7 @@ hardware tests, as well as previous documentation
 and reverse engineering efforts.
 
 
-Ingame Controls
+Default Ingame Controls
 ------------------------------------------------
 
 D-PAD               D-PAD
@@ -88,7 +88,7 @@ Here is a list of the available config options:
     Default is "DMG only".
 
 - Controls:
-    Allows the user to swap the B/A buttons.
+    Allows the user to tune the controls.
 
 - Sound:
     Allows the user to select between Mono and
@@ -251,8 +251,8 @@ Boston, MA  02111-1307, USA
 
 ------------------------------------------------
 
-OpenDingux port, additional features and menu
-rework by Hi-Ban.
+Additional features and menu rework from the
+Gambatte-DMS version by Hi-Ban.
 Special thanks to Surkow, Senquack and Pingflood
 for helping this noob.
 Source code available at:

diff --git a/dist/retrofw/control b/dist/retrofw/control
@@ -1,6 +1,6 @@
-Package: gambatte
+Package: Gambatte-DMS
 Version: 
-Description: RetroGame port of Gambatte
+Description: port of Gambatte
 Section: emus
 Priority: optional
 Maintainer: hi-ban

diff --git a/dist/retrofw/default.retrofw.desktop b/dist/retrofw/default.retrofw.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
-Name=Gambatte
+Name=Gambatte-DMS
 Comment=GB/GBC emulator
-Exec=gambatte.retrofw
+Exec=gambatte-dms.retrofw
 Terminal=false
 Type=Application
 StartupNotify=true

diff --git a/dist/retrofw/gambatte.lnk b/dist/retrofw/gambatte.lnk
@@ -1,6 +1,6 @@
-title=Gambatte
+title=Gambatte-DMS
 description=GB/GBC Emulator
-exec=/home/retrofw/emus/gambatte/gambatte.dge
+exec=/home/retrofw/emus/gambatte/gambatte-dms.dge
 selectordir=/home/retrofw/roms/gb
 selectorfilter=.zip,.gb,.gbc
 clock=600
diff --git a/dist/retrofw/gambatte.man.txt b/dist/retrofw/gambatte.man.txt
@@ -1,5 +1,5 @@
 
-Gambatte Emulator for RetroFW devices
+Gambatte-DMS emulator for RetroFW devices
 ------------------------------------------------
 
 Gambatte is an accuracy-focused, open-source, 
@@ -9,15 +9,15 @@ hardware tests, as well as previous documentation
 and reverse engineering efforts.
 
 
-Ingame Controls
+Default Ingame Controls
 ------------------------------------------------
 
 D-PAD               D-PAD
 B Button            B Button
 A Button            A Button
 Select              Select
 Start               Start
-POWER               Menu
+R trigger / POWER   Menu
 L trigger           Fast Forward
 
 
@@ -88,7 +88,7 @@ Here is a list of the available config options:
     Default is "DMG only".
 
 - Controls:
-    Allows the user to swap the B/A buttons.
+    Allows the user to tune the controls.
 
 - Sound:
     Allows the user to select between Mono and
@@ -251,8 +251,8 @@ Boston, MA  02111-1307, USA
 
 ------------------------------------------------
 
-RetroFW port, additional features and menu
-rework by Hi-Ban.
+Additional features and menu rework from the
+Gambatte-DMS version by Hi-Ban.
 Special thanks to Surkow, Senquack and Pingflood
 for helping this noob.
 Source code available at:

diff --git a/dist/retrofw/gb.gambatte.lnk b/dist/retrofw/gb.gambatte.lnk
@@ -1,6 +1,6 @@
 title=GB
-description=Gambatte Emulator
-exec=/home/retrofw/emus/gambatte/gambatte.dge
+description=Gambatte-DMS Emulator
+exec=/home/retrofw/emus/gambatte/gambatte-dms.dge
 selectordir=/home/retrofw/roms/gb
 selectorfilter=.zip,.gb,.gbc
 clock=600
diff --git a/dist/retrofw/gb.retrofw.desktop b/dist/retrofw/gb.retrofw.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=GB
-Comment=Gambatte emulator
-Exec=gambatte.retrofw
+Comment=Gambatte-DMS emulator
+Exec=gambatte-dms.retrofw
 Terminal=false
 Type=Application
 StartupNotify=true

diff --git a/dist/retrofw/gbc.gambatte.lnk b/dist/retrofw/gbc.gambatte.lnk
@@ -1,6 +1,6 @@
 title=GBC
-description=Gambatte Emulator
-exec=/home/retrofw/emus/gambatte/gambatte.dge
+description=Gambatte-DMS Emulator
+exec=/home/retrofw/emus/gambatte/gambatte-dms.dge
 selectordir=/home/retrofw/roms/gbc
 selectorfilter=.zip,.gb,.gbc
 clock=600
diff --git a/dist/retrofw/gbc.retrofw.desktop b/dist/retrofw/gbc.retrofw.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=GBC
-Comment=Gambatte emulator
-Exec=gambatte.retrofw
+Comment=Gambatte-DMS emulator
+Exec=gambatte-dms.retrofw
 Terminal=false
 Type=Application
 StartupNotify=true

diff --git a/gambatte_sdl/builddate.h b/gambatte_sdl/builddate.h
@@ -1 +1 @@
-#define BUILDDATE "20200127-194104"
+#define BUILDDATE "20200601-201642"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define BUILDDATE "20200127-194104"
		#define BUILDDATE "20200601-201642"