queue external commands, LEDMatrix display

Author: retroelec

.github/workflows/build.yml

@@ -59,6 +59,9 @@ jobs:
           - board: CYD
             keyboard: NO_KEYBOARD
             fqbn: "esp32:esp32:esp32:FlashMode=qio,FlashSize=4M,PartitionScheme=huge_app,LoopCore=0,DebugLevel=info"
+          - board: LEDMATRIX
+            keyboard: BLE_KEYBOARD
+            fqbn: "esp32:esp32:esp32s3:CDCOnBoot=cdc,FlashSize=8M,PSRAM=enabled,PartitionScheme=default_8MB"
 
     steps:
       - name: Checkout Code

Makefile

@@ -2,42 +2,50 @@
 #BOARD := T_HMI
 #BOARD := T_DISPLAY_S3
 #BOARD := WAVESHARE
-BOARD := CYD
+#BOARD := CYD
+BOARD := LEDMATRIX
 
 # choose keyboard
-#KEYBOARD := BLE_KEYBOARD
+KEYBOARD := BLE_KEYBOARD
 #KEYBOARD := WEB_KEYBOARD
-KEYBOARD := NO_KEYBOARD
+#KEYBOARD := NO_KEYBOARD
 
-ifeq ($(BOARD),CYD)
-  ifneq ($(KEYBOARD),NO_KEYBOARD)
+ifeq ($(BOARD), CYD)
+  ifneq ($(KEYBOARD), NO_KEYBOARD)
     $(error FEHLER: If BOARD is set to CYD, KEYBOARD MUST have the value NO_KEYBOARD. (current: $(KEYBOARD)))
   endif
 endif
 
 UNAME_S := $(shell uname -s)
 
 # choose port
-ifeq ($(UNAME_S),Linux)
-  ifeq ($(BOARD),CYD)
+ifeq ($(UNAME_S), Linux)
+  ifeq ($(BOARD), CYD)
     PORT := /dev/ttyUSB0
   else
     PORT := /dev/ttyACM0
   endif
-else ifeq ($(UNAME_S),Darwin)
+else ifeq ($(UNAME_S), Darwin)
   PORT := /dev/tty.usbmodem1101
 endif
 
 ALLBOARDS := T_HMI T_DISPLAY_S3 WAVESHARE
 ALLKEYBOARDS := BLE_KEYBOARD WEB_KEYBOARD
 
+BUILD_EXTRA_FLAGS := -DBOARD_$(BOARD) -DUSE_$(KEYBOARD) -DESP32
+
 ifeq ($(BOARD), WAVESHARE)
   FQBN := esp32:esp32:esp32s3:CDCOnBoot=cdc,DFUOnBoot=dfu,FlashSize=16M,JTAGAdapter=builtin,PartitionScheme=app3M_fat9M_16MB,PSRAM=opi,DebugLevel=info
+  BUILD_EXTRA_FLAGS += -DBOARD_HAS_PSRAM
+else ifeq ($(BOARD), LEDMATRIX)
+  FQBN := esp32:esp32:esp32s3:CDCOnBoot=cdc,FlashSize=8M,PSRAM=enabled,PartitionScheme=default_8MB
+  BUILD_EXTRA_FLAGS += -DBOARD_HAS_PSRAM
 else
   ifeq ($(BOARD),CYD)
     FQBN := esp32:esp32:esp32:FlashMode=qio,FlashSize=4M,PartitionScheme=huge_app,LoopCore=0,DebugLevel=info
   else
     FQBN := esp32:esp32:esp32s3:CDCOnBoot=cdc,DFUOnBoot=dfu,FlashSize=16M,JTAGAdapter=builtin,PartitionScheme=huge_app,PSRAM=opi,DebugLevel=info
+    BUILD_EXTRA_FLAGS += -DBOARD_HAS_PSRAM
   endif
 endif
 
@@ -49,7 +57,7 @@ HEADERFILES := $(shell find src -name '*.h')
 
 TARGET := build-$(BOARD)-$(KEYBOARD)/T-HMI-C64.ino.elf
 
-CLI_COMPILE := compile --warnings all --fqbn $(FQBN) --build-property "build.extra_flags=-DBOARD_$(BOARD) -DUSE_$(KEYBOARD) -DESP32" --build-path build-$(BOARD)-$(KEYBOARD) T-HMI-C64.ino
+CLI_COMPILE := compile --warnings all --fqbn $(FQBN) --build-property "build.extra_flags=$(BUILD_EXTRA_FLAGS)" --build-path build-$(BOARD)-$(KEYBOARD) T-HMI-C64.ino
 
 # -DESP32 is needed for ESP_Async_WebServer, Async_TCP
 $(TARGET):	T-HMI-C64.ino $(SOURCEFILES) $(HEADERFILES)
