highperfocused/ESP-Miner
1
0
Fork 0
mirror of https://github.com/skot/ESP-Miner.git synced 2025-04-10 04:49:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix screen 1 breaking when share found

Browse Source
This commit is contained in:
Ben 2024-01-07 00:55:17 -05:00
parent 84c06110f6
commit 9eee3ae359
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
main/system.c
View File

@ -93,15 +93,14 @@ static void _init_system(GlobalState * global_state, SystemModule * module)
netif = esp_netif_get_handle_from_ifkey("WIFI_STA_DEF");
}
static void _update_hashrate(GlobalState * GLOBAL_STATE)
static void _update_hashrate(SystemModule * module, float power)
{
SystemModule * module = &GLOBAL_STATE->SYSTEM_MODULE;
if (module->screen_page != 0) {
return;
}
float efficiency = GLOBAL_STATE->POWER_MANAGEMENT_MODULE.power / (module->current_hashrate / 1000.0);
float efficiency = power / (module->current_hashrate / 1000.0);
OLED_clearLine(0);
memset(module->oled_buf, 0, 20);
@ -230,7 +229,7 @@ static void _update_system_performance(GlobalState * GLOBAL_STATE)
if (OLED_status()) {
_update_hashrate(GLOBAL_STATE);
_update_hashrate(module, GLOBAL_STATE->POWER_MANAGEMENT_MODULE.power);
_update_shares(module);
_update_best_diff(module);
@ -424,7 +423,7 @@ void SYSTEM_notify_new_ntime(SystemModule * module, uint32_t ntime)
settimeofday(&tv, NULL);
}
void SYSTEM_notify_found_nonce(SystemModule * module, double pool_diff, double found_diff, uint32_t nbits)
void SYSTEM_notify_found_nonce(SystemModule * module, double pool_diff, double found_diff, uint32_t nbits, float power)
{
// Calculate the time difference in seconds with sub-second precision
@ -459,7 +458,7 @@ void SYSTEM_notify_found_nonce(SystemModule * module, double pool_diff, double f
module->current_hashrate = ((module->current_hashrate * 9) + rolling_rate) / 10;
}
_update_hashrate(module);
_update_hashrate(module, power);
// logArrayContents(historical_hashrate, HISTORY_LENGTH);
// logArrayContents(historical_hashrate_time_stamps, HISTORY_LENGTH);

12
main/system.h
View File

@ -31,12 +31,12 @@ typedef struct
uint32_t lastClockSync;
} SystemModule;
void SYSTEM_task(void *parameters);
void SYSTEM_task(void * parameters);
void SYSTEM_notify_accepted_share(SystemModule *module);
void SYSTEM_notify_rejected_share(SystemModule *module);
void SYSTEM_notify_found_nonce(SystemModule *module, double pool_diff, double found_diff, uint32_t nbits);
void SYSTEM_notify_mining_started(SystemModule *module);
void SYSTEM_notify_new_ntime(SystemModule *module, uint32_t ntime);
void SYSTEM_notify_accepted_share(SystemModule * module);
void SYSTEM_notify_rejected_share(SystemModule * module);
void SYSTEM_notify_found_nonce(SystemModule * module, double pool_diff, double found_diff, uint32_t nbits, float power);
void SYSTEM_notify_mining_started(SystemModule * module);
void SYSTEM_notify_new_ntime(SystemModule * module, uint32_t ntime);
#endif /* SYSTEM_H_ */

4
main/tasks/asic_result_task.c
View File

@ -47,7 +47,9 @@ void ASIC_result_task(void *pvParameters)
&GLOBAL_STATE->SYSTEM_MODULE,
GLOBAL_STATE->ASIC_TASK_MODULE.active_jobs[job_id]->pool_diff,
nonce_diff,
GLOBAL_STATE->ASIC_TASK_MODULE.active_jobs[job_id]->target);
GLOBAL_STATE->ASIC_TASK_MODULE.active_jobs[job_id]->target,
GLOBAL_STATE->POWER_MANAGEMENT_MODULE.power
);
STRATUM_V1_submit_share(
GLOBAL_STATE->sock,