fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed #228 ForcePow overrules autodetect for XTLv9/Fast2

Browse source 
- CN-Ultralite is displayed as "turtle" instead of "2" on Dashboard
This commit is contained in:
Ben Gräf 2019-01-27 11:05:28 +01:00
parent 059d644ee0
commit 703529b81c
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/net/Job.cpp
View file

@ -139,7 +139,7 @@ bool Job::setTarget(const char *target)
PowVariant Job::powVariant() const PowVariant Job::powVariant() const
{ {
if (Options::i()->algo() == Options::ALGO_CRYPTONIGHT_ULTRALITE) { if (Options::i()->algo() == Options::ALGO_CRYPTONIGHT_ULTRALITE) {
return PowVariant::POW_V2; return PowVariant::POW_TURTLE;
} }
if (m_powVariant == PowVariant::POW_AUTODETECT) { if (m_powVariant == PowVariant::POW_AUTODETECT) {
@ -151,14 +151,18 @@ PowVariant Job::powVariant() const
return PowVariant::POW_V0; return PowVariant::POW_V0;
} }
} else if (m_powVariant == PowVariant::POW_XTL) { } else if (m_powVariant == PowVariant::POW_XTL) {
if (!Options::i()->forcePowVariant()) {
if (m_blob[0] >= 9) { if (m_blob[0] >= 9) {
return PowVariant::POW_FAST_2; return PowVariant::POW_FAST_2;
} }
}
} else if (m_powVariant == PowVariant::POW_MSR) { } else if (m_powVariant == PowVariant::POW_MSR) {
if (!Options::i()->forcePowVariant()) {
if (m_blob[0] >= 8) { if (m_blob[0] >= 8) {
return PowVariant::POW_FAST_2; return PowVariant::POW_FAST_2;
} }
} }
}
return m_powVariant; return m_powVariant;
} }