diff --git a/components/asic/bm1397.c b/components/asic/bm1397.c index 454217288..7d0cd79aa 100644 --- a/components/asic/bm1397.c +++ b/components/asic/bm1397.c @@ -115,7 +115,7 @@ static void _send_read_address(void) { unsigned char read_address[2] = {0x00, 0x00}; // send serial data - _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_READ), read_address, 2, BM1937_SERIALTX_DEBUG); + _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_READ), read_address, 2, BM1397_SERIALTX_DEBUG); } static void _send_chain_inactive(void) @@ -123,7 +123,7 @@ static void _send_chain_inactive(void) unsigned char read_address[2] = {0x00, 0x00}; // send serial data - _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_INACTIVE), read_address, 2, BM1937_SERIALTX_DEBUG); + _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_INACTIVE), read_address, 2, BM1397_SERIALTX_DEBUG); } static void _set_chip_address(uint8_t chipAddr) @@ -131,7 +131,7 @@ static void _set_chip_address(uint8_t chipAddr) unsigned char read_address[2] = {chipAddr, 0x00}; // send serial data - _send_BM1397((TYPE_CMD | GROUP_SINGLE | CMD_SETADDRESS), read_address, 2, BM1937_SERIALTX_DEBUG); + _send_BM1397((TYPE_CMD | GROUP_SINGLE | CMD_SETADDRESS), read_address, 2, BM1397_SERIALTX_DEBUG); } void BM1397_set_version_mask(uint32_t version_mask) { @@ -214,12 +214,12 @@ void BM1397_send_hash_frequency(float frequency) for (i = 0; i < 2; i++) { vTaskDelay(10 / portTICK_PERIOD_MS); - _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), prefreq1, 6, BM1937_SERIALTX_DEBUG); + _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), prefreq1, 6, BM1397_SERIALTX_DEBUG); } for (i = 0; i < 2; i++) { vTaskDelay(10 / portTICK_PERIOD_MS); - _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), freqbuf, 6, BM1937_SERIALTX_DEBUG); + _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), freqbuf, 6, BM1397_SERIALTX_DEBUG); } vTaskDelay(10 / portTICK_PERIOD_MS); @@ -248,24 +248,24 @@ static uint8_t _send_init(uint64_t frequency, uint16_t asic_count) } unsigned char init[6] = {0x00, CLOCK_ORDER_CONTROL_0, 0x00, 0x00, 0x00, 0x00}; // init1 - clock_order_control0 - _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), init, 6, BM1937_SERIALTX_DEBUG); + _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), init, 6, BM1397_SERIALTX_DEBUG); unsigned char init2[6] = {0x00, CLOCK_ORDER_CONTROL_1, 0x00, 0x00, 0x00, 0x00}; // init2 - clock_order_control1 - _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), init2, 6, BM1937_SERIALTX_DEBUG); + _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), init2, 6, BM1397_SERIALTX_DEBUG); unsigned char init3[9] = {0x00, ORDERED_CLOCK_ENABLE, 0x00, 0x00, 0x00, 0x01}; // init3 - ordered_clock_enable - _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), init3, 6, BM1937_SERIALTX_DEBUG); + _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), init3, 6, BM1397_SERIALTX_DEBUG); unsigned char init4[9] = {0x00, CORE_REGISTER_CONTROL, 0x80, 0x00, 0x80, 0x74}; // init4 - init_4_? - _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), init4, 6, BM1937_SERIALTX_DEBUG); + _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), init4, 6, BM1397_SERIALTX_DEBUG); BM1397_set_job_difficulty_mask(BM1397_ASIC_DIFFICULTY); unsigned char init5[9] = {0x00, PLL3_PARAMETER, 0xC0, 0x70, 0x01, 0x11}; // init5 - pll3_parameter - _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), init5, 6, BM1937_SERIALTX_DEBUG); + _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), init5, 6, BM1397_SERIALTX_DEBUG); unsigned char init6[9] = {0x00, FAST_UART_CONFIGURATION, 0x06, 0x00, 0x00, 0x0F}; // init6 - fast_uart_configuration - _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), init6, 6, BM1937_SERIALTX_DEBUG); + _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), init6, 6, BM1397_SERIALTX_DEBUG); BM1397_set_default_baud(); @@ -308,7 +308,7 @@ int BM1397_set_default_baud(void) { // default divider of 26 (11010) for 115,749 unsigned char baudrate[9] = {0x00, MISC_CONTROL, 0x00, 0x00, 0b01111010, 0b00110001}; // baudrate - misc_control - _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), baudrate, 6, BM1937_SERIALTX_DEBUG); + _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), baudrate, 6, BM1397_SERIALTX_DEBUG); return 115749; } @@ -318,7 +318,7 @@ int BM1397_set_max_baud(void) ESP_LOGI(TAG, "Setting max baud of 3125000"); unsigned char baudrate[9] = {0x00, MISC_CONTROL, 0x00, 0x00, 0b01100000, 0b00110001}; ; // baudrate - misc_control - _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), baudrate, 6, BM1937_SERIALTX_DEBUG); + _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), baudrate, 6, BM1397_SERIALTX_DEBUG); return 3125000; } @@ -348,7 +348,7 @@ void BM1397_set_job_difficulty_mask(int difficulty) ESP_LOGI(TAG, "Setting job ASIC mask to %d", difficulty); - _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), job_difficulty_mask, 6, BM1937_SERIALTX_DEBUG); + _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_WRITE), job_difficulty_mask, 6, BM1397_SERIALTX_DEBUG); } static uint8_t id = 0; diff --git a/components/asic/include/bm1397.h b/components/asic/include/bm1397.h index bf41069d9..9d4fa361c 100644 --- a/components/asic/include/bm1397.h +++ b/components/asic/include/bm1397.h @@ -9,8 +9,8 @@ #define BM1397_ASIC_DIFFICULTY 256 -#define BM1937_SERIALTX_DEBUG true -#define BM1937_SERIALRX_DEBUG false +#define BM1397_SERIALTX_DEBUG true +#define BM1397_SERIALRX_DEBUG false #define BM1397_DEBUG_WORK false //causes insane amount of debug output #define BM1397_DEBUG_JOBS false //causes insane amount of debug output diff --git a/components/asic/serial.c b/components/asic/serial.c index 8dfef55b1..748d892b8 100644 --- a/components/asic/serial.c +++ b/components/asic/serial.c @@ -73,7 +73,7 @@ int16_t SERIAL_rx(uint8_t *buf, uint16_t size, uint16_t timeout_ms) { int16_t bytes_read = uart_read_bytes(UART_NUM_1, buf, size, timeout_ms / portTICK_PERIOD_MS); - #if BM1937_SERIALRX_DEBUG || BM1366_SERIALRX_DEBUG || BM1368_SERIALRX_DEBUG + #if BM1397_SERIALRX_DEBUG || BM1366_SERIALRX_DEBUG || BM1368_SERIALRX_DEBUG size_t buff_len = 0; if (bytes_read > 0) { uart_get_buffered_data_len(UART_NUM_1, &buff_len);