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

Swapped pull and push buttons on dashboard

Browse source 
reverted auto detect for max intensity and limited to conceal
This commit is contained in:
Ben Gräf 2019-11-03 11:21:07 +01:00
parent d1cc0aa3df
commit e88ba694e6
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
index.html
View file

@ -223,19 +223,6 @@
}, },
buttons: [ buttons: [
'colvis', 'colvis',
{
text: '<i class="fa fa-download"> Pull miner config</i>',
className: 'btn-info',
enabled: false,
action: function () {
table.rows({selected: true}).eq(0).each(function (index) {
var row = table.row(index);
var data = row.data();
sendAction("PUBLISH_CONFIG", data.client_status.client_id);
});
}
},
{ {
text: '<i class="fa fa-upload"> Push miner config</i>', text: '<i class="fa fa-upload"> Push miner config</i>',
className: 'btn-primary', className: 'btn-primary',
@ -249,6 +236,19 @@
}); });
} }
}, },
{
text: '<i class="fa fa-download"> Pull miner config</i>',
className: 'btn-info',
enabled: false,
action: function () {
table.rows({selected: true}).eq(0).each(function (index) {
var row = table.row(index);
var data = row.data();
sendAction("PUBLISH_CONFIG", data.client_status.client_id);
});
}
},
{ {
text: '<i class="fa fa-play"> Start miner</i>', text: '<i class="fa fa-play"> Start miner</i>',
className: 'btn-success', className: 'btn-success',

2
src/backend/cpu/platform/HwlocCpuInfo.cpp
View file

@ -290,7 +290,7 @@ void xmrig::HwlocCpuInfo::processTopLevelCache(hwloc_obj_t cache, const Algorith
} }
# endif # endif
if (CnAlgo<>::base(algorithm) == Algorithm::CN_0 || CnAlgo<>::base(algorithm) == Algorithm::CN_1) { if (algorithm == Algorithm::CN_CONCEAL)
intensity = std::min<uint32_t >(static_cast<const uint32_t &>(cacheHashes / PUs), algorithm.maxIntensity()); intensity = std::min<uint32_t >(static_cast<const uint32_t &>(cacheHashes / PUs), algorithm.maxIntensity());
} }

4
src/version.h
View file

@ -28,7 +28,7 @@
#define APP_ID "XMRigCC" #define APP_ID "XMRigCC"
#define APP_NAME "XMRigCC" #define APP_NAME "XMRigCC"
#define APP_DESC "XMRigCC CPU miner" #define APP_DESC "XMRigCC CPU miner"
#define APP_VERSION "2.1.0" #define APP_VERSION "2.1.1"
#define APP_DOMAIN "" #define APP_DOMAIN ""
#define APP_SITE "https://github.com/BenDr0id/xmrigCC/" #define APP_SITE "https://github.com/BenDr0id/xmrigCC/"
#define APP_COPYRIGHT "Copyright (C) 2017- XMRigCC" #define APP_COPYRIGHT "Copyright (C) 2017- XMRigCC"
@ -36,7 +36,7 @@
#define APP_VER_MAJOR 2 #define APP_VER_MAJOR 2
#define APP_VER_MINOR 1 #define APP_VER_MINOR 1
#define APP_VER_PATCH 0 #define APP_VER_PATCH 1
#ifndef NDEBUG #ifndef NDEBUG
#define BUILD_TYPE "DEBUG" #define BUILD_TYPE "DEBUG"