Przeglądaj źródła

Mass app fixes for new API

Thanks @Willy-JL for finding issues and fixing many of those apps
Other apps fixed by me
MX 2 lat temu
rodzic
commit
ceb9e0238e
2 zmienionych plików z 4 dodań i 4 usunięć
  1. 2 2
      esp_flasher_worker.c
  2. 2 2
      lib/esp-serial-flasher/port/esp32_port.c

+ 2 - 2
esp_flasher_worker.c

@@ -343,7 +343,7 @@ void esp_flasher_worker_stop_thread(EspFlasherApp* app) {
 }
 
 esp_loader_error_t loader_port_read(uint8_t* data, uint16_t size, uint32_t timeout) {
-    size_t read = furi_stream_buffer_receive(flash_rx_stream, data, size, pdMS_TO_TICKS(timeout));
+    size_t read = furi_stream_buffer_receive(flash_rx_stream, data, size, timeout);
     if(read < size) {
         return ESP_LOADER_ERROR_TIMEOUT;
     } else {
@@ -380,7 +380,7 @@ void loader_port_delay_ms(uint32_t ms) {
 
 void loader_port_start_timer(uint32_t ms) {
     _remaining_time = ms;
-    furi_timer_start(timer, pdMS_TO_TICKS(1));
+    furi_timer_start(timer, 1);
 }
 
 uint32_t loader_port_remaining_time(void) {

+ 2 - 2
lib/esp-serial-flasher/port/esp32_port.c

@@ -96,7 +96,7 @@ void loader_port_esp32_deinit(void)
 esp_loader_error_t loader_port_write(const uint8_t *data, uint16_t size, uint32_t timeout)
 {
     uart_write_bytes(s_uart_port, (const char *)data, size);
-    esp_err_t err = uart_wait_tx_done(s_uart_port, pdMS_TO_TICKS(timeout));
+    esp_err_t err = uart_wait_tx_done(s_uart_port, timeout);
 
     if (err == ESP_OK) {
 #ifdef SERIAL_FLASHER_DEBUG_TRACE
@@ -113,7 +113,7 @@ esp_loader_error_t loader_port_write(const uint8_t *data, uint16_t size, uint32_
 
 esp_loader_error_t loader_port_read(uint8_t *data, uint16_t size, uint32_t timeout)
 {
-    int read = uart_read_bytes(s_uart_port, data, size, pdMS_TO_TICKS(timeout));
+    int read = uart_read_bytes(s_uart_port, data, size, timeout);
 
     if (read < 0) {
         return ESP_LOADER_ERROR_FAIL;