Merge pull request #2611 from fireice-uk/xmr-stak-rx-dev

[RX] additional changes for the release
fireice-uk · Dec 2, 2019 · 1dee2b6 · 1dee2b6
2 parents 2d59c42 + bf8ca6e
commit 1dee2b6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/doc/README.md b/doc/README.md
@@ -76,7 +76,7 @@ Miner has 2 ways of initial configuring: simple and advanced. The simple method
 
 
 ## Support additional guides and feedback
-[<img src="/doc/_img/YT.png">](#)
+[<img src="/doc/_img/YT.png">](https://www.youtube.com/c/xmrstak)
 To improve our support we created [Xmr-Stak forum](https://www.reddit.com/r/XmrStak) which is also applicable to Xmr-Stak-RX. Check it out if you have a problem, or you are looking for most up to date config for your card and [guides](https://www.reddit.com/r/XmrStak/wiki/index).
 
 <table>

diff --git a/xmrstak/cli/cli-miner.cpp b/xmrstak/cli/cli-miner.cpp
@@ -107,6 +107,12 @@ void help()
 	cout << "  -p, --pass PASSWD          pool password, in the most cases x or empty \"\"" << endl;
 	cout << "  --use-nicehash             the pool should run in nicehash mode" << endl;
 	cout << "  --currency NAME            currency to mine" << endl;
+	cout << "  --noDevSupport             To improve our support the miner is sending information" << endl;
+	cout << "                             to the development server. " << endl;
+	cout << "                             Use this option to disable sending system information." << endl;
+	cout << "                             data send:" << endl;
+	cout << "                                 miner version, used algorithm, system hardware overview" << endl;
+	cout << "                                 and number of used threads." << endl;
 	cout << endl;
 #ifdef _WIN32
 	cout << "Environment variables:\n"
@@ -516,6 +522,10 @@ int main(int argc, char* argv[])
 		{
 			params::inst().selfTest = false;
 		}
+		else if(opName.compare("--noDevSupport") == 0)
+		{
+			params::inst().devSupport = false;
+		}
 		else if (opName.compare("--nvidiaGpus") == 0)
 		{
 			++i;

diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp
@@ -559,7 +559,8 @@ void executor::ex_main()
 	if(jconf::inst()->GetVerboseLevel() >= 4)
 		push_timed_event(ex_event(EV_HASHRATE_LOOP), jconf::inst()->GetAutohashTime());
 
-	push_timed_event(ex_event(EV_SOCK_UPDATE_MOTD), 1);
+	if(xmrstak::params::inst().devSupport)
+		push_timed_event(ex_event(EV_SOCK_UPDATE_MOTD), 1);
 
 	size_t cnt = 0;
 	while(true)
@@ -643,8 +644,11 @@ void executor::ex_main()
 			push_timed_event(ex_event(EV_HASHRATE_LOOP), jconf::inst()->GetAutohashTime());
 			break;
 		case EV_SOCK_UPDATE_MOTD:
-			update_motd(true);
-			push_timed_event(ex_event(EV_SOCK_UPDATE_MOTD), 60*60);
+			if(xmrstak::params::inst().devSupport)
+			{
+				update_motd(true);
+				push_timed_event(ex_event(EV_SOCK_UPDATE_MOTD), 60*60);
+			}
 			break;
 		case EV_MOTD_LINK:
 			open_motd_link();

diff --git a/xmrstak/params.hpp b/xmrstak/params.hpp
@@ -54,6 +54,7 @@ struct params
 	std::string poolUsername;
 	bool nicehashMode = false;
 	bool selfTest = true;
+	bool devSupport = true;
 
 	static constexpr int32_t httpd_port_unset = -1;
 	static constexpr int32_t httpd_port_disabled = 0;