refactoring #5

Manually merged
jct merged 2 commits from refactoring into master 2019-11-29 09:59:34 +00:00
4 changed files with 13 additions and 5 deletions
Showing only changes of commit b5498b7173 - Show all commits

@ -24,6 +24,13 @@ steps:
base_url: https://code.jcktrue.dk base_url: https://code.jcktrue.dk
files: files:
- .pio/build/nodemcu/firmware.bin - .pio/build/nodemcu/firmware.bin
checksum:
- md5
- sha1
- sha256
- sha512
- adler32
- crc32
when: when:
event: tag event: tag
branch: branch:

@ -1,8 +1,9 @@
#ifndef CONFIG_H #ifndef CONFIG_H
#define CONFIG_H #define CONFIG_H
#ifndef CONFIG_VERSION #ifndef VERSION
#define CONFIG_VERSION "v0.4.4-Dev" //SEMVER style version
#define VERSION "0.4.5-Dev"
#endif #endif
#define CONFIG_SERIAL_BAUDRATE 115200 #define CONFIG_SERIAL_BAUDRATE 115200

@ -4,7 +4,7 @@ framework = arduino
upload_speed=921600 upload_speed=921600
build_flags = -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY -DCONFIG_VERSION=${sysenv.DRONE_TAG} build_flags = -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY -DVERSION=${sysenv.DRONE_SEMVER}
lib_deps = https://github.com/homieiot/homie-esp8266.git#develop-v3, DHT sensor library for ESPx lib_deps = https://github.com/homieiot/homie-esp8266.git#develop-v3, DHT sensor library for ESPx
[env:nodemcu] [env:nodemcu]

@ -109,7 +109,7 @@ void setup()
{ {
Serial.begin(CONFIG_SERIAL_BAUDRATE); Serial.begin(CONFIG_SERIAL_BAUDRATE);
Homie_setFirmware("deskcontrol", CONFIG_VERSION); Homie_setFirmware("deskcontrol", VERSION);
Homie.disableResetTrigger(); Homie.disableResetTrigger();