Browse Source
Merge pull request #276 from N00byKing/acctoyuzu
Change Telemetry Names to yuzu and remove links to citra
pull/15/merge
bunnei
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
10 additions and
10 deletions
-
src/common/telemetry.h
-
src/core/telemetry_session.cpp
-
src/core/telemetry_session.h
-
src/yuzu_cmd/default_ini.h
|
|
|
@ -15,7 +15,7 @@ namespace Telemetry { |
|
|
|
/// Field type, used for grouping fields together in the final submitted telemetry log |
|
|
|
enum class FieldType : u8 { |
|
|
|
None = 0, ///< No specified field group |
|
|
|
App, ///< Citra application fields (e.g. version, branch, etc.) |
|
|
|
App, ///< yuzu application fields (e.g. version, branch, etc.) |
|
|
|
Session, ///< Emulated session fields (e.g. title ID, log, etc.) |
|
|
|
Performance, ///< Emulated performance (e.g. fps, emulated CPU speed, etc.) |
|
|
|
UserFeedback, ///< User submitted feedback (e.g. star rating, user notes, etc.) |
|
|
|
|
|
|
|
@ -87,8 +87,8 @@ TelemetrySession::TelemetrySession() { |
|
|
|
#ifdef ENABLE_WEB_SERVICE
|
|
|
|
if (Settings::values.enable_telemetry) { |
|
|
|
backend = std::make_unique<WebService::TelemetryJson>( |
|
|
|
Settings::values.telemetry_endpoint_url, Settings::values.citra_username, |
|
|
|
Settings::values.citra_token); |
|
|
|
Settings::values.telemetry_endpoint_url, Settings::values.yuzu_username, |
|
|
|
Settings::values.yuzu_token); |
|
|
|
} else { |
|
|
|
backend = std::make_unique<Telemetry::NullVisitor>(); |
|
|
|
} |
|
|
|
|
|
|
|
@ -50,8 +50,8 @@ u64 RegenerateTelemetryId(); |
|
|
|
|
|
|
|
/** |
|
|
|
* Verifies the username and token. |
|
|
|
* @param username Citra username to use for authentication. |
|
|
|
* @param token Citra token to use for authentication. |
|
|
|
* @param username yuzu username to use for authentication. |
|
|
|
* @param token yuzu token to use for authentication. |
|
|
|
* @param func A function that gets exectued when the verification is finished |
|
|
|
* @returns Future with bool indicating whether the verification succeeded |
|
|
|
*/ |
|
|
|
|
|
|
|
@ -177,12 +177,12 @@ gdbstub_port=24689 |
|
|
|
# 0: No, 1 (default): Yes |
|
|
|
enable_telemetry = |
|
|
|
# Endpoint URL for submitting telemetry data |
|
|
|
telemetry_endpoint_url = https://services.citra-emu.org/api/telemetry |
|
|
|
telemetry_endpoint_url = |
|
|
|
# Endpoint URL to verify the username and token |
|
|
|
verify_endpoint_url = https://services.citra-emu.org/api/profile |
|
|
|
# Username and token for Citra Web Service |
|
|
|
verify_endpoint_url = |
|
|
|
# Username and token for yuzu Web Service |
|
|
|
# See https://services.citra-emu.org/ for more info |
|
|
|
citra_username = |
|
|
|
citra_token = |
|
|
|
yuzu_username = |
|
|
|
yuzu_token = |
|
|
|
)"; |
|
|
|
} |