Merge pull request #25 from esp-cpp/feature/save-state-selection

Save State Selection UI and Refactor
esp-cpp · May 8, 2023 · e8f281a · e8f281a
2 parents 07ac94e + a238405
commit e8f281a
Show file tree

Hide file tree

Showing 240 changed files with 11,727 additions and 4,538 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,6 @@ build/
 sdkconfig
 sdkconfig.old
 .DS_Store
-squareline/backup
+**/squareline/backup
 flash_data/
 *-backups/
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "components/jpegdec"]
 	path = components/jpegdec
 	url = [email protected]:bitbank2/JPEGDEC
+[submodule "components/jpegenc"]
+	path = components/jpegenc
+	url = [email protected]:esp-cpp/JPEGENC
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,19 +10,19 @@ set(EXTRA_COMPONENT_DIRS
 )
 
 ### NES ###
-set(NES_COMPONENTS "nofrendo nofrendo-esp32")
+set(NES_COMPONENTS "nes")
 
 ### GBC ###
-set(GBC_COMPONENTS "gnuboy")
+set(GBC_COMPONENTS "gbc")
 
 ### SMS ###
-# set(SMS_COMPONENTS "smsplus")
+# set(SMS_COMPONENTS "sms")
 
 add_compile_definitions(BOARD_HAS_PSRAM)
 
 set(
   COMPONENTS
-  "main esptool_py fatfs esp_littlefs esp_lcd esp_psram task format display display_drivers monitor esp-idf-cxx ${NES_COMPONENTS} ${GBC_COMPONENTS} ${SMS_COMPONENTS} box-emu-hal gui"
+  "main esptool_py esp_lcd esp_psram task format display display_drivers monitor esp-idf-cxx ${NES_COMPONENTS} ${GBC_COMPONENTS} ${SMS_COMPONENTS} box-emu-hal gui menu"
   CACHE STRING
   "List of components to include"
   )

diff --git a/boxart/batman_the_animated_series.jpg b/boxart/batman_the_animated_series.jpg
diff --git a/boxart/duck_tales.jpg b/boxart/duck_tales.jpg
diff --git a/boxart/final_fantasy.jpg b/boxart/final_fantasy.jpg
diff --git a/boxart/final_fantasy_adventure.jpg b/boxart/final_fantasy_adventure.jpg
diff --git a/boxart/final_fantasy_ii.jpg b/boxart/final_fantasy_ii.jpg
diff --git a/boxart/final_fantasy_iii.jpg b/boxart/final_fantasy_iii.jpg
diff --git a/boxart/harvest_moon.jpg b/boxart/harvest_moon.jpg
diff --git a/boxart/harvest_moon_gbc.jpg b/boxart/harvest_moon_gbc.jpg
diff --git a/boxart/mario_golf.jpg b/boxart/mario_golf.jpg
diff --git a/boxart/mario_open_golf.jpg b/boxart/mario_open_golf.jpg
diff --git a/boxart/mario_tennis.jpg b/boxart/mario_tennis.jpg
diff --git a/boxart/metal_gear.jpg b/boxart/metal_gear.jpg
diff --git a/boxart/metal_gear_solid.jpg b/boxart/metal_gear_solid.jpg
diff --git a/boxart/metroid_2_return_of_samus.jpg b/boxart/metroid_2_return_of_samus.jpg
diff --git a/boxart/source/batman_the_animated_series.jpg b/boxart/source/batman_the_animated_series.jpg
diff --git a/boxart/source/duck_tales.jpg b/boxart/source/duck_tales.jpg
diff --git a/boxart/source/final_fantasy.jpg b/boxart/source/final_fantasy.jpg
diff --git a/boxart/source/final_fantasy_adventure.jpg b/boxart/source/final_fantasy_adventure.jpg
diff --git a/boxart/source/final_fantasy_ii.jpg b/boxart/source/final_fantasy_ii.jpg
diff --git a/boxart/source/final_fantasy_iii.jpg b/boxart/source/final_fantasy_iii.jpg
diff --git a/boxart/source/harvest_moon.jpg b/boxart/source/harvest_moon.jpg
diff --git a/boxart/source/harvest_moon_gbc.jpg b/boxart/source/harvest_moon_gbc.jpg
diff --git a/boxart/source/mario_golf.jpg b/boxart/source/mario_golf.jpg
diff --git a/boxart/source/mario_open_golf.jpg b/boxart/source/mario_open_golf.jpg
diff --git a/boxart/source/mario_tennis.jpg b/boxart/source/mario_tennis.jpg
diff --git a/boxart/source/metal_gear.jpg b/boxart/source/metal_gear.jpg
diff --git a/boxart/source/metal_gear_solid.jpg b/boxart/source/metal_gear_solid.jpg
diff --git a/boxart/source/metroid_2_return_of_samus.jpg b/boxart/source/metroid_2_return_of_samus.jpg
diff --git a/boxart/source/tloz_oracle_ages.jpg b/boxart/source/tloz_oracle_ages.jpg
diff --git a/boxart/source/tloz_oracle_seasons.jpg b/boxart/source/tloz_oracle_seasons.jpg
diff --git a/boxart/tloz_oracle_ages.jpg b/boxart/tloz_oracle_ages.jpg
diff --git a/boxart/tloz_oracle_seasons.jpg b/boxart/tloz_oracle_seasons.jpg
diff --git a/components/ads1x15/CMakeLists.txt b/components/ads1x15/CMakeLists.txt
diff --git a/components/ads1x15/include/ads1x15.hpp b/components/ads1x15/include/ads1x15.hpp
diff --git a/components/ads1x15/src/ads1x15.cpp b/components/ads1x15/src/ads1x15.cpp
diff --git a/components/box-emu-hal/CMakeLists.txt b/components/box-emu-hal/CMakeLists.txt
@@ -1,5 +1,5 @@
 idf_component_register(
   INCLUDE_DIRS "include"
   SRC_DIRS "src"
-  REQUIRES "driver" "heap" "esp_lcd" "esp_psram" "spi_flash" "nvs_flash" "codec" "display" "display_drivers" "controller" "mcp23x17" "ads1x15" "qwiicnes" "input_drivers" "ft5x06" "tt21100" "drv2605"
+  REQUIRES "driver" "heap" "fatfs" "esp_littlefs" "esp_lcd" "esp_psram" "spi_flash" "nvs_flash" "codec" "display" "display_drivers" "controller" "mcp23x17" "ads1x15" "qwiicnes" "input_drivers" "ft5x06" "tt21100" "drv2605" "event_manager"
   )
