MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
594 Commits 1 Branch 0 Tags
50c8c44b08ba30efcb94e30a02c48945ede99e17
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Henrik Ekblad 50c8c44b08 Merge branch 'master' into development 
Conflicts:
	libraries/MySensors/MyGateway.cpp
	libraries/MySensors/MySensor.cpp
 2015-02-12 22:42:50 +01:00
Henrik Ekblad 9fecc53dfb Merge pull request #62 from mapnull/hotfix-autoFindParent_response 
Accept a new parent only when autoFindParent is 1
 2015-02-12 22:23:13 +01:00
Henrik Ekblad 80bd4df230 Merge pull request #61 from mapnull/hotfix-parentId_eeprom 
Write parentNodeId to eeprom only when differ
 2015-02-12 22:15:37 +01:00
Henrik Ekblad de2bfbf833 Merge pull request #60 from mapnull/hotfix-chk_invalid_gw_input 
check for invalid input on gateway
 2015-02-12 22:12:41 +01:00
Henrik Ekblad 6f0ea1f943 Merge branch 'master' into development 2015-02-12 22:11:42 +01:00
Henrik Ekblad 5d0fa3b0ab Merge pull request #59 from mapnull/hotfix-rt_before_ack 
add node to routing table before send an ack
 2015-02-12 22:02:51 +01:00
Henrik Ekblad c8883c61e6 Request parent missing in setup() 2015-02-12 21:58:16 +01:00
Henrik Ekblad 17a680f1de Fix broadcast check for RF69 2015-02-11 00:07:19 +01:00
Henrik Ekblad b238a2e61e Merge branch 'master' into development 
Conflicts:
	libraries/MySensors/MySensor.cpp
 2015-02-10 23:38:05 +01:00
Henrik Ekblad 7b99a2ef94 Removed waitForReply(). Not needed anymore. 2015-02-10 22:25:13 +01:00
Henrik Ekblad 722a23cfd9 Merge pull request #58 from tekka007/Hotfix 
simplify wait(), substitute waitForReply(), adding watchdog resets
 2015-02-10 21:53:45 +01:00
Henrik Ekblad 5a0d7734b3 Merge pull request #57 from tekka007/Hotfix 
Fixing endless loop
 2015-02-07 22:02:50 +01:00
Henrik Ekblad 23e5d5ffad Merge pull request #56 from mapnull/hotfix-setupNode 
Node set up only after having an id
 2015-02-07 16:52:54 +01:00
Henrik Ekblad 576c092fd6 Merge pull request #54 from mapnull/hotfix-r255 
Relay messages only after receiving an id
 2015-02-07 10:56:12 +01:00
Henrik Ekblad db3dbadb9e Merge pull request #55 from mapnull/hotfix-rt_size 
fix clear routing table data
 2015-02-07 00:40:32 +01:00
Henrik Ekblad b25df52861 Merge pull request #52 from tekka007/MYSBootloader 
MYSBootloader 1.0
 2015-02-07 00:39:47 +01:00
Henrik Ekblad 4590257da7 Merge pull request #51 from tbowmo/master 
MysensorMicro example, and extra libraries
 2015-02-07 00:00:01 +01:00
Henrik Ekblad 97641902c9 Merge branch 'master' into development 
Conflicts:
	libraries/MySensors/MySensor.cpp
 2015-02-04 23:03:27 +01:00
Henrik Ekblad 08221e6567 Merge pull request #46 from tekka007/master 
Failed transmissions count fixed  & Clear routing table extendend
 2015-02-04 22:22:43 +01:00
Henrik Ekblad 42885d456b Merge branch 'master' of https://github.com/mysensors/Arduino.git 2015-02-04 22:09:02 +01:00
Henrik Ekblad 09f3ba5862 Save static parent to eeprom (for bootloader) 2015-02-04 22:08:50 +01:00
Henrik Ekblad 83be24d2be Return length from receive() 2015-02-04 22:04:32 +01:00
Henrik Ekblad e3ea732d45 Merge pull request #49 from mapnull/hotfix 
fix convBuf size to print P_CUSTOM payloads
 2015-02-04 07:23:23 +01:00
Henrik Ekblad 615da4509c Fix ack problems RF24 2015-02-03 23:58:38 +01:00
Henrik Ekblad 8aeaceb35f Merge branch 'master' into development 
Conflicts:
	libraries/MySensors/MyGateway.cpp
	libraries/MySensors/MySensor.cpp
	libraries/MySensors/examples/EthernetGateway/EthernetGateway.ino
 2015-02-03 22:50:06 +01:00
Henrik Ekblad e1fa3dcd8e Merge pull request #45 from rhooper/wait-helper 
Add wait() helper that doesn't sleep.
 2015-02-03 22:06:17 +01:00
Henrik Ekblad 03b10c79f9 Merge pull request #48 from mapnull/feature 
get custom string from msg that isn't a stream type
 2015-02-03 22:05:29 +01:00
