Merge pull request #104 from fhoedemakers/development

fhoedemakers · web-flow · commit 288116b788b5 · 2024-12-26T13:01:32.000+01:00
Menu now uses full 320x240 screen resolution
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,255 +25,15 @@ For the latest two player PCB 2.0, you need:
 
 3D-printed case design for Waveshare RP2040-PiZero: [https://www.thingiverse.com/thing:6758682](https://www.thingiverse.com/thing:6758682)
 
-# Release notes
+# v0.24 release notes
 
-## v0.23
+## Features
 
-### Features
+- Menu now uses the full screen resolution of 320x240 pixels resulting in a 40x30 character display in stead of 32x29.
 
-### Fixes
+## Fixes
 
-- Updated NESPAD to have CLK idle HIGH instead of idle LOW by [ManCloud](https://github.com/ManCloud). This is a change in the pico_shared submodule. When building from source, make sure you do a **git submodule update --init** from within the source folder to get the latest pico_shared module.
+- Menu now displaying correctly on Pico2 Risc-V builds.
 
-## v0.22
+All changes are the pico_shared submodule. When building from source, make sure you do a **git submodule update --init** from within the source folder to get the latest pico_shared module.
 
-### Features
-
-### Technical changes
-
-- Lots of code is now moved to git module pico_shared. This is code that can be shared between other emulators. This includes the menu system, the SD-card handling, the display handling. Also the code for controller input (NES, Wii-Classic, USB, keyboard) is moved to this module. When building from source, make sure you do a **git submodule update --init** from within the source folder to get the pico_shared module and all the other modules.
-
-### Fixes
-
-- Can now be built for pico w (RP2040). This makes the led blink every 60 frames or when rom is flashed. This only works for the Pico w. Pico2 w (RP2350) is not supported, because it causes screen flicker and ioctl timeouts on the uart console. 
-
-To build for Pico w, use the following commands:
-
-```bash
-# Pimoroni DV Demo Base
-./bld.sh -c1 -w
-# Custom PCB/breadboard
-./bld.sh -c2 -w
-```
-
-
-
-## v0.21
-
-### Features
-
-- For RP2350, Risc-V binaries can be build and are included in the release. In Risc-V there is one display mode missing because the Risc-V assembly code for that display mode is not implemented. The following Risc-V binaries are included in the release:
-  - pico2_riscv_piconesPlusAdaFruitDVISD.uf2
-  - pico2_riscv_piconesPlusPimoroniDV.uf2
-- Displays the hardware type in the menu.
-- updated bld.sh and buildAll.sh scripts to include the Risc-V build. For this to work, you need to have the Risc-V toolchain installed. Depending on your development environment you need to download:
-  - Raspberry Pi OS: https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/riscv-toolchain-14-aarch64-lin.tar.gz
-  - Linux x86/x64: https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/riscv-toolchain-14-x86_64-lin.tar.gz
-    
-  and extract it to $PICO_SDK_PATH/toolchain/RISCV_RPI_2_0_0_2 (create the directory tree if needed)
-
-  To build run:
-  - ./bld.sh -c1 -r -t $PICO_SDK_PATH/toolchain/RISCV_RPI_2_0_0_2/bin
-  - ./bld.sh -c2 -r -t $PICO_SDK_PATH/toolchain/RISCV_RPI_2_0_0_2/bin
- 
-  The first command builds a Risc-V binary for the Pimoroni DV Demo base, the second for the PCB or breadboard with Adafruit hardware.
-- The colors in the menu can be changed and saved:
-  - Select + Up/Down changes the foreground color.
-  - Select + Left/Right changes the background color.
-  - Select + A saves the colors. Screen will flicker when saved.
-  - Select + B resets the colors to default. (Black on white)
-
-### Fixes
-
-- Fix scroll in highlighted menu item.
-- Fix Splash screen shown when exiting a game.
-- Fix in game reset boots back to game in stead of menu.
-
-## v0.20
-
-### Features
-
-- Add support for these USB gamepads:
-  - Sega Mega Drive/Genesis Mini 1 and Mini 2 controllers.
-  - PlayStation Classic controller.
-  - Mantapad, cheap [NES](https://nl.aliexpress.com/w/wholesale-nes-controller-usb.html?spm=a2g0o.home.search.0) and [SNES](https://nl.aliexpress.com/w/wholesale-snes-controller-usb.html?spm=a2g0o.productlist.search.0) USB controllers from AliExpress. When starting a game, it is possible you have to unplug and replug the controller to get it working.
-  - XInput controllers like Xbox 360 and Xbox One controllers. 8bitdo controllers are also XInput controllers and should work. Hold X + Start to switch to XInput mode. (LED 1 and 2 will blink). For Xbox controllers, remove the batteries before connecting the USB cable. Playing with batteries in the controller will work, but can cause the controller to stop working. Sometimes the controller will not work after flashing a game. In that case, unplug the controller and plug it back in. In case of 8bitdo controllers, unplug the controller, hold start to turn it off, then plug it back in. This will make the controller work again.
-- Add USB keyboard support:
-  - A: Select
-  - S: Start
-  - Z: B
-  - X: A
-  - Cursor keys: D-pad
-- When an USB device is connected, the device type is shown at the bottom of the menu. Unsupported devices show as xxxx:xxxx.
-- Minor cosmetic changes to the menu system.
-- Minor changes in PCB design (pico_nesPCB_v2.1.zip)
-  - D3 and D4 of NES controller port 2 are connected to GPIO28 (D3) and GPIO27 (D4), for possible future zapper use.
-  - More ground points are added.
-
-XInput driver: https://github.com/Ryzee119/tusb_XInput by [Ryzee119](https://github.com/Ryzee119) When building from source, make sure you do a **git submodule update --init** from within the source folder to get the XInput driver.
-
-For more details, see the [README](README.md#gamecontroller-support) and [troubleshooting](README.md#troubleshooting-usb-controllers) section
-
-### Fixes
-
-- Improved memory management.
-
-
-## v0.19
-
-### Features
-
-Replaced font in menu system with new more readable font. [@biblioeteca](https://github.com/biblioeteca)
-
-![Screenshot 2024-09-16 07-53-15](https://github.com/user-attachments/assets/0e4b4814-3560-4c34-bbcd-1694621453bc)
-
-### Fixes
-
-- none
-
-
-## v0.18
-
-### Features
-
-- Wii-classic controller now works with WaveShare RP2040-PiZero. [#64](https://github.com/fhoedemakers/pico-infonesPlus/issues/64)
-
-For this to work you need a [Adafruit STEMMA QT / Qwiic JST SH 4-pin Cable with Premium Female Sockets](https://www.adafruit.com/product/4397), a [Adafruit Wii Nunchuck Breakout Adapter - Qwiic](https://www.adafruit.com/product/4836) and a [Wii-classic controller](https://www.amazon.com/s?k=wii-classic+controller)
-
-Connections are as follows:
-
-| Nunchuck Breakout Adapter | RP2040-PiZero |
-| ---------------------- | ------------ |
-| 3.3V                   | 3V3          |
-| GND                    | GND          |
-| SDA                    | GPIO2        |
-| SCL                    | GPIO3        |
-
-
-### Fixes
-
-- none
-
-# Release notes
-
-## v0.17
-
-### Features
-
-- Introducing redesigned PCB. (V2.0) with two NES controller ports for 1 or 2-player games. Design by [@johnedgarpark](https://twitter.com/johnedgarpark)
-
-### Fixes
-
-- none
-
-## v0.16
-
-### Features
-
-Added support for Raspberry Pi Pico 2 using these configurations:
-
-- Pimoroni Pico DV Demo Base: pico2_piconesPlusPimoroniDV.uf2
-- Custom PCB: pico2_piconesPlusAdaFruitDVISD.uf2
-- BreadBoard: pico2_piconesPlusAdaFruitDVISD.uf2
-
-
-### Fixes
-
-- When SD card mount fails, do not load settings.
-
-## v0.15
-
-Nothing changed, except Pico SDK 2.0.0 is now used for building the executables.
-
-## v0.14
-
-### Features
-
-For two player games. When a USB controller is connected, you can connect a NES controller to either Port 1 or Port 2.  
-The USB controller is always player 1, the NES controller on Port 1 or Port 2 is player 2. 
-In this situation you don't need an extra NES controller port wired for port 2 for playing two player games. The controller connected to port 1 can then be used for player two.
-
-When no USB controller is connected. You can use two NES controllers for two player games. Port 1 is player 1, Port 2 is Player 2.
-
-| | Player 1 | Player 2 |
-| --- | -------- | -------- |
-| USB controller connected | USB | NES port 1 or NES port 2 |
-| No usb controller connected | NES port 1| NES port 2 |
-
-Updated README for two player setup.
-
-### Fixes
-
-- none
-
-## v0.13
-
-### Features
-
-- Two player games can now be played. An extra NES controller port can be added to any configuration. Controller port 1 can be a USB or NES controller, controller 2 must be a NES controller. At the moment, no second USB controller can be connected.
-
-### Fixes
-
-- none
-
-### Technical changes:
-
-- Pimoroni Pico DV Demo Base: uart output fore debug printf messages is disabled, because gpio1 is needed for the second NES controller port.
-
-
-## v0.12
-
-### Features
-
-- Some settings are now saved to SD card. This includes the selected screen mode, chosen with Select+Up or Select+Down [#42](https://github.com/fhoedemakers/pico-infonesPlus/issues/42) and the last chosen menu selection. [#46](https://github.com/fhoedemakers/pico-infonesPlus/issues/46). Settings are written to /settings.dat on the SD-card. When screen mode is changed, this will be automatically saved. The causes some red flicker due to the delay it causes.
-
-### Fixes
-
-- none
-
-### Technical changes:
-
-- Update BuildAndRelease.yml to use self-hosted runner instead of GitHub hosted runner.
-- pico_lib now linked to the latest release. This fixes compiler errors in more recent versions of gcc. [https://github.com/shuichitakano/pico_lib/tree/master](https://github.com/shuichitakano/pico_lib/tree/master)
-
-
-## v0.11
-
-### Features
-
-- Display program version in lower right corner of the menu
-
-
-## v0.10
-
-### Features
-
-- none
-
-### Fixes
-
-- Fixed menu colors not displaying correctly. Using NES color palette properly now.
-
-## v0.9
-
-### Features
-
-- Added support for [Waveshare RP2040-PiZero Development Board](https://www.waveshare.com/rp2040-pizero.htm)
-
-### Fixes
-
-- Some minor code changes.
-
-## v0.8
-
-### Features
-
-- Added support for [Adafruit feather RP2040 DVI](https://www.adafruit.com/product/5710) and WII-Classic controller by @PaintYourDragon 
-
-### Fixes
-
-- Removed unused mapper 6 to conserve memory #22  @kholia 
-- Now works with latest Pico SDK 1.5 #7 @kholia 
-- Added framerate toggle #20 @fhoedemakers
-- Sound not working properly when using Pico SDK 1.5 #21 by @shuichitakano
-- Moved nes rom flashing from menu.cpp to main.cpp in order to prevent locking up the Feather RP2040 DVI when using the WII-Classic controller. @fhoedemakers 
diff --git a/main.cpp b/main.cpp
@@ -607,7 +607,6 @@ int main()
     {
         if (strlen(selectedRom) == 0)
         {
-            scaleMode8_7_ = Frens::applyScreenMode(ScreenMode::NOSCANLINE_8_7);
             menu("Pico-InfoNES+", ErrorMessage, isFatalError, showSplash, ".nes"); // never returns, but reboots upon selecting a game
         }
         printf("Now playing: %s\n", selectedRom);
diff --git a/splash.cpp b/splash.cpp
@@ -19,7 +19,7 @@ void splash()
     putText((SCREEN_COLS / 2 - (strlen(s)) / 2) + 9, 2, "S", CBLUE, bgcolorSplash);
     putText((SCREEN_COLS / 2 - (strlen(s)) / 2) + 10, 2, "+", fgcolorSplash, bgcolorSplash);
 
-    strcpy(s, "NES emulator for RP2040");
+    strcpy(s, "NES emulator for RP2040/2350");
     putText(SCREEN_COLS / 2 - strlen(s) / 2, 3, s, fgcolorSplash, bgcolorSplash);
     strcpy(s, "Emulator");
     putText(SCREEN_COLS / 2 - strlen(s) / 2, 5, s, fgcolorSplash, bgcolorSplash);
@@ -51,5 +51,5 @@ void splash()
     strcpy(s, "https://github.com/");
     putText(SCREEN_COLS / 2 - strlen(s) / 2, 25, s, CLIGHTBLUE, bgcolorSplash);
     strcpy(s, "fhoedemakers/pico-infonesPlus");
-    putText(1, 26, s, CLIGHTBLUE, bgcolorSplash);
+    putText(SCREEN_COLS / 2 - strlen(s) / 2, 26, s, CLIGHTBLUE, bgcolorSplash);
 }

Original file line number	Diff line number	Diff line change
`@@ -607,7 +607,6 @@ int main()`
`607`	`607`	`{`
`608`	`608`	`if (strlen(selectedRom) == 0)`
`609`	`609`	`{`
`610`		`- scaleMode8_7_ = Frens::applyScreenMode(ScreenMode::NOSCANLINE_8_7);`
`611`	`610`	`menu("Pico-InfoNES+", ErrorMessage, isFatalError, showSplash, ".nes"); // never returns, but reboots upon selecting a game`
`612`	`611`	`}`
`613`	`612`	`printf("Now playing: %s\n", selectedRom);`