Fix 1-Wire multi-platform support again

hiveeyes · Nov 9, 2019 · bfc1fad · bfc1fad
1 parent 7330d65
commit bfc1fad
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -75,6 +75,7 @@ Development
 - Improve platform switch for system sensors
 - Acquire ``onewire.py`` drivers for both Vanilla MicroPython and Pycom MicroPython
   as ``onewire_native.py`` vs. ``onewire_python.py``.
+- Fix 1-Wire multi-platform support again. Thanks, @poesel!
 
 
 2019-08-19 0.6.0

diff --git a/terkin/sensor/core.py b/terkin/sensor/core.py
@@ -278,7 +278,7 @@ def start(self):
         try:
             # Vanilla MicroPython 1.11
             if platform_info.vendor == platform_info.MICROPYTHON.Vanilla:
-                from onewire_native import OneWire
+                from onewire import OneWire
                 pin = Pin(int(self.pins['data'][1:]))
 
             # Pycom MicroPython 1.9.4

diff --git a/tools/setup.mk b/tools/setup.mk
@@ -81,8 +81,8 @@ download-requirements:
 
 	# Genuine MicroPython driver for Pycom MicroPython 1.11.
 	# https://github.com/micropython/micropython/tree/v1.11/drivers/onewire
-	$(fetch) $(target_dir) --output-document=$(target_dir)/onewire_native.py https://raw.githubusercontent.com/micropython/micropython/v1.11/drivers/onewire/onewire.py
-	$(fetch) $(target_dir) https://raw.githubusercontent.com/micropython/micropython/v1.11/drivers/onewire/ds18x20.py
+	#$(fetch) $(target_dir) --output-document=$(target_dir)/onewire_native.py https://raw.githubusercontent.com/micropython/micropython/v1.11/drivers/onewire/onewire.py
+	#$(fetch) $(target_dir) https://raw.githubusercontent.com/micropython/micropython/v1.11/drivers/onewire/ds18x20.py
 
 	# Pycom MicroPython driver for Pycom MicroPython 1.11.
 	# https://github.com/pycom/pycom-micropython-sigfox/tree/v1.20.1.r1/drivers/onewire