Skip to content
Permalink
Browse files

move emonTx V3.4 hardware & firmware to single repo

  • Loading branch information...
glynhudson committed Jan 22, 2017
1 parent bc60c83 commit 2e7013219ef46f6a547822ec4e1212749b718689
Showing with 107,763 additions and 2 deletions.
  1. +7 −0 .gitignore
  2. +37 −0 .travis.yml
  3. +13 −2 README.md
  4. +21 −0 firmware/changelog.md
  5. +1,012 −0 firmware/compiled/emonTxV3_RFM12B_latest_433.hex
  6. +1,012 −0 firmware/compiled/emonTxV3_RFM12B_latest_868.hex
  7. +1,011 −0 firmware/compiled/emonTxV3_RFM69CW_latest_433.hex
  8. +1,025 −0 firmware/compiled/emonTxV3_RFM69CW_latest_433_bootloader.hex
  9. +1,011 −0 firmware/compiled/emonTxV3_RFM69CW_latest_868.hex
  10. +45 −0 firmware/platformio.ini
  11. +62 −0 firmware/readme.md
  12. +124 −0 firmware/src/config.ino
  13. +543 −0 firmware/src/src.ino
  14. +58 −0 firmware/test/test_main.cpp
  15. +37 −0 firmware/update_scripts/Readme.md
  16. +5 −0 firmware/update_scripts/Update_emonTx_V3_RFM12B_433.sh
  17. +5 −0 firmware/update_scripts/Update_emonTx_V3_RFM12B_868.sh
  18. +5 −0 firmware/update_scripts/Update_emonTx_V3_RFM69CW_433.sh
  19. +5 −0 firmware/update_scripts/Update_emonTx_V3_RFM69CW_868.sh
  20. BIN hardware/V3.4.0/board.png
  21. +8,930 −0 hardware/V3.4.0/emonTx V3.4.brd
  22. +24,952 −0 hardware/V3.4.0/emonTx V3.4.sch
  23. BIN hardware/V3.4.0/emonTx_V3.4_BOM.ods
  24. BIN hardware/V3.4.0/photo.jpg
  25. BIN hardware/V3.4.0/schematic.png
  26. +8,941 −0 hardware/V3.4.1/emonTx V3.4.1.brd
  27. +24,921 −0 hardware/V3.4.1/emonTx V3.4.1.sch
  28. BIN hardware/V3.4.2/board.png
  29. +8,939 −0 hardware/V3.4.2/emonTx V3.4.2.brd
  30. +24,920 −0 hardware/V3.4.2/emonTx V3.4.2.sch
  31. +38 −0 hardware/V3.4.3/20170122_emontx_v3_4_3.csv
  32. +3 −0 hardware/V3.4.3/readme.md
  33. BIN hardware/board.png
  34. BIN hardware/photo.jpg
  35. +81 −0 hardware/readme.md
  36. BIN hardware/schematic.png
@@ -1,3 +1,10 @@
# PlatformIO

.pioenvs
.clang_complete
.gcc-flags.json
.piolibdeps

# Ignore list for Eagle, a PCB layout tool

# Backup files
@@ -0,0 +1,37 @@
language: python
python:
- '2.7'
sudo: false
cache:
directories:
- "~/.platformio"
install:
- pip install -U platformio
script:
- pio --version
- if [ -z "$TRAVIS_TAG" ]; then
platformio run -d firmware -e emontx;
else
echo $TRAVIS_TAG;
platformio run -d firmware -e emontx_deploy;
fi

