Merge pull request #166 from fhoedemakers/nesfixmurmulator

Fixes for controller and PSRAM issues murmulator M1/M2

Author: fhoedemakers

CHANGELOG.md

@@ -8,11 +8,15 @@
 
 [See setup section in readme how to install and wire up](https://github.com/fhoedemakers/pico-infonesPlus#pico-setup)
 
-# vx.xx release notes ( To be releasesd)
+# v0.35 release notes
 
 ## Fixes
 
-- The -s option (PSRAM cs pin) is removed from pico_shared/bld.sh script as it caused issues with the PSRAM settings in pico_shared/BoardConfigs.cmake. The CS pin must be set correctly in pico_shared/BoardConfigs.cmake. (default is 47)
+- The -s option (PSRAM cs pin) is removed from pico_shared/bld.sh script as it caused issues with the PSRAM settings in pico_shared/BoardConfigs.cmake. The PSRAM CS pin must be set correctly in pico_shared/BoardConfigs.cmake. (default is 47)
+- Murmulator M1 and M2 fixes [#165](https://github.com/fhoedemakers/pico-infonesPlus/issues/165):
+  - Second NES controller now works.
+  - PS_RAM setting fixed for M2 board.
+  - PS_RAM setting added for M1 board.
 
 # v0.34 release notes
 

CMakeLists.txt

@@ -46,7 +46,7 @@ IF(NOT CMAKE_BUILD_TYPE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 message("* Current build type is : ${CMAKE_BUILD_TYPE}")
 if (NOT HW_CONFIG)
-    set(HW_CONFIG 1 CACHE STRING "Select the hardware configuration for your board")      
+    set(HW_CONFIG 2 CACHE STRING "Select the hardware configuration for your board")      
 endif()
 if (NOT USE_HSTX)
     set(USE_HSTX 1 CACHE STRING "Use HSTX for display output when possible")