Fix for newer boards ("21-2-20") on 320x240 mode

Author: dcrespo3d

Diff for: README.md

@@ -1,6 +1,6 @@
 # ZX-ESPectrum-Wiimote
 
-**IMPORTANT: as of december 2022, I have learned that some boards sold recently don't handle well the 4:3 (320x240) mode. I have set the 16:9 mode as the default. If you have one of these boards and try the 4:3 mode, you will get no picture, and you will need to Upload Filesystem Image (for internal storage) or to manually edit the boot.cfg (for external storage, in the SD card) and set asp169 to true.**
+**IMPORTANT: as of december 2022, I have learned that some boards sold recently (with text "21-2-20" on the board serigraphy) don't handle the 320x240 (4:3) mode correctly. I have set the 16:9 mode as the default. If you have one of these boards and try the 4:3 mode, you will get no picture. There is a flag FIX_320_240_TTGO_21 in hardconfig.h which you can uncomment, which activates some hardcoded values on Bitluni's VGA library and seem to do the trick.**
 
 **IMPORTANT: this branch is for running on a Lilygo TTGo vga32 board.**
 

Diff for: include/hardconfig.h

@@ -61,6 +61,15 @@
 
 //#define BORDER_EFFECTS
 
+///////////////////////////////////////////////////////////////////////////////
+// Fix for 320x240 (4:3) mode on TTGO boards with "21-2-20" serigraphy.
+//
+// #define FIX_320_240_TTGO_21 for skipping Bitluni's APLL values calculation
+// and use a hardcoded set of values
+///////////////////////////////////////////////////////////////////////////////
+
+// #define FIX_320_240_TTGO_21
+
 ///////////////////////////////////////////////////////////////////////////////
 // Video output switch
 //

Diff for: src/ESP32Lib/I2S/I2S.cpp

@@ -16,6 +16,9 @@
 
 i2s_dev_t *i2sDevices[] = {&I2S0, &I2S1};
 
+#include "../../../include/hardconfig.h"
+#include "../../../include/Config.h"
+
 I2S::I2S(const int i2sIndex)
 {
 	const periph_module_t deviceModule[] = {PERIPH_I2S0_MODULE, PERIPH_I2S1_MODULE};
@@ -325,7 +328,15 @@ bool I2S::initParallelOutputMode(const int *pinMap, long sampleRate, const int b
 		//sdm = 0xA1fff;
 		//odir = 0;
 		if(sdm > 0xA1fff) sdm = 0xA1fff;
+
+	#ifndef FIX_320_240_TTGO_21
 		rtc_clk_apll_enable(true, sdm & 255, (sdm >> 8) & 255, sdm >> 16, odir);
+	#else
+		if (Config::aspect_16_9)
+			rtc_clk_apll_enable(true, sdm & 255, (sdm >> 8) & 255, sdm >> 16, odir);
+		else
+			rtc_clk_apll_enable(true, 0xA, 0x57, 0x7, 0x7);	// thanks, @ackerman!
+	#endif
 	}
 
 	i2s.clkm_conf.val = 0;
@@ -395,7 +406,14 @@ void I2S::setAPLLClock(long sampleRate, int bitCount)
 	//sdm = 0xA1fff;
 	//odir = 0;
 	if(sdm > 0xA1fff) sdm = 0xA1fff;
-	rtc_clk_apll_enable(true, sdm & 255, (sdm >> 8) & 255, sdm >> 16, odir);
+	#ifndef FIX_320_240_TTGO_21
+		rtc_clk_apll_enable(true, sdm & 255, (sdm >> 8) & 255, sdm >> 16, odir);
+	#else
+		if (Config::aspect_16_9)
+			rtc_clk_apll_enable(true, sdm & 255, (sdm >> 8) & 255, sdm >> 16, odir);
+		else
+			rtc_clk_apll_enable(true, 0xA, 0x57, 0x7, 0x7);	// thanks, @ackerman!
+	#endif
 }
 
 void I2S::setClock(long sampleRate, int bitCount, bool useAPLL)