commit and branch into version number

This commit is contained in:
livello
2018-03-15 04:01:55 +03:00
parent cbb8282bfd
commit 5fe20078b1
3 changed files with 16 additions and 1426 deletions

View File

@@ -129,6 +129,14 @@ EthernetClient ethClient;
#include "dmx.h" #include "dmx.h"
#endif #endif
#define Q(x) #x
#define QUOTE(x) Q(x)
#ifndef PIO_SRC_REV
#define PIO_SRC_REV_BRANCH v0.97
#endif
#include "item.h" #include "item.h"
#include "inputs.h" #include "inputs.h"
@@ -886,7 +894,9 @@ void postTransmission()
void setup_main() { void setup_main() {
cmdInit(115200); cmdInit(115200);
Serial.println(F("\nLazyhome.ru LightHub controller v0.97")); Serial.print(F("\nLazyhome.ru LightHub controller "));
Serial.println(F(QUOTE(PIO_SRC_REV)));
cmdAdd("help", _handleHelp); cmdAdd("help", _handleHelp);
cmdAdd("save", _saveConfig); cmdAdd("save", _saveConfig);

File diff suppressed because it is too large Load Diff

View File

@@ -10,7 +10,7 @@
[platformio] [platformio]
src_dir = lighthub src_dir = lighthub
env_default = env_default =
megaatmega2560 ; megaatmega2560
due due
[env:due] [env:due]
@@ -18,6 +18,8 @@ platform = atmelsam
framework = arduino framework = arduino
board = due board = due
lib_ldf_mode = chain+ lib_ldf_mode = chain+
build_flags = !echo -n "-DPIO_SRC_REV="$(git branch)
;echo "-DPIO_SRC_REV_COMMIT="$( git rev-parse --short HEAD)
lib_deps = lib_deps =
https://github.com/sebnil/DueFlashStorage https://github.com/sebnil/DueFlashStorage
https://github.com/livello/Arduino-Temperature-Control-Library.git#1306c49 https://github.com/livello/Arduino-Temperature-Control-Library.git#1306c49
@@ -28,7 +30,8 @@ lib_deps =
https://github.com/anklimov/aJson https://github.com/anklimov/aJson
https://github.com/anklimov/CmdArduino https://github.com/anklimov/CmdArduino
https://github.com/anklimov/ModbusMaster https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/Ethernet ; https://github.com/anklimov/Ethernet
872
; https://github.com/PaulStoffregen/SPI.git ; https://github.com/PaulStoffregen/SPI.git
https://github.com/knolleary/pubsubclient.git https://github.com/knolleary/pubsubclient.git
https://github.com/anklimov/Artnet.git https://github.com/anklimov/Artnet.git