Merge branch 'develop'

# Conflicts:
#	.github/ISSUE_TEMPLATE/bug_report.yaml
#	README.md

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -12,7 +12,8 @@ body:
       label: Switch Firmware Version
       description: Which Nintendo Switch firmware (HOS) version are you running?
       options:
-        - 14.1.1 (Latest)
+        - 14.1.2 (Latest)
+        - 14.1.1
         - 14.1.0
         - 14.0.0
         - 13.2.1
@@ -24,8 +25,6 @@ body:
         - 12.0.2
         - 12.0.1
         - 12.0.0
-        - 11.0.1
-        - 11.0.0
         - Other (please specify in issue description)
     validations:
       required: true
@@ -45,9 +44,6 @@ body:
         - 1.2.2
         - 1.2.1
         - 1.2.0
-        - 1.1.1
-        - 1.1.0
-        - 1.0.0
         - Other (please specify in issue description)
     validations:
       required: true
@@ -57,7 +53,8 @@ body:
       label: Mission Control Version
       description: Which version of Mission Control are you using?
       options:
-        - 0.7.0 (Latest)
+        - 0.7.1 (Latest)
+        - 0.7.0
         - 0.6.4
         - 0.6.3
         - 0.6.2
@@ -98,4 +95,4 @@ body:
     attributes:
       label: Additional Context
       description: Sometimes issues do not occur universally and may be caused by a factor unique to your setup. Add any additional contextual information about your environment here, eg. which other custom sysmodules are you running, are you booting sysnand or emummc, did you install Atmosphère or Mission Control as part of some unofficial third-party release/distribution etc
-      placeholder: Please provide any additional context here.  
+      placeholder: Please provide any additional context here.

Makefile

@@ -4,14 +4,16 @@ MC_MITM_TID := 010000000000bd00
 GIT_BRANCH := $(shell git symbolic-ref --short HEAD | sed s/[^a-zA-Z0-9_-]/_/g)
 GIT_HASH := $(shell git rev-parse --short HEAD)
 GIT_TAG := $(shell git describe --tags `git rev-list --tags --max-count=1`)
+
+VERSION := $(shell [[ $(GIT_TAG) =~ ^v([0-9]+).([0-9]+).([0-9]+) ]] && printf '0x%02X%02X%02X' $${BASH_REMATCH[1]} $${BASH_REMATCH[2]} $${BASH_REMATCH[3]})
 BUILD_VERSION := $(GIT_TAG:v%=%)-$(GIT_BRANCH)-$(GIT_HASH)
 
 TARGETS := mcmitm_version.cpp mc_mitm
 
 all: $(TARGETS)
 
 mcmitm_version.cpp: .git/HEAD .git/index
-	echo "namespace ams::mitm { const char *version_string = \"$(BUILD_VERSION)\"; const char *build_date = \"$$(date)\"; }" > mc_mitm/source/$@
+	echo "namespace ams::mitm { unsigned int mc_version = $(VERSION); const char *mc_build_name = \"$(BUILD_VERSION)\"; const char *mc_build_date = \"$$(date)\"; }" > mc_mitm/source/$@
 
 mc_mitm:
 	$(MAKE) -C $@
@@ -24,6 +26,8 @@ clean:
 dist: all
 	rm -rf dist
 
+
+
 	mkdir -p dist/atmosphere/contents/$(MC_MITM_TID)
 	cp mc_mitm/out/nintendo_nx_arm64_armv8a/release/mc_mitm.nsp dist/atmosphere/contents/$(MC_MITM_TID)/exefs.nsp
 	echo "btdrv" >> dist/atmosphere/contents/$(MC_MITM_TID)/mitm.lst

README.md

@@ -32,6 +32,7 @@ Use controllers from other consoles natively on your Nintendo Switch via Bluetoo
  Currently, the following controllers are supported. If you have a third-party variant of one of the below, or a Bluetooth controller that isn't listed, consider submitting an issue with the controller details, including vid/pid, to request support.
 
 * __Nintendo Wii Remote + extensions (Nunchuck, Classic Controller, Classic Controller Pro, SNES Mini, TaTaCon (Taiko drum), MotionPlus)__
+* __Nintendo Wii Balance Board (experimental)__
 * __Nintendo WiiU Pro Controller__
 * __Sony DualShock4 Controller__
 * __Sony Dualsense Controller__
