34 update various lib (#36)

* Update submodule. Add GamecontrollerDB as submodule
Tom1975 · Dec 11, 2024 · 6189b7c · 6189b7c
1 parent 597eec9
commit 6189b7c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -5,3 +5,6 @@
 	path = circle-stdlib
 	url = https://github.com/smuehlst/circle-stdlib
 	branch = master
+[submodule "SDL_GameControllerDB"]
+	path = SDL_GameControllerDB
+	url = https://github.com/mdqinc/SDL_GameControllerDB
diff --git a/SDL_GameControllerDB b/SDL_GameControllerDB
diff --git a/SugarPiWin32/CMakeLists.txt b/SugarPiWin32/CMakeLists.txt
@@ -142,6 +142,7 @@ set(CpcCore_Files
 
 set (RES 
 	${CMAKE_CURRENT_SOURCE_DIR}/../res/labels.ini
+	${CMAKE_CURRENT_SOURCE_DIR}/../SDL_GameControllerDB/gamecontrollerdb.txt
 )
 
 add_definitions()
@@ -174,7 +175,7 @@ install (TARGETS SugarPiWin32 RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
 
 install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../CART DESTINATION ${CMAKE_INSTALL_PREFIX})
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../config_win32  DESTINATION ${CMAKE_INSTALL_PREFIX}/Config RENAME config)
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../gamecontrollerdb.txt DESTINATION ${CMAKE_INSTALL_PREFIX}/Config)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../SDL_GameControllerDB/gamecontrollerdb.txt DESTINATION ${CMAKE_INSTALL_PREFIX}/Config)
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../res/101_keyboard  DESTINATION ${CMAKE_INSTALL_PREFIX}/Keyboards)
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../res/101_keyboard_win  DESTINATION ${CMAKE_INSTALL_PREFIX}/Keyboards)
 install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/../res/Facile_Sans.ttf"  DESTINATION ${CMAKE_INSTALL_PREFIX}/FONTS)

diff --git a/build_all.sh b/build_all.sh
@@ -87,7 +87,7 @@ echo "cart=SD:/CART/crtc3_projo.cpr" >> config
 cp res/101_keyboard sdcard/Keyboards
 cp config sdcard/Config
 cp CART/* sdcard/CART
-cp gamecontrollerdb.txt sdcard/Config/gamecontrollerdb.txt
+cp SDL_GameControllerDB/gamecontrollerdb.txt sdcard/Config/gamecontrollerdb.txt
 cp "res/Facile_Sans.ttf" "sdcard/FONTS/Facile_Sans.ttf"
 cp "res/logo.bin" "sdcard/RES/logo.bin"
 cp "res/Img464.bin" "sdcard/RES/Img464.bin"

diff --git a/circle-stdlib b/circle-stdlib
diff --git a/sysconfig.h b/sysconfig.h
@@ -349,6 +349,10 @@
 #define USB_GADGET_DEVICE_ID_SERIAL_CDC	(USB_GADGET_DEVICE_ID_BASE+1)
 #endif
 
+#ifndef USB_GADGET_DEVICE_ID_MSD
+#define USB_GADGET_DEVICE_ID_MSD	(USB_GADGET_DEVICE_ID_BASE+2)
+#endif
+
 ///////////////////////////////////////////////////////////////////////
 //
 // Other
+12 −14		.github/workflows/smoketest.yaml
+7 −0		CHANGELOG.md
+8 −2		circle-mbedtls.md
+23 −11		include/circle-mbedtls/config-circle-mbedtls.h
+1 −1		libs/circle
+1 −1		libs/mbedtls
+10 −1		src/circle-mbedtls/mqttclient.cpp