deploy:
on:
repo: openenergymonitor/emonTxFirmware
all_branches: true
condition: $TRAVIS_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+$
skip_cleanup: true
provider: releases
overwrite: true
api_key:
secure: M3kEH8npkpyV3sKSEIho+ARh5nXlNMBjSWpMeqGJXZ89w1S3Lqpy7HPEmVeWvdFdyNR0COEqYklYihG9pVQLa+20NTskZTB3WHfCwLkp81mX9eUtPvuC1UybPxVOj1b+9U9E8cmbeFBJZuxCrEfLzMu/O0bkjDY+MlBEk+sfHdqVLrvQbJgDLPZ5SSD2AuL33QVMNsX5KCMj/4Z+sYKgtS9QackGksblrEhGFTJY6sgxXsBcFUA2hLR03qb9fxfmf1CG1yI4PXy8cMabUHlwg35Wn/Wu3qzk5A5wKKkwlcP8g30+HJ/yw9rtxu/af8zRNIDUgaL1m4H9ekDCULFwmwEHgjXEXeHmMAahEwQsQhGNVzdeqrvGIMdl1A6PgThVQu1mPV5wjHdItXzQsFbpeDdCKPl9lNCCBFyXdPdKqCNBRhp3DlZItqgKDUUD1GpZ6GmOTUDbm8rNpLG5rn41ONDizYde3t8JevwTYB80bE6avLO6e4FnMdUSVV5Z7wPRRSzKR7n/PuRaKtrZlitx5MR7dGf6G1OyF5MybBIOvnGnKBxanbzXcWEREOv501grRezPVFQg+/bLzxIVcaXWOt+yMHrq50a6Dltua2IF8AwY0jmoCPlGcHrsr/Si8rq7bmjwErjxQVxi6tuFhKD5XuY1MHqyQ7wKqilh4yqlzto=
file: "firmware/.pioenvs/emontx_deploy/firmware.hex"



## Setup auto depoly .hex on release tag
# sudo gem install travis
# cd into repo
# $ travis setup releases
# folow prompts..depoly section will be populated
@@ -1,2 +1,13 @@
# emontx3
Hardware & firmware for emonTx V3.4.x
## Hardware & Firmware for emonTx V3.4.x


Part of the [OpenEnergyMonitor.org](https://openenergymonitor.org) project

- [Purchase emonTx V3](https://shop.openenergymonitor.com/emonth-433mhz-temperature-humidity-node/)
- [emonTx Getting started guide](https://guide.openenergymonitor.org/setup/emontx)
- [Technical Wiki (emonTx V3.4)](https://wiki.openenergymonitor.org/index.php?title=EmonTx_V3.4)
- [emonTx V3 Resouces](https://guide.openenergymonitor.org/technical/resources/#emontx)


![photo.jpg](hardware/photo.jpg)

@@ -0,0 +1,21 @@
## emonTx V3.4 firmware change log:

- v2.5 19/09/16 Increase baud 9600 > 115200 to emonesp compatiability
- v2.4 06/09/16 Update serial output to use CSV string pairs to work with emonESP e.g. 'ct1:100,ct2:329'
- v2.3 16/11/15 Change to unsigned long for pulse count and make default node ID 8 to avoid emonHub node decoder conflict & fix counting pulses faster than 110ms, strobed meter LED http://openenergymonitor.org/emon/node/11490
- v2.2 12/11/15 Remove debug timming serial print code
- v2.1 24/10/15 Improved timing so that packets are sent just under 10s, reducing resulting data gaps in feeds + default status code for no temp sensors of 3000 which reduces corrupt packets improving data reliability
- V2.0 30/09/15 Update number of samples 1480 > 1662 to improve sampling accurancy: 1662 samples take 300 mS, which equates to 15 cycles @ 50 Hz or 18 cycles @ 60 Hz.
- V1.9 25/08/15 Fix spurious pulse readings from RJ45 port when DS18B20 but no pulse counter is connected (enable internal pull-up)
- V1.8 - 18/06/15 Increase max pulse width to 110ms
- V1.7 - 12/06/15 Fix pulse count debounce issue & enable pulse count pulse temperature
- V1.6 - Add support for multiple DS18B20 temperature sensors
- V1.5 - Add interrupt pulse counting - simplify serial print debug
- V1.4.1 - Remove filter settle routine as latest emonLib 19/01/15 does not require
- V1.4 - Support for RFM69CW, DIP switches and battery voltage reading on emonTx V3.4
- V1.3 - fix filter settle time to eliminate large inital reading
- V1.2 - fix bug which caused Vrms to be returned as zero if CT1 was not connected
- V1.1 - fix bug in startup Vrms calculation, startup Vrms startup calculation is now more accuratre

`emonhub.conf` node decoder (nodeid is 8 when switch is off, 7 when switch is on)
See: https://github.com/openenergymonitor/emonhub/blob/emon-pi/configuration.md

0 comments on commit 2e70132

Please sign in to comment.
You can’t perform that action at this time.