Merge pull request #2 from niki-timofe/ibutton-rework

onewire: support rewritten onewire host
niki-timofe · Mar 13, 2023 · 85d73ef · 85d73ef
2 parents e9c04ae + a7bdc63
commit 85d73ef
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,6 +1,16 @@
 name: build
-on: [push]
-jobs: 
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
+      - converted_to_draft
+jobs:
   build:
     runs-on: ubuntu-latest
     defaults:
@@ -15,7 +25,7 @@ jobs:
             experimental: true
           - channel: release
             experimental: false
-    continue-on-error: ${{ matrix.experimental }}
+    continue-on-error: ${{ matrix.experimental || github.event.pull_request && github.event.pull_request.draft }}
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/onewire/onewire_worker.c b/onewire/onewire_worker.c
@@ -52,7 +52,7 @@ void onewire_worker_search(OneWireWorker* instance) {
     furi_hal_power_enable_otg();
 
     while(instance->state == OneWireWorkerSearch) {
-        if(!onewire_host_search(instance->onewire_host, onewire_device->address, NORMAL_SEARCH)) {
+        if(!onewire_host_search(instance->onewire_host, onewire_device->address, OneWireHostSearchModeNormal)) {
             onewire_host_reset_search(instance->onewire_host);
             furi_delay_ms(100);
             continue;