@@ -69,6 +77,8 @@ compileAll:
 	done
 	echo "\nCompiling for Board: CYD"; \
 	$(MAKE) clean compile BOARD=CYD KEYBOARD=NO_KEYBOARD || exit $$?; \
+	echo "\nCompiling for LEDMatrix"; \
+	$(MAKE) clean compile BOARD=LEDMATRIX KEYBOARD=BLE_KEYBOARD || exit $$?; \
 
 # first you have to get the docker image:
 # podman pull docker.io/retroelec42/arduino-cli-thmic64:latest
@@ -94,11 +104,14 @@ install:	check_install
 	arduino-cli config set network.connection_timeout 600s
 	arduino-cli core update-index
 	arduino-cli core install esp32:esp32@3.2.0
-	arduino-cli lib install ArduinoJson
+	arduino-cli lib install ArduinoJson # used to read config file
 	arduino-cli config set library.enable_unsafe_install true
-	arduino-cli lib install --git-url https://github.com/ESP32Async/AsyncTCP.git
-	arduino-cli lib install --git-url https://github.com/ESP32Async/ESPAsyncWebServer.git
-	arduino-cli lib install --git-url https://github.com/devyte/ESPAsyncDNSServer.git
+	arduino-cli lib install --git-url https://github.com/ESP32Async/AsyncTCP.git # used for web keyboard
+	arduino-cli lib install --git-url https://github.com/ESP32Async/ESPAsyncWebServer.git # used for web keyboard
+	arduino-cli lib install --git-url https://github.com/devyte/ESPAsyncDNSServer.git # used for web keyboard
+	arduino-cli lib install --git-url https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA.git # used for LED matrix panel
+	arduino-cli lib install --git-url https://github.com/adafruit/Adafruit-GFX-Library.git # used for LED matrix panel
+	arduino-cli lib install --git-url https://github.com/adafruit/Adafruit_BusIO # used for LED matrix panel
 
 check_install:
 	@echo -n "Are you sure? [y/N] " && read ans && [ $${ans:-N} = y ]

README.md

