MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
493 Commits 1 Branch 0 Tags
f64e5303537f0f7a00a92bc05aef7c5dda8f88ce
Commit Graph
184 Commits
Author SHA1 Message Date
Patrick Fallberg 99b7b12856 Merge remote-tracking branch 'upstream/development' into development 
Conflicts:
	libraries/MySensors/examples/EthernetGateway/EthernetGateway.ino
 2014-10-11 00:00:27 +02:00
Patrick Fallberg f5ef712308 Support for WIZnet W5100 ethernet module SPI_EN 
The W5100 module has a SPI_EN signal that enables or disables the SPI
bus.
A bug in the module causes MISO to be continously driven by the module
when SPI_EN is pulled high. This is described in this application note:
https://www.google.se/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CCAQFjAA&url=http%3A%2F%2Fwww.wiznet.co.kr%2FUpLoad_Files%2FReferenceFiles%2FW5100_AN_SPI.pdf&ei=ij84VK7uM6nNygPqvICYDw&usg=AFQjCNGz1qttBEwG1azc1Eza4j69v1rpDQ&sig2=UUUtb4Dr0F35g8ByHMsyig&bvm=bv.77161500,d.bGQ

This commit changes the Ethernet gateway sketch to drive SPI_EN high or
low, depending on which module is in use (SPI bus is shared between
Ethernet and RF modules).
The pin attached to SPI_EN is defined by W5100_SPI_EN. This define can
be commented out if SPI_EN is not needed (different module) or if the
module manages SPI_EN in hardware (some W5100 shields does this).
 2014-10-10 22:39:47 +02:00
Henrik Ekblad f71ed97aaa Made Time, LiquidCrystal and RealTimeClockDisplaySensor example work in Arduino IDE 1.5.7. 2014-09-20 13:04:01 +02:00
Henrik Ekblad 82dda0fe30 Merge branch 'master' into development 2014-09-16 22:19:21 +02:00
Henrik Ekblad 26129b06a9 Upgrade UIP-library to latest. Recommend Arduino IDE 1.5.7 when compiling EtherentGateway sketch. 2014-09-16 22:17:07 +02:00
Henrik Ekblad 27885fad9b Prefix enums to proghibit name clash with other libraries. 2014-09-15 19:29:42 +02:00
Henrik Ekblad 78b5df44b4 Remove spam from pulse sensors when gateway is unable to receive request for meter value. 2014-09-15 13:48:44 +02:00
Henrik Ekblad 86b6411280 Merge branch 'hek-gateway-rework' into development 
Conflicts:
	libraries/MySensors/MySensor.cpp
	libraries/MySensors/MySensor.h
 2014-09-11 09:56:30 +02:00
Henrik Ekblad d8ba222759 Merge branch 'master' into development 2014-09-11 09:51:59 +02:00
Yveaux e5bd891a77 Improved parent node search 
Retry parent node search with each transmit when parent has not been
found.
Transmit does not block on transmit when no parent has been found as
this depletes batteries on battery powered nodes.
Fix nRF24 configuration for dynamic ACK's. This bug caused broadcasts to
be sent with auto-ACK's.
To not break existing functionality parent search can be started when
node ID is still unknown. In this case node ID is set to broadcast ID,
which can cause funky stuff to happen...
 2014-09-11 09:37:42 +02:00
Henrik Ekblad bfd589455b Add new example showing RTC with LCD display. 2014-09-11 00:45:56 +02:00
Henrik Ekblad 5bb8c9b40c Bugfixes and cleanup 2014-09-09 22:33:49 +02:00
Henrik Ekblad 7fa54a6e5a Proposal to keep gateways separated. 2014-09-09 16:57:56 +02:00
Henrik Ekblad 9192da3a7d Fix another problem related to config from controller (reading wrong position at startup!). Bugfix. Only strip carriage return on serial data from controller (at gateway) 2014-09-08 19:56:09 +02:00
Henrik Ekblad bf341ab49c Node id is a string and must be parsed. The getByte does not parse any more. 2014-09-08 07:32:16 +02:00
Daniel Wiegert 159c223882 Include more debug text in MINIMAL definition, and enable MINIMAL as default, saves 432bytes 2014-09-07 23:58:18 +02:00
Henrik Ekblad ba098a95e2 Fix compiler error. 2014-09-07 23:58:18 +02:00
Henrik Ekblad cc00bedaa1 Classify method. 2014-09-07 23:58:17 +02:00
Henrik Ekblad 6dde2e428a Need to include MySensor.h for gateway examples to work in codebender. 2014-09-07 23:58:17 +02:00
Daniel Wiegert 724567e295 Bugfixes and rewrite parts of code 2014-09-07 23:58:16 +02:00
Henrik Ekblad 6f86b8fcc7 Rename example to follw same pattern as the rest. 2014-09-07 21:31:49 +02:00
Henrik Ekblad 60f0a262f6 Many people is reporting powering problems when using amplified version of the NRF-chip on the gateway. The radio needs to be feeded separately with a stable 3v3. The Nanos 3v3 output is not sufficient for PA_MAX. Defaulting this to LOW now. If you are using a vanilla radio on gateway you can switch to MAX again. 2014-09-07 21:13:41 +02:00
Henrik Ekblad 229af25378 Merge branch 'development' 
Conflicts:
	libraries/MySensors/MySensor.cpp
 2014-09-07 20:51:10 +02:00
