highperfocused/NerdMiner_v2
1
0
Fork 0
mirror of https://github.com/BitMaker-hub/NerdMiner_v2.git synced 2025-09-30 12:32:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #675 from BitMaker-hub/prerelease

Browse Source 
fixes
This commit is contained in:
BitMaker
2025-09-09 13:50:24 +02:00
committed by GitHub
parent facf89a250 0c81e964eb
commit 4a5015f374
5 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platformio.ini
View File

@@ -11,7 +11,17 @@
[platformio]
globallib_dir = lib
default_envs = NerdminerV2, NerdminerV2-T-HMI, wt32-sc01, wt32-sc01-plus, han_m5stack, M5Stick-C, M5Stick-C-Plus2, M5Stick-CPlus, esp32cam, ESP32-2432S028R, ESP32_2432S028_2USB, Lilygo-T-Embed, ESP32-devKitv1, NerdminerV2-S3-DONGLE, NerdminerV2-S3-GEEK, NerdminerV2-S3-AMOLED, NerdminerV2-S3-AMOLED-TOUCH, NerdminerV2-T-QT, NerdminerV2-T-Display_V1, TTGO-T-Display, M5-StampS3, ESP32-S3-devKitv1, ESP32-S3-mini-wemos, ESP32-S2-mini-wemos, ESP32-S3-mini-weact, ESP32-D0WD-V3-weact, ESP32-C3-super-mini, ESP32-C3-devKitmv1, ESP32-C3-042-OLED, ESP32-S3-042-OLED, ESP32-C3-spotpear, esp32-s3-devkitc1-n32r8
default_envs = NerdminerV2, NerdminerV2-T-HMI, wt32-sc01, wt32-sc01-plus, han_m5stack, M5Stick-C, M5Stick-C-Plus2, M5Stick-CPlus, esp32cam, ESP32-2432S028R, ESP32_2432S028_2USB, Lilygo-T-Embed, ESP32-devKitv1, NerdminerV2-S3-DONGLE, NerdminerV2-S3-GEEK, NerdminerV2-S3-AMOLED, NerdminerV2-S3-AMOLED-TOUCH, NerdminerV2-T-QT, NerdminerV2-T-Display_V1, TTGO-T-Display, M5-StampS3, ESP32-S3-devKitv1, ESP32-S3-mini-wemos, ESP32-S2-mini-wemos, ESP32-S3-mini-weact, ESP32-D0WD-V3-weact, ESP32-C3-super-mini, ESP32-C3-devKitmv1, ESP32-C3-042-OLED, ESP32-S3-042-OLED, ESP32-C3-spotpear, esp32-s3-devkitc1-n32r8
; Global configuration for all environments
[env]
monitor_eol = CRLF
monitor_echo = yes
monitor_filters =
esp32_exception_decoder
time
log2file
send_on_enter
[env:M5Stick-C-Plus2]
platform = espressif32@6.6.0

4
src/NerdMinerV2.ino.cpp
View File

@@ -160,8 +160,8 @@ void setup()
TaskHandle_t minerTask1, minerTask2 = NULL;
#ifdef HARDWARE_SHA265
#if defined(CONFIG_IDF_TARGET_ESP32)
//xTaskCreate(minerWorkerHw, "MinerHw-0", 3584, (void*)0, 3, &minerTask1); // Reduced for ESP32 classic
xTaskCreate(minerWorkerSw, "MinerSw-0", 5000, (void*)0, 1, &minerTask1); // Reduced for ESP32 classic
xTaskCreate(minerWorkerHw, "MinerHw-0", 3584, (void*)0, 3, &minerTask1); // Reduced for ESP32 classic
//xTaskCreate(minerWorkerSw, "MinerSw-0", 5000, (void*)0, 1, &minerTask1); // Reduced for ESP32 classic
#else
xTaskCreate(minerWorkerHw, "MinerHw-0", 4096, (void*)0, 3, &minerTask1);
#endif

2
src/drivers/displays/noDisplayDriver.cpp
View File

