Merge pull request #276 from N00byKing/acctoyuzu

Change Telemetry Names to yuzu and remove links to citra
This commit is contained in:
bunnei 2018-04-02 18:30:04 -04:00 committed by GitHub
commit 6cd1482354
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions

View File

@ -15,7 +15,7 @@ namespace Telemetry {
/// Field type, used for grouping fields together in the final submitted telemetry log /// Field type, used for grouping fields together in the final submitted telemetry log
enum class FieldType : u8 { enum class FieldType : u8 {
None = 0, ///< No specified field group 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.) Session, ///< Emulated session fields (e.g. title ID, log, etc.)
Performance, ///< Emulated performance (e.g. fps, emulated CPU speed, etc.) Performance, ///< Emulated performance (e.g. fps, emulated CPU speed, etc.)
UserFeedback, ///< User submitted feedback (e.g. star rating, user notes, etc.) UserFeedback, ///< User submitted feedback (e.g. star rating, user notes, etc.)

View File

@ -87,8 +87,8 @@ TelemetrySession::TelemetrySession() {
#ifdef ENABLE_WEB_SERVICE #ifdef ENABLE_WEB_SERVICE
if (Settings::values.enable_telemetry) { if (Settings::values.enable_telemetry) {
backend = std::make_unique<WebService::TelemetryJson>( backend = std::make_unique<WebService::TelemetryJson>(
Settings::values.telemetry_endpoint_url, Settings::values.citra_username, Settings::values.telemetry_endpoint_url, Settings::values.yuzu_username,
Settings::values.citra_token); Settings::values.yuzu_token);
} else { } else {
backend = std::make_unique<Telemetry::NullVisitor>(); backend = std::make_unique<Telemetry::NullVisitor>();
} }

View File

@ -50,8 +50,8 @@ u64 RegenerateTelemetryId();
/** /**
* Verifies the username and token. * Verifies the username and token.
* @param username Citra username to use for authentication. * @param username yuzu username to use for authentication.
* @param token Citra token to use for authentication. * @param token yuzu token to use for authentication.
* @param func A function that gets exectued when the verification is finished * @param func A function that gets exectued when the verification is finished
* @returns Future with bool indicating whether the verification succeeded * @returns Future with bool indicating whether the verification succeeded
*/ */

View File

@ -177,12 +177,12 @@ gdbstub_port=24689
# 0: No, 1 (default): Yes # 0: No, 1 (default): Yes
enable_telemetry = enable_telemetry =
# Endpoint URL for submitting telemetry data # 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 # Endpoint URL to verify the username and token
verify_endpoint_url = https://services.citra-emu.org/api/profile verify_endpoint_url =
# Username and token for Citra Web Service # Username and token for yuzu Web Service
# See https://services.citra-emu.org/ for more info # See https://services.citra-emu.org/ for more info
citra_username = yuzu_username =
citra_token = yuzu_token =
)"; )";
} }