MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
456 Commits 1 Branch 0 Tags
229af253788519e723d13df4ac7d77a9991395f6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Henrik Ekblad 4510e5c386 Merge pull request #28 from Damme/MQTTGateway 
Bugfixes and rewrite parts of code
 2014-08-27 21:00:29 +02:00
Henrik Ekblad 5da8d052c3 Merge pull request #27 from ToSa27/development 
Improved documentation and usage of codebender for auto sketch compilation
 2014-08-25 20:36:23 +02:00
Henrik Ekblad f34e592a35 Remove AVR library (not working in 1.4) 2014-08-22 20:44:43 +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 85d6daf0fa Merge branch 'development' of https://github.com/mysensors/Arduino into development 2014-08-21 10:05:25 +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 2da481f64e Merge pull request #24 from ToSa27/development 
Update bootloader and nodejs connector to adjusted message and serial protocol
 2014-08-20 12:31:41 +02:00
Henrik Ekblad 8a6b092db8 We only need one constructor for the gateway sketch. 2014-08-18 21:35:50 +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
Henrik Ekblad f3b7be5271 Merge pull request #22 from Damme/patch-1 
Changed from Switch/case to if/elseif to save some runtime ram
 2014-08-17 21:50:32 +02:00
Henrik Ekblad 426123333c Serial protocol changed to allowing controller to know if an incoming message is a ack. Outgoing and incoming serial messages now also have the same parameter count. 
radioId;childId;messageType;ack;subType;payload\n

Where ack parameter means the following:
outgoing: 0 = unacknoledged message,  1 = request ack from destination node
Incoming:  0= normal message, 1=This is an ack message
 2014-08-17 21:39:18 +02:00
Henrik Ekblad 1150c4417c Removed a few decimals from pressure value. 2014-08-17 19:58:29 +02:00
Henrik Ekblad dcb0babe63 Dust sensor added. Thanks epierre. 2014-08-17 19:57:58 +02:00
Henrik Ekblad 95467c43a7 Add Custom sensor type that can be used in presentation when no other sensor fits. 2014-08-17 15:03:09 +02:00
Henrik Ekblad 65e61efb75 Fix spelling error 2014-08-17 14:49:44 +02:00
Henrik Ekblad 994d715b4e UV sensor example added 2014-08-17 14:45:38 +02:00
Henrik Ekblad ec53d08e57 Fix indentation. 2014-08-17 14:45:17 +02:00
Henrik Ekblad 0d00e22498 Fix error and add chirp when correct code entered. 2014-08-17 13:58:21 +02:00
Henrik Ekblad c910bfdb9e Move routing message part to the top of message to ease later refactoring of header/payload (encryption etc). 2014-08-17 13:57:51 +02:00
Henrik Ekblad 8da32be652 Comment fixed 2014-08-16 00:43:09 +02:00
Henrik Ekblad 95d899b77e Updated comments 2014-08-16 00:21:33 +02:00
Henrik Ekblad cbd78d68cf Merge branch 'development' of https://github.com/mysensors/Arduino into development 2014-08-16 00:00:33 +02:00
Henrik Ekblad f822f1aa31 New example skecth which controls a lock either from controller or by using a secret knock. 2014-08-15 23:40:45 +02:00
Henrik Ekblad 31813b3712 Merge pull request #21 from Damme/patch-1 
Minor changes + Added back LED-blinking code.
 2014-08-15 15:32:41 +02:00
Henrik Ekblad 32a47d643e Merge pull request #20 from Damme/patch-1 
Little better readme...
 2014-08-13 22:56:19 +02:00
Henrik Ekblad 6670ff340f Merge pull request #19 from Damme/patch-1 
Added MQTTGateway version 0.1b
 2014-08-13 22:13:10 +02:00
Henrik Ekblad 8e53f75619 Add dimmable LED actuator example 2014-08-13 20:02:45 +02:00
Henrik Ekblad 9f48f091e3 Rename PING to the more suitable FIND_PARENT 2014-08-13 20:02:10 +02:00
Henrik Ekblad 61122532ad Float values sent in binary format over the air 
Move base radio id to MyConfig.h
 2014-08-13 09:39:45 +02:00
Henrik Ekblad ca1c975cc5 TOSAs OTA bootloader, test nodejs gateway and other misc changes. 
Merge commit '5968ddf21964dff4043e70df8bd65286c90b5127' into development

