diff --git a/switch/README.md b/switch/README.md index 9a5f6db..709f900 100644 --- a/switch/README.md +++ b/switch/README.md @@ -47,16 +47,16 @@ Chiaki config file The **chiaki.conf** is generated by the application. this file contains sensitive data. (do not share this file) ```ini -# required: PS4-XXX (PS4 local name) -# name from PS4 Settings > System > system information -[PS4-XXX] -# required: lan PS4 IP address -# IP from PS4 Settings > System > system information -host_ip = X.X.X.X +# required: PS*-*** (PS4/PS5 local name) +# name from Settings > System > system information +[PS*-***] +# required: lan PlayStation IP address +# IP from Settings > System > system information +host_ip = *.*.*.* # required: sony oline id (login) -psn_online_id = ps4_online_id +psn_online_id = ps_online_id # required (PS4>7.0 Only): https://git.sr.ht/~thestr4ng3r/chiaki/tree/master/item/README.md#obtaining-your-psn-accountid -psn_account_id = ps4_base64_account_id +psn_account_id = ps_base64_account_id # optional(default 60): remote play fps (must be 30 or 60) video_fps = 60 # optional(default 720p): remote play resolution (must be 720p, 540p or 360p) diff --git a/switch/include/gui.h b/switch/include/gui.h index 2f07e73..0d41ee4 100644 --- a/switch/include/gui.h +++ b/switch/include/gui.h @@ -61,7 +61,7 @@ class MainApplication bool Load(); }; -class PS4RemotePlay : public brls::View +class PSRemotePlay : public brls::View { private: brls::AppletFrame * frame; @@ -77,8 +77,8 @@ class PS4RemotePlay : public brls::View // int fps = 0; public: - PS4RemotePlay(IO * io, Host * host); - ~PS4RemotePlay(); + PSRemotePlay(IO * io, Host * host); + ~PSRemotePlay(); void draw(NVGcontext * vg, int x, int y, unsigned width, unsigned height, brls::Style * style, brls::FrameContext * ctx) override; }; diff --git a/switch/include/host.h b/switch/include/host.h index 6be0b14..26f3c8b 100644 --- a/switch/include/host.h +++ b/switch/include/host.h @@ -59,9 +59,9 @@ class Host std::string ap_bssid; std::string ap_key; std::string ap_name; - std::string ps4_nickname; + std::string server_nickname; // mac address = 48 bits - uint8_t ps4_mac[6] = {0}; + uint8_t server_mac[6] = {0}; char rp_regist_key[CHIAKI_SESSION_AUTH_SIZE] = {0}; uint32_t rp_key_type = 0; uint8_t rp_key[0x10] = {0}; diff --git a/switch/src/gui.cpp b/switch/src/gui.cpp index 1f29410..77a71e6 100644 --- a/switch/src/gui.cpp +++ b/switch/src/gui.cpp @@ -52,12 +52,12 @@ void HostInterface::Register(bool pin_incorrect) { if(pin_incorrect) { - DIALOG(srfpvyps, "Session Registration Failed, Please verify your PS4 settings"); + DIALOG(srfpvyps, "Session Registration Failed, Please verify your PlayStation settings"); return; } // the host is not registered yet - brls::Dialog* peprpc = new brls::Dialog("Please enter your PS4 registration PIN code"); + brls::Dialog* peprpc = new brls::Dialog("Please enter your PlayStation registration PIN code"); brls::GenericEvent::Callback cb_peprpc = [this, peprpc](brls::View* view) { bool pin_provided = false; @@ -101,18 +101,18 @@ void HostInterface::Wakeup(brls::View * view) if(!this->host->rp_key_data) { // the host is not registered yet - DIALOG(prypf, "Please register your PS4 first"); + DIALOG(prypf, "Please register your PlayStation first"); } else { int r = host->Wakeup(); if(r == 0) { - brls::Application::notify("PS4 Wakeup packet sent"); + brls::Application::notify("PlayStation Wakeup packet sent"); } else { - brls::Application::notify("PS4 Wakeup packet failed"); + brls::Application::notify("PlayStation Wakeup packet failed"); } } } @@ -123,7 +123,7 @@ void HostInterface::Connect(brls::View * view) if(this->host->state != CHIAKI_DISCOVERY_HOST_STATE_READY) { // host in standby mode - DIALOG(ptoyp, "Please turn on your PS4"); + DIALOG(ptoyp, "Please turn on your PlayStation"); return; } @@ -211,7 +211,7 @@ bool HostInterface::Stream() // brls::Application::setDisplayFramerate(true); // push raw opengl stream over borealis - brls::Application::pushView(new PS4RemotePlay(this->io, this->host)); + brls::Application::pushView(new PSRemotePlay(this->io, this->host)); return true; } @@ -276,7 +276,7 @@ bool MainApplication::Load() // Create a view this->rootFrame = new brls::TabFrame(); - this->rootFrame->setTitle("Chiaki: Open Source PS4 Remote Play Client"); + this->rootFrame->setTitle("Chiaki: Open Source PlayStation Remote Play Client"); this->rootFrame->setIcon(BOREALIS_ASSET("icon.jpg")); brls::List* config = new brls::List(); @@ -428,12 +428,12 @@ bool MainApplication::BuildConfigurationMenu(brls::List * ls, Host * host) ls->addView(info); std::string host_name_string = this->settings->GetHostName(host); - brls::ListItem* host_name = new brls::ListItem("PS4 Hostname"); + brls::ListItem* host_name = new brls::ListItem("PS Hostname"); host_name->setValue(host_name_string.c_str()); ls->addView(host_name); std::string host_ipaddr_string = settings->GetHostIPAddr(host); - brls::ListItem* host_ipaddr = new brls::ListItem("PS4 IP Address"); + brls::ListItem* host_ipaddr = new brls::ListItem("PS IP Address"); host_ipaddr->setValue(host_ipaddr_string.c_str()); ls->addView(host_ipaddr); @@ -457,7 +457,7 @@ bool MainApplication::BuildConfigurationMenu(brls::List * ls, Host * host) return true; } -PS4RemotePlay::PS4RemotePlay(IO * io, Host * host) +PSRemotePlay::PSRemotePlay(IO * io, Host * host) : io(io), host(host) { // store joycon/touchpad keys @@ -468,7 +468,7 @@ PS4RemotePlay::PS4RemotePlay(IO * io, Host * host) // this->base_time=glfwGetTime(); } -void PS4RemotePlay::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, brls::Style* style, brls::FrameContext* ctx) +void PSRemotePlay::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, brls::Style* style, brls::FrameContext* ctx) { this->io->MainLoop(&this->state); this->host->SendFeedbackState(&state); @@ -493,7 +493,7 @@ void PS4RemotePlay::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned // nvgText(vg, 5,10, fps_str, NULL); } -PS4RemotePlay::~PS4RemotePlay() +PSRemotePlay::~PSRemotePlay() { } diff --git a/switch/src/host.cpp b/switch/src/host.cpp index 3779377..797c088 100644 --- a/switch/src/host.cpp +++ b/switch/src/host.cpp @@ -230,8 +230,8 @@ void Host::RegistCB(ChiakiRegistEvent * event) this->ap_ssid = r_host->ap_ssid; this->ap_key = r_host->ap_key; this->ap_name = r_host->ap_name; - memcpy( &(this->ps4_mac), &(r_host->ps4_mac), sizeof(this->ps4_mac) ); - this->ps4_nickname = r_host->ps4_nickname; + memcpy( &(this->server_mac), &(r_host->server_mac), sizeof(this->server_mac) ); + this->server_nickname = r_host->server_nickname; memcpy( &(this->rp_regist_key), &(r_host->rp_regist_key), sizeof(this->rp_regist_key) ); this->rp_key_type = r_host->rp_key_type; memcpy( &(this->rp_key), &(r_host->rp_key), sizeof(this->rp_key) );