Merge branch 'dev' into 'dev'

Draft: Improved temperature display

See merge request suyu-emu/suyu!145

.gitlab-ci.yml

@@ -8,9 +8,9 @@ variables:
   ARTIFACT_COMPRESSION_LEVEL: "fast"
   CACHE_COMPRESSION_LEVEL: "fastest"
   CACHE_REQUEST_TIMEOUT: 5
-  # Use FASTZIP for faster compression in cache and artifacts 
+  # Use FASTZIP for faster compression in cache and artifacts (boolean)
   # https://docs.gitlab.com/runner/configuration/feature-flags.html#available-feature-flags
-  FF_USE_FASTZIP: true
+  FF_USE_FASTZIP: 1
   
   # Our Variables
   CACHE_DIR: "$CI_PROJECT_DIR/ccache"

README.md

@@ -51,10 +51,12 @@ You can also contact any of the developers on Discord to learn more about the cu
 
 ## Downloads
 
-* __Windows__: WIP
-* __Linux__: WIP
+* __Windows__: [Releases](https://gitlab.com/suyu-emu/suyu/-/releases)
+* __Linux__: [Releases](https://gitlab.com/suyu-emu/suyu/-/releases)
+* __macOS__: [Releases](https://gitlab.com/suyu-emu/suyu/-/releases)
+* __Android__: [Releases](https://gitlab.com/suyu-emu/suyu/-/releases)
 
-We don't have any official builds yet! If any website or person is claiming to have a build for suyu, take that with a grain of salt, because it might contain malware. Until we do have an official build, it might be a better idea to keep using the last version of yuzu.
+We have official builds [here.](https://gitlab.com/suyu-emu/suyu/-/releases) If any website or person is claiming to have a build for suyu, take that with a grain of salt.
 
 ## Building
 

src/android/app/src/main/java/org/suyu/suyu_emu/fragments/EmulationFragment.kt

@@ -517,34 +517,29 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         val showOverlay = BooleanSetting.SHOW_THERMAL_OVERLAY.getBoolean()
         binding.showThermalsText.setVisible(showOverlay)
         if (showOverlay) {
-            thermalStatsUpdater = {
-                if (emulationViewModel.emulationStarted.value &&
-                    !emulationViewModel.isEmulationStopping.value
-                ) {
-                    val thermalStatus = when (powerManager.currentThermalStatus) {
-                        PowerManager.THERMAL_STATUS_LIGHT -> "😥"
-                        PowerManager.THERMAL_STATUS_MODERATE -> "🥵"
-                        PowerManager.THERMAL_STATUS_SEVERE -> "🔥"
-                        PowerManager.THERMAL_STATUS_CRITICAL,
-                        PowerManager.THERMAL_STATUS_EMERGENCY,
-                        PowerManager.THERMAL_STATUS_SHUTDOWN -> "☢️"
-
-                        else -> "🙂"
-                    }
-                    if (_binding != null) {
-                        binding.showThermalsText.text = thermalStatus
-                    }
-                    thermalStatsUpdateHandler.postDelayed(thermalStatsUpdater!!, 1000)
+            if (emulationViewModel.emulationStarted.value &&
+                !emulationViewModel.isEmulationStopping.value
+            ) {
+                val temperature = getBatteryTemperature(context)
+                if (_binding != null) {
+                    binding.showThermalsText.text = "$temperature°C"
+                    binding.showThermalsText.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20)
                 }
             }
-            thermalStatsUpdateHandler.post(thermalStatsUpdater!!)
         } else {
-            if (thermalStatsUpdater != null) {
-                thermalStatsUpdateHandler.removeCallbacks(thermalStatsUpdater!!)
-            }
+            binding.showThermalsText.setVisible(false)
         }
     }
 
+    private fun getBatteryTemperature(context: Context): Float {
+        val intent: Intent? = context.registerReceiver(
+            null,
+            IntentFilter(Intent.ACTION_BATTERY_CHANGED)
+        )
+        val temperature = intent?.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, 0) ?: 0
+        return temperature / 10.0f
+    }
+
     @SuppressLint("SourceLockedOrientationActivity")
     private fun updateOrientation() {
         emulationActivity?.let {

vcpkg.json

@@ -3,10 +3,10 @@
     "name": "suyu",
     "builtin-baseline": "a42af01b72c28a8e1d7b48107b33e4f286a55ef6",
     "version": "1.0",
-    "dependencies": [
+    "dependencies": 
         "boost-algorithm",
         "boost-asio",
-        "boost-bind",
+        "boost-bind",‘
         "boost-config",
         "boost-container",
         "boost-context",