noisymime
/
Arduino_STM32
mirror of https://github.com/noisymime/Arduino_STM32.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed OneWire library to OneWireSTM and also modified so it doesnt crash Maple or Maple mini boards

This commit is contained in:
Roger Clark 2015-04-09 19:50:32 +10:00
parent 5dcfa4f1b0
commit 54ceae68ce
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
STM32F1/libraries/OneWire/OneWire.cpp → STM32F1/libraries/OneWireSTM/OneWireSTM.cpp
View File

@ -114,12 +114,12 @@ sample code bearing this copyright.
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
*/ */
#include "OneWire.h" #include "OneWireSTM.h"
OneWire::OneWire(uint8_t pin) OneWire::OneWire(uint8_t pin)
{ {
pinMode(pin, INPUT); //pinMode(pin, INPUT);
bitmask = PIN_TO_BITMASK(pin); bitmask = PIN_TO_BITMASK(pin);
baseReg = PIN_TO_BASEREG(pin); baseReg = PIN_TO_BASEREG(pin);
#if ONEWIRE_SEARCH #if ONEWIRE_SEARCH
@ -347,6 +347,7 @@ uint8_t OneWire::search(uint8_t *newAddr)
unsigned char rom_byte_mask, search_direction; unsigned char rom_byte_mask, search_direction;
pinMode(bitmask, INPUT);
// initialize for search // initialize for search
id_bit_number = 1; id_bit_number = 1;
last_zero = 0; last_zero = 0;

0
STM32F1/libraries/OneWire/OneWire.h → STM32F1/libraries/OneWireSTM/OneWireSTM.h
View File

2
STM32F1/libraries/OneWire/examples/DS18x20_Temperature/DS18x20_Temperature.pde → STM32F1/libraries/OneWireSTM/examples/DS18x20_Temperature/DS18x20_Temperature.pde
View File

@ -1,4 +1,4 @@
#include <OneWire.h> #include <OneWireSTM.h>
// OneWire DS18S20, DS18B20, DS1822 Temperature Example // OneWire DS18S20, DS18B20, DS1822 Temperature Example
// //

2
STM32F1/libraries/OneWire/examples/DS2408_Switch/DS2408_Switch.pde → STM32F1/libraries/OneWireSTM/examples/DS2408_Switch/DS2408_Switch.pde
View File

@ -1,4 +1,4 @@
#include <OneWire.h> #include <OneWireSTM.h>
/* /*
* DS2408 8-Channel Addressable Switch * DS2408 8-Channel Addressable Switch

2
STM32F1/libraries/OneWire/examples/DS250x_PROM/DS250x_PROM.pde → STM32F1/libraries/OneWireSTM/examples/DS250x_PROM/DS250x_PROM.pde
View File

@ -22,7 +22,7 @@ DS250x add-only programmable memory reader w/SKIP ROM.
*/ */
#include <OneWire.h> #include <OneWireSTM.h>
OneWire ds(6); // OneWire bus on digital pin 6 OneWire ds(6); // OneWire bus on digital pin 6
void setup() { void setup() {
Serial.begin (9600); Serial.begin (9600);

2
STM32F1/libraries/OneWire/keywords.txt → STM32F1/libraries/OneWireSTM/keywords.txt
View File

@ -6,7 +6,7 @@
# Datatypes (KEYWORD1) # Datatypes (KEYWORD1)
####################################### #######################################
OneWire KEYWORD1 OneWireSTM KEYWORD1
####################################### #######################################
# Methods and Functions (KEYWORD2) # Methods and Functions (KEYWORD2)