Henrik Ekblad ca6d79e580 Merge pull request #47 from mapnull/feature 
Bugfix: Fetch id through repeaters
 2015-02-03 18:40:02 +01:00
Henrik Ekblad 7fb94546eb Merge pull request #44 from mapnull/hotfix-1.4 
fix a possible parent repeater loop
 2015-02-01 21:37:54 +01:00
Henrik Ekblad dfd38ff3bc Removed arguments from constructor (use default). 2015-02-01 15:31:39 +01:00
Henrik Ekblad 2d214a1e58 Fix static id problem when using OTA bootloader. Reported by tekka. 2015-02-01 15:29:02 +01:00
Henrik Ekblad 7a54cacacf Added GizMoCuz DimmableLight example. 2015-01-30 09:06:54 +01:00
Henrik Ekblad 64dae7405c Merge pull request #43 from mapnull/hotfix-1.4 
fix a case where parent distance from repeater get stuck at 255
 2015-01-30 07:48:07 +01:00
Henrik Ekblad d9ffd61b75 Merge pull request #42 from fallberg/development 
MyDriver structure renamed to MyRFDriver
 2015-01-30 00:03:13 +01:00
Henrik Ekblad 4796487809 Fix string length problem reported by EasyIoT 2015-01-16 12:05:09 +01:00
Henrik Ekblad f1f8aec324 Change order of ethernet/radio intialization to avoid troubles. 2015-01-11 20:29:22 +01:00
Henrik Ekblad 6cb3c98014 Merge branch 'master' of https://github.com/mysensors/Arduino.git 2015-01-11 20:24:13 +01:00
Henrik Ekblad afc1e01cba Changed initialization order of radio/eth to avoid problems. 2015-01-11 20:20:56 +01:00
Henrik Ekblad 0534213196 Merge pull request #41 from fallberg/development 
SHA204 library and personalization sketch
 2015-01-10 20:32:59 +01:00
Henrik Ekblad afe506f79a Merge pull request #40 from portals12/PressureSensor-example-fix 
Fix stupid errors from the last pull request
 2015-01-02 12:18:04 +01:00
Henrik Ekblad d6922e7501 Merge branch 'master' of https://github.com/mysensors/Arduino.git 2014-12-30 13:46:21 +01:00
Henrik Ekblad 0b9178318e Set empty payload when requesting data. 2014-12-30 13:42:10 +01:00
Henrik Ekblad a232bf5e25 Merge pull request #39 from portals12/PressureSensor-example-fix 
Pressure sensor example fix
 2014-12-21 13:48:43 +01:00
Henrik Ekblad 55c1fe8d01 MAX6875 Temp Sensor example 2014-12-07 10:23:41 +01:00
Henrik Ekblad 0dd6687488 Merge branch 'master' into development 
Conflicts:
	libraries/MySensors/MySensor.cpp
	libraries/MySensors/examples/EthernetGateway/EthernetGateway.ino
 2014-11-25 16:52:07 +01:00
Henrik Ekblad 843e163328 Update BMP085 library. 
And additional pressure sensor problems repoted by @MagKas.
http://forum.mysensors.org/topic/631/pressure-sensor-arduino-low-memory
 2014-11-25 16:18:40 +01:00
Henrik Ekblad ab3db8b28b Fix bug in PressureSensor. 2014-11-25 15:48:10 +01:00
Henrik Ekblad 25230d7ef8 Update Time library to work on IDE 1.5.8 
Also removed a few large pdfs from UTFT library to make library compile
on codebender (a but that they will fix eventually).
 2014-11-19 09:03:51 +01:00
Henrik Ekblad 024d6efb82 Ethernet SoftSPI 
Update ethernet sketch to give correct instructions when using
W5100/SoftSPI.
 2014-11-14 00:36:49 +01:00
Henrik Ekblad f143fcd7a2 Moved RFM69 library to utility 2014-11-03 20:08:56 +01:00
Henrik Ekblad 03740b2555 Merge branch 'kolaf-development' into development 2014-11-03 19:52:51 +01:00
Henrik Ekblad 4783cac945 Set version to 1.4.1 2014-10-31 07:21:57 +01:00
Henrik Ekblad abe3956f5e Fixed bug resulting in ACK problems 
Even thouh auto ack was enabled we still called
RF24::writeAckPayload(pipe,&pipe, 1 ); after reading a message.
This probably caused radio to misbehave.
 2014-10-29 18:00:34 +01:00
Henrik Ekblad 3d2d7db845 Fix problem reported by Yveaux here: 
https://github.com/mysensors/Arduino/commit/aeb9f30482532122b624fe4f061b5176571b0c6b#commitcomment-8300974
 2014-10-25 10:49:32 +02:00
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
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
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
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
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
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
Henrik Ekblad dd50aa9cc2 Merge pull request #30 from fallberg/development 
Implementation of interrupt driven binary switch
 2014-09-04 07:19:02 +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
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