* commit '5968ddf21964dff4043e70df8bd65286c90b5127':
  Send reboot msg after message retrieval to deal with sensors going to sleep
  Node JS controller
  OTA Bootloader
  Binary message payload handling
  Remote reboot capability
  Misc fixes

Conflicts:
	EthernetGateway/EthernetGateway.ino
	libraries/MySensors/MyGateway.cpp
	libraries/MySensors/MyMessage.h
 2014-07-27 20:08:55 +02:00
Henrik Ekblad 7fb39d69d4 Fix problems found after verification of local commits. 2014-07-27 16:55:41 +02:00
Henrik Ekblad a845691b8b Fix a few sketch problems found. 2014-07-22 08:26:57 +02:00
Henrik Ekblad 8442132ed6 Fix problem with sleeptime reported by @marceltrapman. 2014-07-18 21:21:54 +02:00
Henrik Ekblad 767fedca5b Make sure to terminate strings correctly. 2014-07-13 00:02:20 +02:00
Henrik Ekblad ef91d9b9cc New ack bit in header indicating of message is an actual ack of a message. 
Use msg.getAck() to check in incoming message callback.
 2014-07-12 23:49:27 +02:00
Henrik Ekblad 0cd56e88b2 Changed faulty comment. 2014-07-10 23:47:23 +02:00
Henrik Ekblad 104fb4c35f Allow static parent node to be set when calling begin (which also disables auto-parent-finding) 2014-07-03 12:41:49 +02:00
Henrik Ekblad 7b4bef5be8 Added MQ2 Air quality sensor by epierre (converted to 1.4) 2014-07-02 23:15:49 +02:00
Henrik Ekblad 17e4769770 Remove application layer crc check. 
Rearrange of message header to keep non routing information at the end  (preparation for OTA firmware messages)
 2014-06-30 23:47:46 +02:00
Henrik Ekblad 9cf6c03c5d Fix commend and wrong default pa level for gateway 2014-06-30 23:45:18 +02:00
Henrik Ekblad f3bd9e9b30 Change default transfer speed to 250kbps. 
Set default value for config.
Return wakeup trigger after sleep.
 2014-06-26 00:26:45 +02:00
Henrik Ekblad c332667a8d RF24 moved to utility folder of library. This results in one less include in sketches! 
Serial flush in sleep method also means one less code in examples.
Removed set(bool) in message. Not needed. getBool just calls getInt
__attribute__((packed)) for RPI compability
Print more info in send/read debug prints.
Get internalTemp returns full degrees and uses longer Vref delay
Fix debug print gateway prepend (wrong command/type)
Fixed problem in RelayWithButton example. Now working with ack in both directions.
Serial protocol changed (incoming serial message have an new ack-parameter)
 2014-06-17 22:16:38 +02:00
Henrik Ekblad 90f79c97cd * Changed library to call by reference instead of using pointers. Makes code much cleaner. 
* RelayNodes renamed to RepeaterNode to distiguish this from RelayActuator.
* Ack is now possible to request for all message types. Added ack-flag for some of the exposed internal messages and presentation message.
 2014-06-16 00:30:13 +02:00
Henrik Ekblad 9ddf442e42 Fixed CRC zero-padding. Thanks Yveaux. 2014-06-15 17:10:27 +02:00
Henrik Ekblad 771401a317 Change version string 2014-06-13 21:20:30 +02:00
Henrik Ekblad 8a9061aee7 The last examples converted to 1.4. 2014-06-13 20:19:48 +02:00
Henrik Ekblad af90d238d4 Start of example conversion. Added sleep to MySensors API. 2014-06-13 13:54:12 +02:00
Henrik Ekblad d1ca16fe1b correct radix fixed 2014-05-29 00:30:30 +02:00
Henrik Ekblad c81a47c1f9 Fixed a couple of issues reported by a-lurker 2014-05-28 22:27:36 +02:00
Henrik Ekblad 6201d3cd54 IsGateway added 2014-05-19 23:33:36 +02:00
Henrik Ekblad 67f4ca1fb4 latest test sketches and working request for id 2014-05-19 20:08:12 +02:00
Henrik Ekblad 9e043f3379 Use pointers inernally instead of passing objects to save space. 2014-05-17 00:46:04 +02:00
Henrik Ekblad 767999b46d Update MotionSensor.ino 
Bugfix. Remove EEPROM write from setup().. how did that snuck in there?
 2014-05-16 17:24:10 +02:00