Henrik Ekblad cfbceadea9 Fix bug making gateway sending all payloads with newline character included. Fix bug related to receiving Mertic/Imperial setting in sensor nodes (getByte was implemented wrong). 2014-09-07 20:39:28 +02:00
Henrik Ekblad ae9332b486 Merge pull request #31 from fallberg/development 
Development
 2014-09-07 19:44:36 +02:00
Patrick Fallberg c13425d15e Updated BinarySwitchSensorInt to handle two sensors 
The new sleep() constructor allows for two interrupt sources
to wake device from sleep. This example is now updated to
illustrate this.
 2014-09-07 17:43:51 +02:00
Patrick Fallberg 35788d6d94 Added constructor to sleep() for monitoring two interrupts 
The new constructor allows two separate interrupts with two
separate trigger policies to wake up device.
 2014-09-07 15:53:57 +02:00
Patrick Fallberg ae35b9a058 Minor refactoring of delay variables 
This is a preparation for handling multiple interrupts in delay().
It also reduces the size of the interrupt-related variables and
arguments to int8_t as that should be ample enough for any Arduino
implementation.
 2014-09-07 15:22:58 +02:00
Henrik Ekblad dd50aa9cc2 Merge pull request #30 from fallberg/development 
Implementation of interrupt driven binary switch
 2014-09-04 07:19:02 +02:00
Patrick Fallberg 4ffb53b091 Implementation of interrupt driven binary switch 
The difference between the interrupt driven binary switch example and
the normal binary switch example is the following:
* Interrupt example does not use debouncer because it rely on loop()
iterating over time (but it sleeps between iterations)
* Interrupt example is more power conservative because it sleeps as soon
as it has sent updated data and no activity happens on the pin
* Interrupt example is limited to only two IO pins for the sensor, due
to limitations in the Arduino HW. The example uses the preprocessor to
ensure that this is not misconfigured or sleep function can not be
expected to behave as intended.
 2014-09-03 23:59:36 +02:00
Henrik Ekblad 612ab5ea59 Add SimpleTimer library used for Retry-example 2014-09-01 10:39:45 +02:00
Henrik Ekblad 1d9477229b Remove getinternalTemp 2014-08-29 20:48:39 +02:00
Henrik Ekblad 7651987f9b Merge branch 'development' 
Conflicts:
	libraries/MySensors/Config.h
	libraries/MySensors/Version.h
 2014-08-29 20:48:20 +02:00
Henrik Ekblad 76cd614c15 Merge pull request #29 from Damme/MQTTGateway 
Include more debug text in MINIMAL definition, and enable MINIMAL as default
 2014-08-28 14:37:57 +02:00
Daniel Wiegert bfb8eff826 Include more debug text in MINIMAL definition, and enable MINIMAL as default, saves 432bytes 2014-08-28 14:30:42 +02:00
Henrik Ekblad 9d42ac4c77 Fix compiler error. 2014-08-27 22:55:52 +02:00
Henrik Ekblad 1290c68c4a Classify method. 2014-08-27 21:53:57 +02:00
Henrik Ekblad 0022e9fd16 Merge branch 'development' of https://github.com/mysensors/Arduino into development 2014-08-27 21:24:20 +02:00
Henrik Ekblad fdcbbbac95 Need to include MySensor.h for gateway examples to work in codebender. 2014-08-27 21:24:00 +02:00
Daniel Wiegert 5e5b756160 Bugfixes and rewrite parts of code 2014-08-27 15:24:04 +02:00
Henrik Ekblad 10041114cf Clean up unused libraries 2014-08-22 20:43:29 +02:00
Henrik Ekblad e01dc2eccc Fix a few warnings in MQTTGateway. 
Move all gateway examples to "examples" to work better with codebender and Arduino IDE.
Ledmode is always enabled for gateway. Still optional to connect the wires though ;)
Move MsTimer to local utility folder (no external dependencies).
 2014-08-22 20:35:22 +02:00
Henrik Ekblad dfcd3d44d3 Simplify gateway code (handles interrupts internally) and remove external dependencies. Ledmode is now always "enabled". 
Remove unused libraries.
Add default CS/CE pin to Config.h
Add new variebles for voltage and current.
Add new internal command sent to controller when gateway is ready and online
 2014-08-21 09:59:30 +02:00
Henrik Ekblad 9f3ec7f4f4 clean up among libraries 2014-08-18 21:28:48 +02:00
Henrik Ekblad 4c1ce4d45a Fix:Debug messages now uses the new serial formal. 2014-08-18 19:45:51 +02:00
Henrik Ekblad 84d39a238f Add scene controller device 2014-08-18 15:46:47 +02:00
Henrik Ekblad a4b1afb9f2 Merge branch 'development' of https://github.com/mysensors/Arduino into development 2014-08-17 23:57:15 +02:00
Henrik Ekblad 2776e5fca9 Added a new RFID Lock Sensor example. 2014-08-17 23:56:53 +02:00
Henrik Ekblad 5d43706492 Add emon lib for a later non invasive current sensor. 2014-08-17 22:27:08 +02:00
Henrik Ekblad 29b00589ee Merge pull request #23 from Damme/patch-1 
moved comment and minor ops
 2014-08-17 22:20:02 +02:00