WantClue/NerdNos-Firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #107 from golden-guy/fix/parse-stratum-success

Browse Source 
Miner cosmetics
This commit is contained in:
BitMaker 2023-07-29 11:47:57 +02:00 committed by GitHub
commit 5e45ed0f49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mining.cpp
View File

@ -141,6 +141,8 @@ void runStratumWorker(void *name) {
if(!isMinerSuscribed){ if(!isMinerSuscribed){
//Stop miner current jobs
mMiner.inRun = false;
mWorker = init_mining_subscribe(); mWorker = init_mining_subscribe();
// STEP 1: Pool server connection (SUBSCRIBE) // STEP 1: Pool server connection (SUBSCRIBE)
@ -197,6 +199,7 @@ void runStratumWorker(void *name) {
case MINING_SET_DIFFICULTY: parse_mining_set_difficulty(line, currentPoolDifficulty); case MINING_SET_DIFFICULTY: parse_mining_set_difficulty(line, currentPoolDifficulty);
mMiner.poolDifficulty = currentPoolDifficulty; mMiner.poolDifficulty = currentPoolDifficulty;
break; break;
case STRATUM_SUCCESS: Serial.println(" Parsed JSON: Success"); break;
default: Serial.println(" Parsed JSON: unknown"); break; default: Serial.println(" Parsed JSON: unknown"); break;
} }

9
src/stratum.cpp
View File

@ -142,8 +142,13 @@ stratum_method parse_mining_method(String line)
if (error || checkError(doc)) return STRATUM_PARSE_ERROR; if (error || checkError(doc)) return STRATUM_PARSE_ERROR;
if (!doc.containsKey("method")) return STRATUM_UNKNOWN; if (!doc.containsKey("method")) {
// "error":null means success
if (doc["error"].isNull())
return STRATUM_SUCCESS;
else
return STRATUM_UNKNOWN;
}
stratum_method result = STRATUM_UNKNOWN; stratum_method result = STRATUM_UNKNOWN;
if (strcmp("mining.notify", (const char*) doc["method"]) == 0) { if (strcmp("mining.notify", (const char*) doc["method"]) == 0) {

1
src/stratum.h
View File

@ -38,6 +38,7 @@ typedef struct {
} mining_job; } mining_job;
typedef enum { typedef enum {
STRATUM_SUCCESS,
STRATUM_UNKNOWN, STRATUM_UNKNOWN,
STRATUM_PARSE_ERROR, STRATUM_PARSE_ERROR,
MINING_NOTIFY, MINING_NOTIFY,