@@ -117,13 +118,20 @@ A template for the config .ini file will be installed to `/config/MissionControl
 
 - `[general]`
 These are general settings for mission control features. 
-	- `enable_rumble` Enables/disables rumble support for unofficial controllers.
-	- `enable_motion` Enables/disables motion controls support.
+	- `enable_rumble` Enable/disable rumble support for unofficial controllers.
+	- `enable_motion` Enable/disable motion controls support.
 
 - `[bluetooth]`
 These settings can be used to spoof your switch bluetooth to appear as another device. This may be useful (in conjunction with a link key) if you want to use your controller across multiple devices without having to re-pair every time you switch. Note that changing these settings will invalidate your console information stored in any previously paired controllers and will require re-pairing.
-	- `host_name` Override the bluetooth host adapter name
-	- `host_address` Override the bluetooth host adapter address
+	- `host_name` Override the bluetooth host adapter name.
+	- `host_address` Override the bluetooth host adapter address.
+
+- `[misc]`
+These are miscellaneous controller-specific settings etc.
+	- `enable_dualshock4_lightbar` Enable/disable the coloured LED lightbar on Sony Dualshock4 controllers.
+	- `enable_dualsense_lightbar` Enable/disable the coloured LED lightbar on Sony Dualsense controllers.
+	- `enable_dualsense_player_leds` Enable/disable the white player indicator LEDs below the Dualsense touchpad.
+	- `dualsense_vibration_intensity` Set Dualsense vibration intensity, 12.5% per increment. Valid range [1-8] where 1=12.5%, 8=100%.
 
 ### Removal
 
@@ -145,6 +153,8 @@ Below is a list of features I am currently working on or would like to look into
 * ~~Rumble support~~
 * ~~Motion controls support~~
 * Bluetooth LE support
+* USB wired controllers
+* UART MITM to allow button combos and other future features to apply to joycons in handheld mode
 * Per-controller configurations
     * Rumble on/off
     * Motion controls on/off
@@ -167,7 +177,7 @@ Below is a list of features I am currently working on or would like to look into
 * Tesla overlay
 * Keyboard and mouse support
 * Gamecube mode (analog trigger support)
-* USB wired controllers
+* Title-specific button bindings
 
 ### Known Issues and Limitations
 

mc_mitm/config.ini

@@ -11,5 +11,11 @@
 ;host_address=04:20:69:04:20:69
 
 [misc]
-; Disable the LED lightbar on Sony Dualshock 4 and Dualsense controllers [default false]
-;disable_sony_leds=false
+; Enable the LED lightbar on Sony Dualshock 4 controllers [default true]
+;enable_dualshock4_lightbar=false
+; Enable the LED lightbar on Sony Dualsense controllers [default true]
+;enable_dualsense_lightbar=false
+; Enable the white player indicator LEDs below the Dualsense touchpad [default true]
+;enable_dualsense_player_leds=false
+; Set Dualsense vibration intensity, 12.5% per increment. Valid range [1-8] where 1=12.5%, 8=100% [default 4(50%)]
+;dualsense_vibration_intensity=4

mc_mitm/mc_mitm.json

@@ -1,18 +1,20 @@
 {
     "name": "mc.mitm",
-    "title_id": "0x010000000000bd00",
-    "title_id_range_min": "0x010000000000bd00",
-    "title_id_range_max": "0x010000000000bd00",
+    "program_id": "0x010000000000bd00",
+    "program_id_range_min": "0x010000000000bd00",
+    "program_id_range_max": "0x010000000000bd00",
     "main_thread_stack_size": "0x1000",
     "main_thread_priority": 42,
     "default_cpu_id": 3,
-    "process_category": 1,
+    "version": "0",
     "is_retail": true,
     "pool_partition": 2,
     "is_64_bit": true,
+    "signature_key_generation": 0,
     "address_space_type": 3,
-    "system_resource_size": "0",
+    "optimize_memory_allocation": false,
     "disable_device_address_space_merge": true,
+    "system_resource_size": "0",
     "filesystem_access": {
         "permissions": "0xFFFFFFFFFFFFFFFF"
     },
@@ -27,15 +29,14 @@
             "type": "kernel_flags",
             "value": {
                 "highest_thread_priority": 63,
-                "lowest_thread_priority": 12,
+                "lowest_thread_priority": 4,
                 "lowest_cpu_id": 3,
                 "highest_cpu_id": 3
             }
         },
         {
             "type": "syscalls",
             "value": {
-                "svcUnknown": "0x00",
                 "svcSetHeapSize": "0x01",
                 "svcSetMemoryPermission": "0x02",
                 "svcSetMemoryAttribute": "0x03",
@@ -77,92 +78,29 @@
                 "svcOutputDebugString": "0x27",
                 "svcReturnFromException": "0x28",
                 "svcGetInfo": "0x29",
-                "svcFlushEntireDataCache": "0x2a",
-                "svcFlushDataCache": "0x2b",
-                "svcMapPhysicalMemory": "0x2c",
-                "svcUnmapPhysicalMemory": "0x2d",
-                "svcGetFutureThreadInfo": "0x2e",
-                "svcGetLastThreadInfo": "0x2f",
-                "svcGetResourceLimitLimitValue": "0x30",
-                "svcGetResourceLimitCurrentValue": "0x31",
-                "svcSetThreadActivity": "0x32",
-                "svcGetThreadContext3": "0x33",
                 "svcWaitForAddress": "0x34",
                 "svcSignalToAddress": "0x35",
-                "svcUnknown": "0x36",
-                "svcUnknown": "0x37",
-                "svcUnknown": "0x38",
-                "svcUnknown": "0x39",
-                "svcUnknown": "0x3a",
-                "svcUnknown": "0x3b",
-                "svcDumpInfo": "0x3c",
-                "svcDumpInfoNew": "0x3d",
-                "svcUnknown": "0x3e",
-                "svcUnknown": "0x3f",
+                "svcSynchronizePreemptionState": "0x36",
                 "svcCreateSession": "0x40",
                 "svcAcceptSession": "0x41",
                 "svcReplyAndReceiveLight": "0x42",
                 "svcReplyAndReceive": "0x43",
                 "svcReplyAndReceiveWithUserBuffer": "0x44",
                 "svcCreateEvent": "0x45",
-                "svcUnknown": "0x46",
-                "svcUnknown": "0x47",
-                "svcMapPhysicalMemoryUnsafe": "0x48",
-                "svcUnmapPhysicalMemoryUnsafe": "0x49",
-                "svcSetUnsafeLimit": "0x4a",
-                "svcCreateCodeMemory": "0x4b",
-                "svcControlCodeMemory": "0x4c",
-                "svcSleepSystem": "0x4d",
-                "svcReadWriteRegister": "0x4e",
-                "svcSetProcessActivity": "0x4f",
                 "svcCreateSharedMemory": "0x50",
                 "svcMapTransferMemory": "0x51",
                 "svcUnmapTransferMemory": "0x52",
                 "svcCreateInterruptEvent": "0x53",
-                "svcQueryPhysicalAddress": "0x54",
+                "svcReadWriteRegister": "0x4E",
                 "svcQueryIoMapping": "0x55",
                 "svcCreateDeviceAddressSpace": "0x56",
                 "svcAttachDeviceAddressSpace": "0x57",
                 "svcDetachDeviceAddressSpace": "0x58",
-                "svcMapDeviceAddressSpaceByForce": "0x59",
                 "svcMapDeviceAddressSpaceAligned": "0x5a",
-                "svcMapDeviceAddressSpace": "0x5b",
                 "svcUnmapDeviceAddressSpace": "0x5c",
-                "svcInvalidateProcessDataCache": "0x5d",
-                "svcStoreProcessDataCache": "0x5e",
-                "svcFlushProcessDataCache": "0x5f",
-                "svcDebugActiveProcess": "0x60",
-                "svcBreakDebugProcess": "0x61",
-                "svcTerminateDebugProcess": "0x62",
-                "svcGetDebugEvent": "0x63",
-                "svcContinueDebugEvent": "0x64",
-                "svcGetProcessList": "0x65",
-                "svcGetThreadList": "0x66",
-                "svcGetDebugThreadContext": "0x67",
-                "svcSetDebugThreadContext": "0x68",
-                "svcQueryDebugProcessMemory": "0x69",
-                "svcReadDebugProcessMemory": "0x6a",
-                "svcWriteDebugProcessMemory": "0x6b",
-                "svcSetHardwareBreakPoint": "0x6c",
-                "svcGetDebugThreadParam": "0x6d",
-                "svcUnknown": "0x6e",
                 "svcGetSystemInfo": "0x6f",
-                "svcCreatePort": "0x70",
                 "svcManageNamedPort": "0x71",
-                "svcConnectToPort": "0x72",
-                "svcSetProcessMemoryPermission": "0x73",
-                "svcMapProcessMemory": "0x74",
-                "svcUnmapProcessMemory": "0x75",
-                "svcQueryProcessMemory": "0x76",
-                "svcMapProcessCodeMemory": "0x77",
-                "svcUnmapProcessCodeMemory": "0x78",
-                "svcCreateProcess": "0x79",
-                "svcStartProcess": "0x7a",
-                "svcTerminateProcess": "0x7b",
-                "svcGetProcessInfo": "0x7c",
-                "svcCreateResourceLimit": "0x7d",
-                "svcSetResourceLimitLimitValue": "0x7e",
-                "svcCallSecureMonitor": "0x7f"
+                "svcCallSecureMonitor": "0x7F"
             }
         },
         {
@@ -172,13 +110,6 @@
         {
             "type": "handle_table_size",
             "value": 128
-        },
-        {
-            "type": "debug_flags",
-            "value": {
-                "allow_debug": false,
-                "force_debug": true
-            }
         }
     ]
 }

mc_mitm/source/async/async.cpp

@@ -45,7 +45,7 @@ namespace ams::async {
 
     }
 
-    Result Initialize(void) {
+    Result Initialize() {
         os::InitializeMessageQueue(&g_work_queue, g_message_buffer, MessageBufferSize);
 
         for (unsigned int i = 0; i < ThreadCount; ++i) {
@@ -64,7 +64,7 @@ namespace ams::async {
         return ams::ResultSuccess();
     }
 
-    void Finalize(void) {
+    void Finalize() {
         os::FinalizeMessageQueue(&g_work_queue);
 
         for (unsigned int i = 0; i < ThreadCount; ++i) {

mc_mitm/source/async/async.hpp

@@ -21,8 +21,8 @@ namespace ams::async {
 
     using AsyncFunction = std::function<Result(void)>;
 
-    Result Initialize(void);
-    void Finalize(void);
+    Result Initialize();
+    void Finalize();
 
     void QueueWork(AsyncFunction *function);
 

mc_mitm/source/async/future_response.hpp

@@ -50,11 +50,11 @@ namespace ams {
                 return m_user_data;
             }
 
-            void Wait(void) {
+            void Wait() {
                 os::WaitEvent(&m_ready_event);
             }
 
-            bool TryWait(void) {
+            bool TryWait() {
                 return os::TryWaitEvent(&m_ready_event);
             }
 

mc_mitm/source/bluetooth_mitm/bluetooth/bluetooth_ble.cpp

@@ -15,8 +15,6 @@
  */
 #include "bluetooth_ble.hpp"
 #include "../btdrv_mitm_flags.hpp"
-#include <mutex>
-#include <cstring>
 
 namespace ams::bluetooth::ble {
 
@@ -38,23 +36,23 @@ namespace ams::bluetooth::ble {
         return g_init_event.TryWait();
     }
 
-    void SignalInitialized(void) {
+    void SignalInitialized() {
         g_init_event.Signal();
     }
 
-    void WaitInitialized(void) {
+    void WaitInitialized() {
         g_init_event.Wait();
     }
 
-    os::SystemEvent *GetSystemEvent(void) {
+    os::SystemEvent *GetSystemEvent() {
         return &g_system_event;
     }
 
-    os::SystemEvent *GetForwardEvent(void) {
+    os::SystemEvent *GetForwardEvent() {
         return &g_system_event_fwd;
     }
 
-    os::SystemEvent *GetUserForwardEvent(void) {
+    os::SystemEvent *GetUserForwardEvent() {
         return &g_system_event_user_fwd;
     }
 
@@ -69,7 +67,7 @@ namespace ams::bluetooth::ble {
         return ams::ResultSuccess();
     }
 
-    void HandleEvent(void) {
+    void HandleEvent() {
         {
             std::scoped_lock lk(g_event_data_lock); 
             R_ABORT_UNLESS(btdrvGetBleManagedEventInfo(&g_event_info, sizeof(bluetooth::BleEventInfo), &g_current_event_type));