@@ -1,9 +1,10 @@
-# C64 Emulator for ESP32-S3 (and ESP32) with "Android BLE keyboard" or "Web keyboard" (Lilygo T-HMI, Lilygo T-Display S3 AMOLED, Waveshare ESP32-S3-LCD-2.8, CYD)
+# C64 Emulator for ESP32-S3 (and ESP32) with "Android BLE keyboard" or "Web keyboard"
 
 A C64 emulator developed for the  [Lilygo T-HMI](https://lilygo.cc/products/t-hmi?srsltid=AfmBOorPecASXq7SyOqsX45fdQunicyf2Bg8MDc_GLFPwDzk0vfWwCg7) development board, featuring an ESP32-S3 chip, a 2.8-inch touch LCD, and an SD card slot.
 The emulator was later expanded to support the
 [Lilygo T-Display S3 AMOLED](https://lilygo.cc/products/t-display-s3-amoled?srsltid=AfmBOoq3R6k7Wx7UcW6C1HozzFvwgN2AkHtXgrbJKdD2U9mv75vTSvJI), the [ESP32-S3-LCD-2.8 from Waveshare](https://www.waveshare.com/product/esp32-s3-touch-lcd-2.8.htm)
 and the [ESP32 CYD board](https://github.com/witnessmenow/ESP32-Cheap-Yellow-Display).
+The emulator is also running on an ESP32-S3-WROOM with a 64x64 LED matrix panel.
 
 Keyboard input is implemented via a custom Android app or via a web interface.  
 The Android app communicates with the emulator via Bluetooth Low Energy (BLE).
@@ -20,10 +21,8 @@ Contact: retroelec42@gmail.com
 
 ## News
 
+- Support for LED matrix panel
 - Support for CYD board
-- "Joystick-only” operation
-- Enclosure for the Waveshare Board by uliuc@gmx.net
-- Web keyboard by uliuc@gmx.net
 
 ## Hardware
 
@@ -130,6 +129,44 @@ Joystick connections:
 
 Switch voltage to 3.3V on the Arduino joystick module.
 
+### ESP32-S3-WROOM with a 64x64 LED matrix panel
+
+The following pins of a standard ESP32-S3-WROOM module are connected to a 64x64 LED matrix panel as follows:
+
+| Wroom pin | HUB75 pin |
+| --------- | --------- |
+| 4         | R1        |
+| 5         | B1        |
+| 6         | R2        |
+| 7         | B2        |
+| 15        | CH_A      |
+| 16        | CH_C      |
+| 41        | CLK       |
+| 39        | OE        |
+| 17        | G1        |
+| GND       | GND       |
+| 18        | G2        |
+| 8         | CH_E      |
+| 3         | CH_B      |
+| 46        | CH_D      |
+| 40        | LAT       |
+| GND       | GND       |
+
+Because the resolution of the LED matrix display is too small, either only a section is displayed or it is "scaled".
+The following modes are available:
+
+- pixel area follows sprite (slow)
+- pixel area follows sprite (fast)
+- scale mode "merge x pixels"
+- scale mode "extract each x. pixel"
+
+The modes can be changed using the BLE keyboard, DIV screen, SPECIAL1 button.
+For the "pixel area follows sprite" modes the sprite to be followed can be determined using the BLE keyboard, DIV screen, SPECIAL2 button.
+
+<img src="doc/ledmatrix_miner_area.png" alt="ledmatrix_miner_area" width="800"/>
+<img src="doc/ledmatrix_loderun_area.png" alt="ledmatrix_loderun_area" width="800"/>
+<img src="doc/ledmatrix_frogger_scaled.png" alt="ledmatrix_frogger_scaled" width="800"/>
+
 </details>
 
 ## Installation

THMIC64KB/app/build.gradle

@@ -3,12 +3,12 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    compileSdk 36
 
     defaultConfig {
         applicationId "org.retroelec.thmic64kb"
-        minSdk 26
-        targetSdk 32
+        minSdk 33
+        targetSdk 33
         versionCode 1
         versionName "1.0"
 
@@ -29,6 +29,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'org.retroelec.thmic64kb'
 }
 
 dependencies {
@@ -37,6 +38,6 @@ dependencies {
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }

THMIC64KB/app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.retroelec.thmic64kb">
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
@@ -12,7 +11,7 @@
 
     <application
         android:name=".MyApplication"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/thmic64kb"
         android:label="THMIC64KB"
         android:roundIcon="@mipmap/thmic64kb_round"

THMIC64KB/app/src/main/java/org/retroelec/thmic64kb/Config.java

@@ -56,4 +56,7 @@ public class Config {
     public static final byte SETVOLUME = 33;
     public static final byte ATTACHD64 = 37;
     public static final byte DETACHD64 = 38;
+    public static final byte PAUSE = 40;
+    public static final byte SPECIAL1 = 43;
+    public static final byte SPECIAL2 = 44;
 }

THMIC64KB/app/src/main/java/org/retroelec/thmic64kb/DivActivity.java

@@ -31,7 +31,7 @@
 public class DivActivity extends AppCompatActivity implements SettingsObserver, NotificationObserver {
     private Switch toggleDeactivateTempSwitch;
     private Switch toggleSendRawKeyCodes;
-    private Switch toggleDebug;
+    // private Switch toggleDebug;
     private Switch togglePerf;
     private Switch toggleDetectReleaseKey;
     private Slider volumeSlider;
@@ -204,14 +204,13 @@ public void updateSettings() {
         runOnUiThread(() -> {
             toggleDeactivateTempSwitch.setChecked(settings.isDeactivateTemp());
             toggleSendRawKeyCodes.setChecked(settings.isSendRawKeyCodes());
-            toggleDebug.setChecked(settings.isDebug());
+            // toggleDebug.setChecked(settings.isDebug());
             togglePerf.setChecked(settings.isPerf());
             toggleDetectReleaseKey.setChecked(settings.isDetectReleaseKey());
             volumeSlider.setValue(settings.getVolume() * 100 / 255);
             if (settings.isd64attached()) {
                 keyattach.setBackgroundColor(Config.KEYBGDCOLORD64ATTACHED);
-            }
-            else {
+            } else {
                 keyattach.setBackgroundColor(Config.KEYBGDCOLORACTION);
             }
         });
@@ -288,8 +287,8 @@ protected void onCreate(Bundle savedInstanceState) {
         toggleSendRawKeyCodes = findViewById(R.id.toggleSendRawKeyCodes);
         toggleSendRawKeyCodes.setOnClickListener(v -> bleUtils.send(new byte[]{Config.SENDRAWKEYS, (byte) 0x00, (byte) 0x80}, false));
 
-        toggleDebug = findViewById(R.id.toggleDebug);
-        toggleDebug.setOnClickListener(v -> bleUtils.send(new byte[]{Config.SWITCHDEBUG, (byte) 0x00, (byte) 0x80}, false));
+//        toggleDebug = findViewById(R.id.toggleDebug);
+//        toggleDebug.setOnClickListener(v -> bleUtils.send(new byte[]{Config.SWITCHDEBUG, (byte) 0x00, (byte) 0x80}, false));
 
         togglePerf = findViewById(R.id.togglePerf);
         togglePerf.setOnClickListener(v -> bleUtils.send(new byte[]{Config.SWITCHPERF, (byte) 0x00, (byte) 0x80}, false));
@@ -337,17 +336,19 @@ protected void onCreate(Bundle savedInstanceState) {
         final Button send = findViewById(R.id.send);
         send.setOnClickListener(view -> openFilePicker());
 
-        final Button keystatus = findViewById(R.id.keystatus);
-        keystatus.setOnClickListener(view -> {
-            Intent i = new Intent(this, StatusActivity.class);
-            startActivity(i);
-        });
-
-        final Button keymemory = findViewById(R.id.keymemory);
-        keymemory.setOnClickListener(view -> {
-            Intent i = new Intent(this, MemoryActivity.class);
-            startActivity(i);
-        });
+        final Button keyspecial1 = findViewById(R.id.keyspecial1);
+        keyspecial1.setOnTouchListener(bleUtils.createButtonTouchListener(keyspecial1, new byte[]{Config.SPECIAL1, (byte) 0x00, (byte) 0x80}, Config.KEYSELECTEDCOLORACTION, Config.KEYBGDCOLORACTION, true));
+//        keyspecial1.setOnClickListener(view -> {
+//            Intent i = new Intent(this, StatusActivity.class);
+//            startActivity(i);
+//        });
+
+        final Button keyspecial2 = findViewById(R.id.keyspecial2);
+        keyspecial2.setOnTouchListener(bleUtils.createButtonTouchListener(keyspecial2, new byte[]{Config.SPECIAL2, (byte) 0x00, (byte) 0x80}, Config.KEYSELECTEDCOLORACTION, Config.KEYBGDCOLORACTION, true));
+//        keyspecial2.setOnClickListener(view -> {
+//            Intent i = new Intent(this, MemoryActivity.class);
+//            startActivity(i);
+//        });
 
         final Button keysave = findViewById(R.id.keysave);
         keysave.setOnTouchListener(bleUtils.createButtonTouchListener(keysave, new byte[]{Config.SAVE, (byte) 0x00, (byte) 0x80}, Config.KEYSELECTEDCOLORACTION, Config.KEYBGDCOLORACTION, true));

THMIC64KB/app/src/main/res/layout/div.xml

@@ -23,11 +23,11 @@
             android:layout_height="wrap_content"
             android:text="Commando hack" />
 
-        <Switch
+        <!--Switch
             android:id="@+id/toggleDebug"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Monitor CPU" />
+            android:text="Monitor CPU" /-->
 
         <Switch
             android:id="@+id/togglePerf"
@@ -82,26 +82,29 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="10dp"
             android:layout_weight="1"
+            android:backgroundTint="#cc7777"
             android:text="SENDPRG"
             android:theme="@style/ButtonTheme" />
 
         <Button
-            android:id="@+id/keystatus"
+            android:id="@+id/keyspecial1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
             android:layout_weight="1"
-            android:text="STATUS"
+            android:backgroundTint="#cc7777"
+            android:text="SPECIAL1"
             android:theme="@style/ButtonTheme" />
 
         <Button
-            android:id="@+id/keymemory"
+            android:id="@+id/keyspecial2"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:layout_weight="1"
-            android:text="MEMORY"
+            android:backgroundTint="#cc7777"
+            android:text="SPECIAL2"
             android:theme="@style/ButtonTheme" />
 
         <TextView

THMIC64KB/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.0.4"
+        classpath 'com.android.tools.build:gradle:8.13.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -14,4 +14,4 @@ buildscript {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}

THMIC64KB/gradle.properties

@@ -16,4 +16,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false