@@ -7,7 +7,7 @@
#include "wManager.h"
extern monitor_data mMonitor;
bool ledOn = false;
bool ledOn = true;
void noDisplay_Init(void)
{

66
src/mining.cpp
View File

@@ -17,24 +17,13 @@
#include <list>
#include <map>
#include "mbedtls/sha256.h"
//I2C mining support (disabled by default for performance)
#ifdef ENABLE_I2C_MINING
#include "i2c_master.h"
#define I2C_SLAVE_ENABLED
#endif
// Reduce memory usage for ESP32 classic to prevent crashes
#if defined(CONFIG_IDF_TARGET_ESP32)
#define NONCE_PER_JOB_SW 2048 // Reduced from 4096
#define NONCE_PER_JOB_HW 8*1024 // Reduced from 16*1024
#define JOB_QUEUE_SIZE 2 // Reduced queue size
#define RESULT_QUEUE_SIZE 8 // Reduced result queue
#else
#define NONCE_PER_JOB_SW 4096 // Normal for S3/S2/C3
#define NONCE_PER_JOB_HW 16*1024
#define JOB_QUEUE_SIZE 4 // Normal queue size
#define RESULT_QUEUE_SIZE 16 // Normal result queue
#endif
//10 Jobs per second
#define NONCE_PER_JOB_SW 4096
#define NONCE_PER_JOB_HW 16*1024
//#define I2C_SLAVE
//#define SHA256_VALIDATE
//#define RANDOM_NONCE
@@ -104,11 +93,8 @@ bool checkPoolConnection(void) {
//Try connecting pool IP
if (!client.connect(serverIP, Settings.PoolPort)) {
Serial.println("Imposible to connect to : " + Settings.PoolAddress);
// Only retry DNS resolution if we have an invalid IP
if (serverIP == IPAddress(1,1,1,1)) {
WiFi.hostByName(Settings.PoolAddress.c_str(), serverIP);
Serial.printf("Resolved DNS got: %s\n", serverIP.toString());
}
WiFi.hostByName(Settings.PoolAddress.c_str(), serverIP);
Serial.printf("Resolved DNS got: %s\n", serverIP.toString());
return false;
}
@@ -243,7 +229,7 @@ void runStratumWorker(void *name) {
std::map<uint32_t, std::shared_ptr<Submition>> s_submition_map;
#ifdef I2C_SLAVE_ENABLED_ENABLED
#ifdef I2C_SLAVE
std::vector<uint8_t> i2c_slave_vector;
//scan for i2c slaves
@@ -344,8 +330,7 @@ void runStratumWorker(void *name) {
//Read pending messages from pool
while(client.connected() && client.available())
{
static String line; // Reutilizar el mismo objeto String
line = client.readStringUntil('\n');
String line = client.readStringUntil('\n');
//Serial.println(" Received message from pool");
stratum_method result = parse_mining_method(line);
switch (result)
@@ -399,7 +384,7 @@ void runStratumWorker(void *name) {
#ifdef RANDOM_NONCE
nonce_pool = RandomGet() & RANDOM_NONCE_MASK;
#else
#ifdef I2C_SLAVE_ENABLED
#ifdef I2C_SLAVE
if (!i2c_slave_vector.empty())
nonce_pool = 0x10000000;
else
@@ -434,7 +419,7 @@ void runStratumWorker(void *name) {
#endif
}
}
#ifdef I2C_SLAVE_ENABLED
#ifdef I2C_SLAVE
//Nonce for nonce_pool starts from 0x10000000
//For i2c slave we give nonces from 0x20000000, that is 0x10000000 nonces per slave
i2c_feed_slaves(i2c_slave_vector, job_pool & 0xFF, 0x20, currentPoolDifficulty, mMiner.bytearray_blockheader);
@@ -483,7 +468,7 @@ void runStratumWorker(void *name) {
}
std::list<std::shared_ptr<JobResult>> job_result_list;
#ifdef I2C_SLAVE_ENABLED
#ifdef I2C_SLAVE
if (i2c_slave_vector.empty() || job_pool == 0xFFFFFFFF)
{
vTaskDelay(50 / portTICK_PERIOD_MS); //Small delay
@@ -531,7 +516,7 @@ void runStratumWorker(void *name) {
s_job_result_list.clear();
#if 1
while (s_job_request_list_sw.size() < JOB_QUEUE_SIZE)
while (s_job_request_list_sw.size() < 4)
{
JobPush( s_job_request_list_sw, job_pool, nonce_pool, NONCE_PER_JOB_SW, currentPoolDifficulty, mMiner.bytearray_blockheader, diget_mid, bake);
#ifdef RANDOM_NONCE
@@ -543,7 +528,7 @@ void runStratumWorker(void *name) {
#endif
#ifdef HARDWARE_SHA265
while (s_job_request_list_hw.size() < JOB_QUEUE_SIZE)
while (s_job_request_list_hw.size() < 4)
{
#if defined(CONFIG_IDF_TARGET_ESP32)
JobPush( s_job_request_list_hw, job_pool, nonce_pool, NONCE_PER_JOB_HW, currentPoolDifficulty, sha_buffer_swap, hw_midstate, bake);
@@ -613,7 +598,7 @@ void minerWorkerSw(void * task_id)
std::lock_guard<std::mutex> lock(s_job_mutex);
if (result)
{
if (s_job_result_list.size() < RESULT_QUEUE_SIZE)
if (s_job_result_list.size() < 16)
s_job_result_list.push_back(result);
result.reset();
}
@@ -819,7 +804,7 @@ void minerWorkerHw(void * task_id)
std::lock_guard<std::mutex> lock(s_job_mutex);
if (result)
{
if (s_job_result_list.size() < RESULT_QUEUE_SIZE)
if (s_job_result_list.size() < 16)
s_job_result_list.push_back(result);
result.reset();
}
@@ -850,13 +835,17 @@ void minerWorkerHw(void * task_id)
uint32_t nend = job->nonce_start + job->nonce_count;
for (uint32_t n = job->nonce_start; n < nend; ++n)
{
//nerd_sha_hal_wait_idle();
nerd_sha_ll_write_digest(digest_mid);
//nerd_sha_hal_wait_idle();
nerd_sha_ll_fill_text_block_sha256(sha_buffer, n);
//sha_ll_continue_block(SHA2_256);
REG_WRITE(SHA_CONTINUE_REG, 1);
sha_ll_load(SHA2_256);
nerd_sha_hal_wait_idle();
nerd_sha_ll_fill_text_block_sha256_inter();
//sha_ll_start_block(SHA2_256);
REG_WRITE(SHA_START_REG, 1);
sha_ll_load(SHA2_256);
nerd_sha_hal_wait_idle();
@@ -1056,7 +1045,7 @@ void minerWorkerHw(void * task_id)
std::lock_guard<std::mutex> lock(s_job_mutex);
if (result)
{
if (s_job_result_list.size() < RESULT_QUEUE_SIZE)
if (s_job_result_list.size() < 16)
s_job_result_list.push_back(result);
result.reset();
}
@@ -1078,12 +1067,16 @@ void minerWorkerHw(void * task_id)
memcpy(sha_buffer, job->sha_buffer, 80);
esp_sha_lock_engine(SHA2_256);
uint32_t processed_nonces = 0; // Track actually processed nonces
for (uint32_t n = 0; n < job->nonce_count; ++n)
{
//((uint32_t*)(sha_buffer+64+12))[0] = __builtin_bswap32(job->nonce_start+n);
//sha_hal_hash_block(SHA2_256, s_test_buffer, 64/4, true);
//nerd_sha_hal_wait_idle();
nerd_sha_ll_fill_text_block_sha256(sha_buffer);
sha_ll_start_block(SHA2_256);
//sha_hal_hash_block(SHA2_256, s_test_buffer+64, 64/4, false);
nerd_sha_hal_wait_idle();
nerd_sha_ll_fill_text_block_sha256_upper(sha_buffer+64, job->nonce_start+n);
sha_ll_continue_block(SHA2_256);
@@ -1091,6 +1084,8 @@ void minerWorkerHw(void * task_id)
nerd_sha_hal_wait_idle();
sha_ll_load(SHA2_256);
//sha_hal_hash_block(SHA2_256, interResult, 64/4, true);
nerd_sha_hal_wait_idle();
nerd_sha_ll_fill_text_block_sha256_double();
sha_ll_start_block(SHA2_256);
@@ -1098,7 +1093,6 @@ void minerWorkerHw(void * task_id)
sha_ll_load(SHA2_256);
if (nerd_sha_ll_read_digest_swap_if(hash))
{
processed_nonces++; // Only count successful hash operations
//~5 per second
double diff_hash = diff_from_target(hash);
if (diff_hash > result->difficulty)
@@ -1115,12 +1109,10 @@ void minerWorkerHw(void * task_id)
(uint8_t)(n & 0xFF) == 0 &&
s_working_current_job_id != job_in_work)
{
result->nonce_count = processed_nonces; // Use actual processed count
result->nonce_count = n+1;
break;
}
}
// Update final count with actual processed nonces
result->nonce_count = processed_nonces;
esp_sha_unlock_engine(SHA2_256);
} else
vTaskDelay(2 / portTICK_PERIOD_MS);

2
src/version.h
View File

@@ -1,6 +1,6 @@
#ifndef VERSION_H
#define VERSION_H
#define CURRENT_VERSION "V1.8.1"
#define CURRENT_VERSION "V1.8.2"
#endif // VERSION_H