diff --git a/main/fs_init.hpp → components/box-emu-hal/include/fs_init.hpp b/main/fs_init.hpp → components/box-emu-hal/include/fs_init.hpp
@@ -15,7 +15,4 @@
 #define MOUNT_POINT "/sdcard"
 #endif
 
-#define DEFAULT_MODE      S_IRWXU | S_IRGRP |  S_IXGRP | S_IROTH | S_IXOTH
-
-bool mkdirp(const char* path, mode_t mode = DEFAULT_MODE);
 void fs_init();
diff --git a/components/box-emu-hal/include/hal_events.hpp b/components/box-emu-hal/include/hal_events.hpp
@@ -0,0 +1,6 @@
+#pragma once
+
+#include "event_manager.hpp"
+
+extern const std::string mute_button_topic;
+extern const std::string video_setting_topic;
diff --git a/components/box-emu-hal/include/i2c.hpp b/components/box-emu-hal/include/i2c.hpp
@@ -15,4 +15,3 @@ void i2c_read_internal_bus(uint8_t dev_addr, uint8_t* read_data, size_t read_len
 
 void i2c_write_external_bus(uint8_t dev_addr, uint8_t *data, size_t len);
 void i2c_read_external_bus(uint8_t dev_addr, uint8_t reg_addr, uint8_t *read_data, size_t read_len);
-void i2c_read_external_bus(uint8_t dev_addr, uint8_t* read_data, size_t read_len);
diff --git a/components/box-emu-hal/include/i2s_audio.h b/components/box-emu-hal/include/i2s_audio.h
@@ -12,6 +12,11 @@ extern "C" {
 void audio_init();
 int16_t* get_audio_buffer();
 void audio_play_frame(uint8_t *data, uint32_t num_bytes);
+
+bool is_muted();
+void set_muted(bool mute);
+
+int get_audio_volume();
 void set_audio_volume(int percent);
 
 #ifdef __cplusplus

diff --git a/components/box-emu-hal/include/input.h b/components/box-emu-hal/include/input.h
@@ -20,11 +20,8 @@ extern "C"
   };
 
   void init_input();
-  bool read_joystick(float *x, float *y);
   void get_input_state(struct InputState *state);
   void touchpad_read(unsigned char *num_touch_points, unsigned short* x, unsigned short* y, unsigned char* btn_state);
-  void reset_user_quit();
-  bool user_quit();
 
 #ifdef __cplusplus
 }

diff --git a/components/box-emu-hal/include/mmap.hpp b/components/box-emu-hal/include/mmap.hpp
@@ -5,10 +5,11 @@
 
 #include <esp_err.h>
 #include "nvs_flash.h"
+#include "spi_flash_mmap.h"
 #include "esp_partition.h"
 
 #include "format.hpp"
 
 void init_memory();
-size_t copy_romdata_to_nesgame_partition(const std::string& rom_filename);
+size_t copy_romdata_to_cart_partition(const std::string& rom_filename);
 uint8_t *get_mmapped_romdata();
diff --git a/components/box-emu-hal/include/spi_lcd.h b/components/box-emu-hal/include/spi_lcd.h
@@ -27,7 +27,7 @@ extern "C"
 {
 #endif
 
-#define NUM_ROWS_IN_FRAME_BUFFER 50
+#define NUM_ROWS_IN_FRAME_BUFFER 25
 
 uint16_t make_color(uint8_t r, uint8_t g, uint8_t b);
 uint16_t* get_vram0();

diff --git a/components/box-emu-hal/include/video_setting.hpp b/components/box-emu-hal/include/video_setting.hpp
@@ -0,0 +1,8 @@
+#pragma once
+
+#include <atomic>
+
+enum class VideoSetting { ORIGINAL, FIT, FILL, MAX_UNUSED };
+
+VideoSetting get_video_setting();
+void set_video_setting(const VideoSetting& setting);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,3 @@ void i2c_read_internal_bus(uint8_t dev_addr, uint8_t* read_data, size_t read_len

		void i2c_write_external_bus(uint8_t dev_addr, uint8_t *data, size_t len);
		void i2c_read_external_bus(uint8_t dev_addr, uint8_t reg_addr, uint8_t *read_data, size_t read_len);
		void i2c_read_external_bus(uint8_t dev_addr, uint8_t* read_data, size_t read_len);