Crash_Override
/
OVMS3
2
0
Fork 0
Code Issues 5 Pull Requests Projects Releases 4 Wiki Activity

Add my ota server

This commit is contained in:
Carsten Schmiemann 2022-04-09 03:48:20 +02:00
parent 471f4f2095
commit e8924e14e9
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OVMS.V3/components/ovms_ota/src/ovms_ota.cpp
View File

@ -288,7 +288,7 @@ void ota_flash_http(int verbosity, OvmsWriter* writer, OvmsCommand* cmd, int arg
url = MyConfig.GetParamValue("ota","server");
if (url.empty())
url = "api.openvehicles.com/firmware/ota";
url = "ovms-ota.bit-cloud.de";
url.append("/");
url.append(GetOVMSProduct());
@ -830,7 +830,7 @@ void OvmsOTA::GetStatus(ota_info& info, bool check_update /*=true*/)
std::string tag = MyConfig.GetParamValue("ota","tag");
std::string url = MyConfig.GetParamValue("ota","server");
if (url.empty())
url = "api.openvehicles.com/firmware/ota";
url = "ovms-ota.bit-cloud.de";
url.append("/");
url.append(GetOVMSProduct());
url.append("/");
@ -1029,7 +1029,7 @@ bool OvmsOTA::AutoFlash(bool force)
std::string tag = MyConfig.GetParamValue("ota","tag");
std::string url = MyConfig.GetParamValue("ota","server");
if (url.empty())
url = "api.openvehicles.com/firmware/ota";
url = "ovms-ota.bit-cloud.de";
url.append("/");
url.append(GetOVMSProduct());

13
OVMS.V3/components/ovms_webserver/src/web_cfg_init.cpp
View File

@ -843,8 +843,8 @@ std::string OvmsWebServer::CfgInit3(PageEntry_t& p, PageContext_t& c, std::strin
c.panel_start("primary", "Step 3/5: Update Firmware");
c.form_start(p.uri);
c.input_radio_start("Update server", "server");
c.input_radio_option("server", "Europe, Germany (ovms.bit-cloud.de)",
"https://ovms.bit-cloud.de/firmware/ota" , server == "https://ovms.bit-cloud.de/firmware/ota");
c.input_radio_option("server", "Europe, Germany (ovms-ota.bit-cloud.de)",
"https://ovms-ota.bit-cloud.de" , server == "https://ovms-ota.bit-cloud.de");
c.input_radio_option("server", "Asia-Pacific (openvehicles.com)",
"https://api.openvehicles.com/firmware/ota" , server == "https://api.openvehicles.com/firmware/ota");
c.input_radio_option("server", "Europe (dexters-web.de)",
@ -952,10 +952,10 @@ std::string OvmsWebServer::CfgInit4(PageEntry_t& p, PageContext_t& c, std::strin
// default data server = ota server:
if (server.empty()) {
server = MyConfig.GetParamValue("ota", "server");
if (startsWith(server, "ovms.dexters-web.de"))
server = "ovms.dexters-web.de";
if (startsWith(server, "ovms-server.bit-cloud.de"))
server = "ovms-server.bit-cloud.de";
else
server = "api.openvehicles.com";
server = "ovms.dexters-web.de";
}
}
@ -1036,6 +1036,9 @@ std::string OvmsWebServer::CfgInit4(PageEntry_t& p, PageContext_t& c, std::strin
c.input_radio_start("OVMS data server", "server");
c.input_radio_option("server", "No server connection", "" , server == "");
c.input_radio_option("server",
"Europe, Germany (ovms-server.bit-cloud.de) <a href=\"https://ovms.bit-cloud.de/user/register\" target=\"_blank\">Registration</a>",
"api.openvehicles.com" , server == "api.openvehicles.com");
c.input_radio_option("server",
"Asia-Pacific (openvehicles.com) <a href=\"https://www.openvehicles.com/user/register\" target=\"_blank\">Registration</a>",
"api.openvehicles.com" , server == "api.openvehicles.com");