Henrik Ekblad 8e07382d74 Gateway.cpp now compiles, 
Ethernet gateway fits in memory with debug enabled. :)
 2014-05-16 15:13:56 +02:00
Henrik Ekblad 891c826a0c * Converted time example. Callback for time request was the only clean solution. Now global callback for incoming messages only needs to care about SET commands coming from other nodes or gateway. 
* New api for storing states. RelayActator now stores state in eeprom, making it more standalone.
* Controller config is now fetched in the background without needing any special tratment in sketch. Last received config is stored in eeprom:
 2014-05-16 14:48:18 +02:00
Henrik Ekblad 9291a97d45 added some message builder helpers. Optimized libray a bit using inline functions and macros. 
Converted Dallas example to use new library api.
 2014-05-16 10:35:26 +02:00
Henrik Ekblad 7080520a3f Fix comment. Pseudo random. 2014-05-16 07:24:24 +02:00
Henrik Ekblad a31d9d1074 Reduce library size 2014-05-15 07:40:07 +02:00
Henrik Ekblad 710d445815 Stripping all sync-functions 2014-05-14 10:15:01 +02:00
Henrik Ekblad 4b18f9fbf4 Relay updated to new api 2014-05-14 00:26:52 +02:00
Henrik Ekblad 26ef9c81c2 refactoring continues. 2014-05-14 00:26:28 +02:00
Henrik Ekblad fadab95958 And myGateway... 2014-05-12 23:56:57 +02:00
Henrik Ekblad 7856dfb209 Compiling. No tests what so ever. 2014-05-12 23:50:44 +02:00
Henrik Ekblad c555c772f3 Merge pull request #14 from Timminater/patch-1 
Update misspelled comment in Config.h
 2014-05-07 19:36:17 +02:00
Henrik Ekblad 960efcd6f7 Prepared for ack:ing between sensors. And between actuator and gateway. Now using hardware ack when sending messages and burst-mode which gives much more reliable communication. 
Use the corresponing development-branch for Vera plugin files.
 2014-05-04 23:47:46 +02:00
Henrik Ekblad 40218118f3 Merge remote-tracking branch 'origin/master' into development 
Conflicts:
	libraries/MySensors/Sensor.cpp
 2014-05-01 22:41:35 +02:00
Henrik Ekblad 2bb71b0ab6 Merge branch 'master' of https://github.com/mysensors/RF24 into development 2014-05-01 20:55:29 +02:00
Henrik Ekblad 813f001f65 Powerup radio if asleep when start transmitting. 2014-05-01 20:51:23 +02:00
Henrik Ekblad 9583356f1d Merge branch 'master' of https://github.com/mysensors/RF24 into development 2014-05-01 19:28:58 +02:00
Henrik Ekblad 8759712f12 Added closeReadingPipe. 2014-05-01 18:55:01 +02:00
Henrik Ekblad 18848a25a6 Renamed defines. 2014-05-01 16:50:50 +02:00
Henrik Ekblad a4aabb99fb Testing new TMRh20/RF24 library. Looks promising. No more soft-acks :) 2014-05-01 16:45:01 +02:00
Henrik Ekblad ab3bad4b1c subree of RF24 merged 2014-05-01 00:16:07 +02:00
Henrik Ekblad 1897409bde git tree messed up 2014-05-01 00:12:42 +02:00
Henrik Ekblad 8a686e0031 git tree messed up 2014-05-01 00:12:08 +02:00
Henrik Ekblad de0a374699 remove old rf24 2014-04-30 23:57:29 +02:00
Henrik Ekblad 9a32a81644 Only scan for relay node max 3 times per transmission attempt (to save battery) 
Lower transmission speed to reach longer distances.

Remove RF24 to prepare gittree import.
 2014-04-30 23:39:06 +02:00
Henrik Ekblad 43d74e2083 Bug fixed for 
http://forum.mysensors.org/topic/37/sensor-readmessage
 2014-04-15 19:38:39 +02:00
Henrik Ekblad f3d982e779 Update Relay.cpp 
Test version bot
 2014-04-06 23:00:19 +02:00
Henrik Ekblad b91037f267 Merge pull request #12 from bblacey/version-bot 
Refactoring to support MySensors.org Version-Bot
 2014-04-06 20:41:56 +02:00
Henrik Ekblad b60095a0ee Merge pull request #10 from henrikekblad/master 
Create README.md
 2014-04-06 20:41:44 +02:00