From 87d7e7c5d0a3b2e90e73abdc8bb61dcab036a63f Mon Sep 17 00:00:00 2001 From: Georges Palauqui Date: Wed, 16 Aug 2023 16:55:10 +0200 Subject: [PATCH] Fix build with IDF-5.1 --- components/bm1397/bm1397.c | 21 ++++++++++----------- components/connect/CMakeLists.txt | 2 +- components/stratum/stratum_api.c | 4 ++-- components/stratum/utils.c | 4 ++-- main/DS4432U.c | 4 ++-- main/EMC2101.c | 4 ++-- main/INA260.c | 4 ++-- main/miner.c | 2 +- main/oled.c | 2 +- main/system.c | 14 +++++++------- main/tasks/asic_result_task.c | 2 +- main/tasks/asic_task.c | 4 ++-- main/tasks/power_management_task.c | 2 +- main/tasks/stratum_task.c | 4 ++-- 14 files changed, 36 insertions(+), 37 deletions(-) diff --git a/components/bm1397/bm1397.c b/components/bm1397/bm1397.c index 78b22292..a4249cc1 100644 --- a/components/bm1397/bm1397.c +++ b/components/bm1397/bm1397.c @@ -164,24 +164,24 @@ void BM1397_send_hash_frequency(float frequency) { } for (i = 0; i < 2; i++) { - vTaskDelay(10 / portTICK_RATE_MS); - _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), prefreq1, 6, false); + vTaskDelay(10 / portTICK_PERIOD_MS); + _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), prefreq1, 6, false); } for (i = 0; i < 2; i++) { - vTaskDelay(10 / portTICK_RATE_MS); - _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), freqbuf, 6, false); + vTaskDelay(10 / portTICK_PERIOD_MS); + _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), freqbuf, 6, false); } - vTaskDelay(10 / portTICK_RATE_MS); + vTaskDelay(10 / portTICK_PERIOD_MS); - ESP_LOGI(TAG, "Setting Frequency to %.2fMHz (%.2f)", frequency, newf); + ESP_LOGI(TAG, "Setting Frequency to %.2fMHz (%.2f)", frequency, newf); } static void _send_init(u_int64_t frequency) { //send serial data - vTaskDelay(SLEEP_TIME / portTICK_RATE_MS); + vTaskDelay(SLEEP_TIME / portTICK_PERIOD_MS); _send_chain_inactive(); _set_chip_address(0x00); @@ -217,14 +217,13 @@ static void _reset(void) { gpio_set_level(BM1397_RST_PIN, 0); //delay for 100ms - vTaskDelay(100 / portTICK_RATE_MS); + vTaskDelay(100 / portTICK_PERIOD_MS); //set the gpio pin high gpio_set_level(BM1397_RST_PIN, 1); //delay for 100ms - vTaskDelay(100 / portTICK_RATE_MS); - + vTaskDelay(100 / portTICK_PERIOD_MS); } @@ -239,7 +238,7 @@ static void _send_read_address(void) { void BM1397_init(u_int64_t frequency) { ESP_LOGI(TAG, "Initializing BM1397"); - gpio_pad_select_gpio(BM1397_RST_PIN); + esp_rom_gpio_pad_select_gpio(BM1397_RST_PIN); gpio_set_direction(BM1397_RST_PIN, GPIO_MODE_OUTPUT); //reset the bm1397 diff --git a/components/connect/CMakeLists.txt b/components/connect/CMakeLists.txt index e03326af..323ca308 100644 --- a/components/connect/CMakeLists.txt +++ b/components/connect/CMakeLists.txt @@ -4,5 +4,5 @@ SRCS INCLUDE_DIRS "include" "../../main" -REQUIRES nvs_flash +REQUIRES nvs_flash esp_wifi esp_event ) \ No newline at end of file diff --git a/components/stratum/stratum_api.c b/components/stratum/stratum_api.c index 924ffeba..1bcc5833 100644 --- a/components/stratum/stratum_api.c +++ b/components/stratum/stratum_api.c @@ -272,7 +272,7 @@ int STRATUM_V1_subscribe(int socket, char ** extranonce, int * extranonce2_len) int STRATUM_V1_suggest_difficulty(int socket, uint32_t difficulty) { char difficulty_msg[BUFFER_SIZE]; - sprintf(difficulty_msg, "{\"id\": %d, \"method\": \"mining.suggest_difficulty\", \"params\": [%d]}\n", send_uid++, difficulty); + sprintf(difficulty_msg, "{\"id\": %d, \"method\": \"mining.suggest_difficulty\", \"params\": [%ld]}\n", send_uid++, difficulty); debug_stratum_tx(difficulty_msg); write(socket, difficulty_msg, strlen(difficulty_msg)); @@ -311,7 +311,7 @@ void STRATUM_V1_submit_share(int socket, const char * username, const char * job const uint32_t version) { char submit_msg[BUFFER_SIZE]; - sprintf(submit_msg, "{\"id\": %d, \"method\": \"mining.submit\", \"params\": [\"%s\", \"%s\", \"%s\", \"%08x\", \"%08x\", \"%08x\"]}\n", + sprintf(submit_msg, "{\"id\": %d, \"method\": \"mining.submit\", \"params\": [\"%s\", \"%s\", \"%s\", \"%08lx\", \"%08lx\", \"%08lx\"]}\n", send_uid++, username, jobid, extranonce_2, ntime, nonce, version); debug_stratum_tx(submit_msg); write(socket, submit_msg, strlen(submit_msg)); diff --git a/components/stratum/utils.c b/components/stratum/utils.c index e1f09fb9..0c21a222 100644 --- a/components/stratum/utils.c +++ b/components/stratum/utils.c @@ -198,8 +198,8 @@ void midstate_sha256_bin( const uint8_t * data, const size_t data_len, uint8_t * //Calculate midstate mbedtls_sha256_init(&midstate); - mbedtls_sha256_starts_ret(&midstate, 0); - mbedtls_sha256_update_ret(&midstate, data, 64); + mbedtls_sha256_starts(&midstate, 0); + mbedtls_sha256_update(&midstate, data, 64); //memcpy(dest, midstate.state, 32); flip32bytes(dest, midstate.state); diff --git a/main/DS4432U.c b/main/DS4432U.c index 7718cb32..81ffc077 100644 --- a/main/DS4432U.c +++ b/main/DS4432U.c @@ -87,7 +87,7 @@ esp_err_t i2c_master_delete(void) { * @brief Read a sequence of I2C bytes */ static esp_err_t register_read(uint8_t reg_addr, uint8_t *data, size_t len) { - return i2c_master_write_read_device(I2C_MASTER_NUM, DS4432U_SENSOR_ADDR, ®_addr, 1, data, len, I2C_MASTER_TIMEOUT_MS / portTICK_RATE_MS); + return i2c_master_write_read_device(I2C_MASTER_NUM, DS4432U_SENSOR_ADDR, ®_addr, 1, data, len, I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS); } /** @@ -97,7 +97,7 @@ static esp_err_t register_write_byte(uint8_t reg_addr, uint8_t data) { int ret; uint8_t write_buf[2] = {reg_addr, data}; - ret = i2c_master_write_to_device(I2C_MASTER_NUM, DS4432U_SENSOR_ADDR, write_buf, sizeof(write_buf), I2C_MASTER_TIMEOUT_MS / portTICK_RATE_MS); + ret = i2c_master_write_to_device(I2C_MASTER_NUM, DS4432U_SENSOR_ADDR, write_buf, sizeof(write_buf), I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS); return ret; } diff --git a/main/EMC2101.c b/main/EMC2101.c index 47577ad6..9b589cc8 100644 --- a/main/EMC2101.c +++ b/main/EMC2101.c @@ -18,7 +18,7 @@ * @brief Read a sequence of I2C bytes */ static esp_err_t register_read(uint8_t reg_addr, uint8_t *data, size_t len) { - return i2c_master_write_read_device(I2C_MASTER_NUM, EMC2101_I2CADDR_DEFAULT, ®_addr, 1, data, len, I2C_MASTER_TIMEOUT_MS / portTICK_RATE_MS); + return i2c_master_write_read_device(I2C_MASTER_NUM, EMC2101_I2CADDR_DEFAULT, ®_addr, 1, data, len, I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS); } /** @@ -28,7 +28,7 @@ static esp_err_t register_write_byte(uint8_t reg_addr, uint8_t data) { int ret; uint8_t write_buf[2] = {reg_addr, data}; - ret = i2c_master_write_to_device(I2C_MASTER_NUM, EMC2101_I2CADDR_DEFAULT, write_buf, sizeof(write_buf), I2C_MASTER_TIMEOUT_MS / portTICK_RATE_MS); + ret = i2c_master_write_to_device(I2C_MASTER_NUM, EMC2101_I2CADDR_DEFAULT, write_buf, sizeof(write_buf), I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS); return ret; } diff --git a/main/INA260.c b/main/INA260.c index 270f5371..0cd0a691 100644 --- a/main/INA260.c +++ b/main/INA260.c @@ -18,7 +18,7 @@ * @brief Read a sequence of I2C bytes */ static esp_err_t register_read(uint8_t reg_addr, uint8_t *data, size_t len) { - return i2c_master_write_read_device(I2C_MASTER_NUM, INA260_I2CADDR_DEFAULT, ®_addr, 1, data, len, I2C_MASTER_TIMEOUT_MS / portTICK_RATE_MS); + return i2c_master_write_read_device(I2C_MASTER_NUM, INA260_I2CADDR_DEFAULT, ®_addr, 1, data, len, I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS); } /** @@ -28,7 +28,7 @@ static esp_err_t register_read(uint8_t reg_addr, uint8_t *data, size_t len) { // int ret; // uint8_t write_buf[2] = {reg_addr, data}; -// ret = i2c_master_write_to_device(I2C_MASTER_NUM, INA260_I2CADDR_DEFAULT, write_buf, sizeof(write_buf), I2C_MASTER_TIMEOUT_MS / portTICK_RATE_MS); +// ret = i2c_master_write_to_device(I2C_MASTER_NUM, INA260_I2CADDR_DEFAULT, write_buf, sizeof(write_buf), I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS); // return ret; // } diff --git a/main/miner.c b/main/miner.c index 67163803..bf16e4b7 100755 --- a/main/miner.c +++ b/main/miner.c @@ -32,7 +32,7 @@ void app_main(void) { ESP_LOGI(TAG, "Welcome to the bitaxe!"); //wait between 0 and 5 seconds for multiple units - vTaskDelay(rand() % 5001 / portTICK_RATE_MS); + vTaskDelay(rand() % 5001 / portTICK_PERIOD_MS); ESP_ERROR_CHECK(nvs_flash_init()); xTaskCreate(SYSTEM_task, "SYSTEM_task", 4096, (void*)&GLOBAL_STATE, 3, NULL); diff --git a/main/oled.c b/main/oled.c index e7349a6b..41350109 100644 --- a/main/oled.c +++ b/main/oled.c @@ -285,7 +285,7 @@ bool OLED_status(void) { static esp_err_t write(uint8_t *data, uint8_t len) { int ret; - ret = i2c_master_write_to_device(I2C_MASTER_NUM, 0x3C, data, len, 1000 / portTICK_RATE_MS); + ret = i2c_master_write_to_device(I2C_MASTER_NUM, 0x3C, data, len, 1000 / portTICK_PERIOD_MS); return ret; } \ No newline at end of file diff --git a/main/system.c b/main/system.c index 707fa157..4c19d128 100644 --- a/main/system.c +++ b/main/system.c @@ -17,7 +17,7 @@ #include #include #include "global_state.h" - +#include "esp_timer.h" static const char *TAG = "SystemModule"; @@ -71,7 +71,7 @@ static void _init_system(SystemModule* module) { //Fan Tests EMC2101_init(); EMC2101_set_fan_speed(0.75); - vTaskDelay(500 / portTICK_RATE_MS); + vTaskDelay(500 / portTICK_PERIOD_MS); //oled if (!OLED_init()) { @@ -166,7 +166,7 @@ static void _update_esp32_info(SystemModule* module) { if (OLED_status()) { memset(module->oled_buf, 0, 20); - snprintf(module->oled_buf, 20, "FH: %u bytes", free_heap_size); + snprintf(module->oled_buf, 20, "FH: %lu bytes", free_heap_size); OLED_writeString(0, 0, module->oled_buf); memset(module->oled_buf, 0, 20); @@ -328,7 +328,7 @@ void SYSTEM_task(void *pvParameters) { //show the connection screen while (!module->startup_done) { _update_connection(module); - vTaskDelay(100 / portTICK_RATE_MS); + vTaskDelay(100 / portTICK_PERIOD_MS); } @@ -336,17 +336,17 @@ void SYSTEM_task(void *pvParameters) { _clear_display(); module->screen_page = 0; _update_system_performance(module); - vTaskDelay(40000 / portTICK_RATE_MS); + vTaskDelay(40000 / portTICK_PERIOD_MS); _clear_display(); module->screen_page = 1; _update_system_info(GLOBAL_STATE); - vTaskDelay(10000 / portTICK_RATE_MS); + vTaskDelay(10000 / portTICK_PERIOD_MS); _clear_display(); module->screen_page = 2; _update_esp32_info(module); - vTaskDelay(10000 / portTICK_RATE_MS); + vTaskDelay(10000 / portTICK_PERIOD_MS); } } diff --git a/main/tasks/asic_result_task.c b/main/tasks/asic_result_task.c index c625abd2..19c9e86f 100644 --- a/main/tasks/asic_result_task.c +++ b/main/tasks/asic_result_task.c @@ -77,7 +77,7 @@ void ASIC_result_task(void * pvParameters) rx_midstate_index ); - ESP_LOGI(TAG, "Nonce difficulty %.2f of %d.", nonce_diff, GLOBAL_STATE->ASIC_TASK_MODULE.active_jobs[rx_job_id]->pool_diff); + ESP_LOGI(TAG, "Nonce difficulty %.2f of %ld.", nonce_diff, GLOBAL_STATE->ASIC_TASK_MODULE.active_jobs[rx_job_id]->pool_diff); if (nonce_diff > GLOBAL_STATE->ASIC_TASK_MODULE.active_jobs[rx_job_id]->pool_diff) { diff --git a/main/tasks/asic_task.c b/main/tasks/asic_task.c index 070b990c..a1bb7944 100644 --- a/main/tasks/asic_task.c +++ b/main/tasks/asic_task.c @@ -40,7 +40,7 @@ void ASIC_task(void * pvParameters) bm_job * next_bm_job = (bm_job *) queue_dequeue(&GLOBAL_STATE->ASIC_jobs_queue); if(next_bm_job->pool_diff != GLOBAL_STATE->stratum_difficulty){ - ESP_LOGI(TAG, "New difficulty %d", next_bm_job->pool_diff); + ESP_LOGI(TAG, "New difficulty %ld", next_bm_job->pool_diff); BM1397_set_job_difficulty_mask(next_bm_job->pool_diff); GLOBAL_STATE->stratum_difficulty = next_bm_job->pool_diff; } @@ -83,7 +83,7 @@ void ASIC_task(void * pvParameters) BM1397_send_work(&job); //send the job to the ASIC //Time to execute the above code is ~0.3ms - vTaskDelay((BM1397_FULLSCAN_MS - 0.3 ) / portTICK_RATE_MS); + vTaskDelay((BM1397_FULLSCAN_MS - 0.3 ) / portTICK_PERIOD_MS); } } diff --git a/main/tasks/power_management_task.c b/main/tasks/power_management_task.c index 12e6d26d..354836c5 100644 --- a/main/tasks/power_management_task.c +++ b/main/tasks/power_management_task.c @@ -116,6 +116,6 @@ void POWER_MANAGEMENT_task(void * pvParameters){ //ESP_LOGI(TAG, "target %f, Freq %f, Volt %f, Power %f", target_frequency, power_management->frequency_value, power_management->voltage, power_management->power); - vTaskDelay(POLL_RATE / portTICK_RATE_MS); + vTaskDelay(POLL_RATE / portTICK_PERIOD_MS); } } \ No newline at end of file diff --git a/main/tasks/stratum_task.c b/main/tasks/stratum_task.c index 93b4d758..31138443 100644 --- a/main/tasks/stratum_task.c +++ b/main/tasks/stratum_task.c @@ -136,12 +136,12 @@ void stratum_task(void * pvParameters) } else if (stratum_api_v1_message.method == MINING_SET_DIFFICULTY) { if (stratum_api_v1_message.new_difficulty != SYSTEM_TASK_MODULE.stratum_difficulty) { SYSTEM_TASK_MODULE.stratum_difficulty = stratum_api_v1_message.new_difficulty; - ESP_LOGI(TAG, "Set stratum difficulty: %d", SYSTEM_TASK_MODULE.stratum_difficulty); + ESP_LOGI(TAG, "Set stratum difficulty: %ld", SYSTEM_TASK_MODULE.stratum_difficulty); } } else if (stratum_api_v1_message.method == MINING_SET_VERSION_MASK || stratum_api_v1_message.method == STRATUM_RESULT_VERSION_MASK) { //1fffe000 - ESP_LOGI(TAG, "Set version mask: %08x", stratum_api_v1_message.version_mask); + ESP_LOGI(TAG, "Set version mask: %08lx", stratum_api_v1_message.version_mask); GLOBAL_STATE->version_mask = stratum_api_v1_message.version_mask; } else if (stratum_api_v1_message.method == STRATUM_RESULT) {