Commit Graph
508 Commits
Author SHA1 Message Date
Henrik Ekblad 8ec2ebdfce Sent startup message to controller when it connects. 2014-10-23 09:02:30 +02:00
Henrik Ekblad aeb9f30482 Merge branch 'ToSa27-tosa' into development 2014-10-23 00:30:34 +02:00
Henrik Ekblad b0057cc152 Merge branch 'tosa' of https://github.com/ToSa27/Arduino into
ToSa27-tosa

Conflicts:
	libraries/MySensors/examples/EthernetGateway/EthernetGateway.ino
2014-10-23 00:30:01 +02:00
Henrik Ekblad 301296359b Merge branch 'master' into development
Conflicts:
	libraries/UIPEthernet/utility/uipethernet-conf.h
2014-10-22 00:15:56 +02:00
Henrik Ekblad 9329626e8b Update to latest UIPEthernet library 2014-10-22 00:11:38 +02:00
Henrik Ekblad 3127b1549a Merge branch 'development' of https://github.com/mysensors/Arduino.git into development 2014-10-21 23:47:04 +02:00
Henrik Ekblad d5ca838371 Update UIPEthernet library 2014-10-21 23:44:52 +02:00
Henrik Ekblad 91e913f854 Update include statement resulting in compile error. 2014-10-17 16:41:58 +02:00
Henrik Ekblad e32c71c216 Merge branch 'master' of https://github.com/mysensors/Arduino.git 2014-10-17 00:07:44 +02:00
Henrik Ekblad c2acbac2e0 Forgot to enable MINIMAL mode for RF24 in the latest commit. 2014-10-17 00:07:15 +02:00
Henrik Ekblad 2fd948fc66 Add new scene controller with touch display example.
Upgraded RF24 to latest version which supports SoftSPI. 
Added DigitalIO and UTFT libraries to support the new example.
Fix problem reported in RelayWithButtonActuator example.
2014-10-17 00:01:55 +02:00
Henrik Ekblad f64e530353 Merge pull request #37 from fallberg/development
Fix for W5100 Ethernet module
2014-10-11 00:22:18 +02:00
Patrick Fallberg 96f5b39e50 Corrected merge mistake 2014-10-11 00:03:35 +02:00
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 e0e0d4aff3 Merge remote-tracking branch 'upstream/development' into development
Conflicts:
	libraries/MySensors/examples/EthernetGateway/EthernetGateway.ino
2014-10-10 23:56:29 +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
Patrick Fallberg b97372ed01 Added .gitignore to filter stino settings files
Stino is a plugin for SublimeText to allow SublimeText to act as
an Arduino IDE.
2014-10-10 22:34:14 +02:00
ToSa27 2647345c4d Adding defines for different board layouts in MyConfig
Adjusted all Gateway examples but only one sensor example so far
(DallasTemperature). Other sensor examples should get the same three
lines added (not mandatory but helps avoiding unnecessary debugging when
selecting the wrong setup)
2014-09-29 10:33:16 +02:00
ToSa27 39bab3dfba Split Application and Driver Layer 2014-09-29 00:24:57 +02:00
ToSa27 c3dbcd1fea Accept Time Broadcasts
NodeJsController sending Time broadcasts every few minutes.
Sensor accepting not just Time messages addressed to the specific
sensor.
2014-09-28 23:47:22 +02:00
ToSa27 7a304a0523 Reduce Bootloader Size
changing few uint16 variables to uint8
2014-09-28 23:43:28 +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
Henrik Ekblad 3b86153a18 Merge pull request #35 from Yveaux/development
Improved parent node search
2014-09-11 09:42:07 +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 8f1cf6c454 Merge branch 'master' of https://github.com/mysensors/Arduino 2014-09-11 00:46:07 +02:00
Henrik Ekblad bfd589455b Add new example showing RTC with LCD display. 2014-09-11 00:45:56 +02:00
Henrik Ekblad 01a6adb1cc Merge pull request #34 from mysensors/revert-33-master
Revert "Force parent node search for all transmits when parent node is n...
2014-09-10 21:27:40 +02:00
Henrik Ekblad 6314cf8ef1 Revert "Force parent node search for all transmits when parent node is not set or communication failed a number of times" 2014-09-10 21:23:52 +02:00
Henrik Ekblad b9c43029af Merge pull request #33 from Yveaux/master
Force parent node search for all transmits when parent node is not set or communication failed a number of times
2014-09-10 21:17:03 +02:00
Yveaux 10e43f6aa8 Support parent search without node ID
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-10 12:04:35 +02:00
Henrik Ekblad 5bb8c9b40c Bugfixes and cleanup 2014-09-09 22:33:49 +02:00
Yveaux 0f34bb33be 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.
2014-09-09 19:43:08 +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
Patrick Fallberg ba1d813469 Merge remote-tracking branch 'upstream/development' into development 2014-09-08 00:04:00 +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
ToSa27 1dbe7497bd Added technical details for controller developers regarding OTA bootloader 2014-09-07 23:58:16 +02:00
ToSa27 cd84e410fa use codebender to compile sketches
I had codebender username/password included originally but compiling
works without. Codebender usage guidelines allow "usage via API".
2014-09-07 23:58:16 +02:00
ToSa27 c63fa018f5 Improved documentation and minor fixes
removed examples compiled with outdated MySensors protocol and instead
included documentation how to add self-compiled sketches
2014-09-07 23:58:15 +02:00