From 54ceae68ce0d6d4d5faaf60427b4e8b6430319eb Mon Sep 17 00:00:00 2001 From: Roger Clark Date: Thu, 9 Apr 2015 19:50:32 +1000 Subject: [PATCH] Renamed OneWire library to OneWireSTM and also modified so it doesnt crash Maple or Maple mini boards --- .../{OneWire/OneWire.cpp => OneWireSTM/OneWireSTM.cpp} | 5 +++-- .../libraries/{OneWire/OneWire.h => OneWireSTM/OneWireSTM.h} | 0 .../examples/DS18x20_Temperature/DS18x20_Temperature.pde | 2 +- .../examples/DS2408_Switch/DS2408_Switch.pde | 2 +- .../examples/DS250x_PROM/DS250x_PROM.pde | 2 +- STM32F1/libraries/{OneWire => OneWireSTM}/keywords.txt | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) rename STM32F1/libraries/{OneWire/OneWire.cpp => OneWireSTM/OneWireSTM.cpp} (99%) rename STM32F1/libraries/{OneWire/OneWire.h => OneWireSTM/OneWireSTM.h} (100%) rename STM32F1/libraries/{OneWire => OneWireSTM}/examples/DS18x20_Temperature/DS18x20_Temperature.pde (99%) rename STM32F1/libraries/{OneWire => OneWireSTM}/examples/DS2408_Switch/DS2408_Switch.pde (98%) rename STM32F1/libraries/{OneWire => OneWireSTM}/examples/DS250x_PROM/DS250x_PROM.pde (99%) rename STM32F1/libraries/{OneWire => OneWireSTM}/keywords.txt (97%) diff --git a/STM32F1/libraries/OneWire/OneWire.cpp b/STM32F1/libraries/OneWireSTM/OneWireSTM.cpp similarity index 99% rename from STM32F1/libraries/OneWire/OneWire.cpp rename to STM32F1/libraries/OneWireSTM/OneWireSTM.cpp index 631813f..3b43c13 100644 --- a/STM32F1/libraries/OneWire/OneWire.cpp +++ b/STM32F1/libraries/OneWireSTM/OneWireSTM.cpp @@ -114,12 +114,12 @@ sample code bearing this copyright. //-------------------------------------------------------------------------- */ -#include "OneWire.h" +#include "OneWireSTM.h" OneWire::OneWire(uint8_t pin) { - pinMode(pin, INPUT); + //pinMode(pin, INPUT); bitmask = PIN_TO_BITMASK(pin); baseReg = PIN_TO_BASEREG(pin); #if ONEWIRE_SEARCH @@ -347,6 +347,7 @@ uint8_t OneWire::search(uint8_t *newAddr) unsigned char rom_byte_mask, search_direction; + pinMode(bitmask, INPUT); // initialize for search id_bit_number = 1; last_zero = 0; diff --git a/STM32F1/libraries/OneWire/OneWire.h b/STM32F1/libraries/OneWireSTM/OneWireSTM.h similarity index 100% rename from STM32F1/libraries/OneWire/OneWire.h rename to STM32F1/libraries/OneWireSTM/OneWireSTM.h diff --git a/STM32F1/libraries/OneWire/examples/DS18x20_Temperature/DS18x20_Temperature.pde b/STM32F1/libraries/OneWireSTM/examples/DS18x20_Temperature/DS18x20_Temperature.pde similarity index 99% rename from STM32F1/libraries/OneWire/examples/DS18x20_Temperature/DS18x20_Temperature.pde rename to STM32F1/libraries/OneWireSTM/examples/DS18x20_Temperature/DS18x20_Temperature.pde index 68ca194..9db528d 100644 --- a/STM32F1/libraries/OneWire/examples/DS18x20_Temperature/DS18x20_Temperature.pde +++ b/STM32F1/libraries/OneWireSTM/examples/DS18x20_Temperature/DS18x20_Temperature.pde @@ -1,4 +1,4 @@ -#include +#include // OneWire DS18S20, DS18B20, DS1822 Temperature Example // diff --git a/STM32F1/libraries/OneWire/examples/DS2408_Switch/DS2408_Switch.pde b/STM32F1/libraries/OneWireSTM/examples/DS2408_Switch/DS2408_Switch.pde similarity index 98% rename from STM32F1/libraries/OneWire/examples/DS2408_Switch/DS2408_Switch.pde rename to STM32F1/libraries/OneWireSTM/examples/DS2408_Switch/DS2408_Switch.pde index d171f9b..7386fb6 100644 --- a/STM32F1/libraries/OneWire/examples/DS2408_Switch/DS2408_Switch.pde +++ b/STM32F1/libraries/OneWireSTM/examples/DS2408_Switch/DS2408_Switch.pde @@ -1,4 +1,4 @@ -#include +#include /* * DS2408 8-Channel Addressable Switch diff --git a/STM32F1/libraries/OneWire/examples/DS250x_PROM/DS250x_PROM.pde b/STM32F1/libraries/OneWireSTM/examples/DS250x_PROM/DS250x_PROM.pde similarity index 99% rename from STM32F1/libraries/OneWire/examples/DS250x_PROM/DS250x_PROM.pde rename to STM32F1/libraries/OneWireSTM/examples/DS250x_PROM/DS250x_PROM.pde index a85b1c2..6ac8189 100644 --- a/STM32F1/libraries/OneWire/examples/DS250x_PROM/DS250x_PROM.pde +++ b/STM32F1/libraries/OneWireSTM/examples/DS250x_PROM/DS250x_PROM.pde @@ -22,7 +22,7 @@ DS250x add-only programmable memory reader w/SKIP ROM. */ -#include +#include OneWire ds(6); // OneWire bus on digital pin 6 void setup() { Serial.begin (9600); diff --git a/STM32F1/libraries/OneWire/keywords.txt b/STM32F1/libraries/OneWireSTM/keywords.txt similarity index 97% rename from STM32F1/libraries/OneWire/keywords.txt rename to STM32F1/libraries/OneWireSTM/keywords.txt index bee5d90..e17f554 100644 --- a/STM32F1/libraries/OneWire/keywords.txt +++ b/STM32F1/libraries/OneWireSTM/keywords.txt @@ -6,7 +6,7 @@ # Datatypes (KEYWORD1) ####################################### -OneWire KEYWORD1 +OneWireSTM KEYWORD1 ####################################### # Methods and Functions (KEYWORD2)