Просмотр исходного кода

FuriHal: temporary switch to hal ticks for timeouts. (#880)

あく 4 лет назад
Родитель
Сommit
bb96509ed1
2 измененных файлов с 12 добавлено и 12 удалено
  1. 6 6
      firmware/targets/f6/furi-hal/furi-hal-i2c.c
  2. 6 6
      firmware/targets/f7/furi-hal/furi-hal-i2c.c

+ 6 - 6
firmware/targets/f6/furi-hal/furi-hal-i2c.c

@@ -51,11 +51,11 @@ bool furi_hal_i2c_tx(
     furi_assert(timeout > 0);
     furi_assert(timeout > 0);
 
 
     bool ret = true;
     bool ret = true;
-    uint32_t timeout_tick = osKernelGetTickCount() + timeout;
+    uint32_t timeout_tick = HAL_GetTick() + timeout;
 
 
     do {
     do {
         while(LL_I2C_IsActiveFlag_BUSY(handle->bus->i2c)) {
         while(LL_I2C_IsActiveFlag_BUSY(handle->bus->i2c)) {
-            if(osKernelGetTickCount() >= timeout_tick) {
+            if(HAL_GetTick() >= timeout_tick) {
                 ret = false;
                 ret = false;
                 break;
                 break;
             }
             }
@@ -80,7 +80,7 @@ bool furi_hal_i2c_tx(
                 size--;
                 size--;
             }
             }
 
 
-            if(osKernelGetTickCount() >= timeout_tick) {
+            if(HAL_GetTick() >= timeout_tick) {
                 ret = false;
                 ret = false;
                 break;
                 break;
             }
             }
@@ -103,11 +103,11 @@ bool furi_hal_i2c_rx(
     furi_assert(timeout > 0);
     furi_assert(timeout > 0);
 
 
     bool ret = true;
     bool ret = true;
-    uint32_t timeout_tick = osKernelGetTickCount() + timeout;
+    uint32_t timeout_tick = HAL_GetTick() + timeout;
 
 
     do {
     do {
         while(LL_I2C_IsActiveFlag_BUSY(handle->bus->i2c)) {
         while(LL_I2C_IsActiveFlag_BUSY(handle->bus->i2c)) {
-            if(osKernelGetTickCount() >= timeout_tick) {
+            if(HAL_GetTick() >= timeout_tick) {
                 ret = false;
                 ret = false;
                 break;
                 break;
             }
             }
@@ -132,7 +132,7 @@ bool furi_hal_i2c_rx(
                 size--;
                 size--;
             }
             }
 
 
-            if(osKernelGetTickCount() >= timeout_tick) {
+            if(HAL_GetTick() >= timeout_tick) {
                 ret = false;
                 ret = false;
                 break;
                 break;
             }
             }

+ 6 - 6
firmware/targets/f7/furi-hal/furi-hal-i2c.c

@@ -51,11 +51,11 @@ bool furi_hal_i2c_tx(
     furi_assert(timeout > 0);
     furi_assert(timeout > 0);
 
 
     bool ret = true;
     bool ret = true;
-    uint32_t timeout_tick = osKernelGetTickCount() + timeout;
+    uint32_t timeout_tick = HAL_GetTick() + timeout;
 
 
     do {
     do {
         while(LL_I2C_IsActiveFlag_BUSY(handle->bus->i2c)) {
         while(LL_I2C_IsActiveFlag_BUSY(handle->bus->i2c)) {
-            if(osKernelGetTickCount() >= timeout_tick) {
+            if(HAL_GetTick() >= timeout_tick) {
                 ret = false;
                 ret = false;
                 break;
                 break;
             }
             }
@@ -80,7 +80,7 @@ bool furi_hal_i2c_tx(
                 size--;
                 size--;
             }
             }
 
 
-            if(osKernelGetTickCount() >= timeout_tick) {
+            if(HAL_GetTick() >= timeout_tick) {
                 ret = false;
                 ret = false;
                 break;
                 break;
             }
             }
@@ -103,11 +103,11 @@ bool furi_hal_i2c_rx(
     furi_assert(timeout > 0);
     furi_assert(timeout > 0);
 
 
     bool ret = true;
     bool ret = true;
-    uint32_t timeout_tick = osKernelGetTickCount() + timeout;
+    uint32_t timeout_tick = HAL_GetTick() + timeout;
 
 
     do {
     do {
         while(LL_I2C_IsActiveFlag_BUSY(handle->bus->i2c)) {
         while(LL_I2C_IsActiveFlag_BUSY(handle->bus->i2c)) {
-            if(osKernelGetTickCount() >= timeout_tick) {
+            if(HAL_GetTick() >= timeout_tick) {
                 ret = false;
                 ret = false;
                 break;
                 break;
             }
             }
@@ -132,7 +132,7 @@ bool furi_hal_i2c_rx(
                 size--;
                 size--;
             }
             }
 
 
-            if(osKernelGetTickCount() >= timeout_tick) {
+            if(HAL_GetTick() >= timeout_tick) {
                 ret = false;
                 ret = false;
                 break;
                 break;
             }
             }