Browse Source

Merge pull request #647 from lobradov/travis-build-2

Additional Travis build coverage
rfm69
Xose Pérez 6 years ago
committed by GitHub
parent
commit
9b05d54f0c
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 73 additions and 10 deletions
  1. +50
    -8
      code/espurna/config/hardware.h
  2. +23
    -2
      code/platformio.ini

+ 50
- 8
code/espurna/config/hardware.h View File

@ -1542,20 +1542,20 @@
#define MANUFACTURER "TravisCI" #define MANUFACTURER "TravisCI"
#define DEVICE "Virtual board 01" #define DEVICE "Virtual board 01"
// Some buttons
// Some buttons - pin 0
#define BUTTON1_PIN 0 #define BUTTON1_PIN 0
#define BUTTON1_MODE BUTTON_PUSHBUTTON | BUTTON_DEFAULT_HIGH #define BUTTON1_MODE BUTTON_PUSHBUTTON | BUTTON_DEFAULT_HIGH
#define BUTTON1_RELAY 1 #define BUTTON1_RELAY 1
// Some relays
// Some relays - pin 1
#define RELAY1_PIN 1 #define RELAY1_PIN 1
#define RELAY1_TYPE RELAY_TYPE_NORMAL #define RELAY1_TYPE RELAY_TYPE_NORMAL
// Some LEDs
// Some LEDs - pin 2
#define LED1_PIN 2 #define LED1_PIN 2
#define LED1_PIN_INVERSE 1 #define LED1_PIN_INVERSE 1
// A bit of I2C
// A bit of I2C - pins 3,4
#define I2C_SDA_PIN 3 #define I2C_SDA_PIN 3
#define I2C_SCL_PIN 4 #define I2C_SCL_PIN 4
// and, as they say in "From Dusk till Dawn": // and, as they say in "From Dusk till Dawn":
@ -1574,7 +1574,7 @@
#define SI7021_SUPPORT 1 #define SI7021_SUPPORT 1
// A bit of lights.
// A bit of lights - pin 5
#define RELAY_PROVIDER RELAY_PROVIDER_LIGHT #define RELAY_PROVIDER RELAY_PROVIDER_LIGHT
#define LIGHT_PROVIDER LIGHT_PROVIDER_DIMMER #define LIGHT_PROVIDER LIGHT_PROVIDER_DIMMER
#define DUMMY_RELAY_COUNT 1 #define DUMMY_RELAY_COUNT 1
@ -1582,7 +1582,7 @@
#define LIGHT_CH1_PIN 5 #define LIGHT_CH1_PIN 5
#define LIGHT_CH1_INVERSE 0 #define LIGHT_CH1_INVERSE 0
// A bit of HLW8012
// A bit of HLW8012 - pins 6,7,8
#ifndef HLW8012_SUPPORT #ifndef HLW8012_SUPPORT
#define HLW8012_SUPPORT 1 #define HLW8012_SUPPORT 1
#endif #endif
@ -1590,13 +1590,13 @@
#define HLW8012_CF1_PIN 7 #define HLW8012_CF1_PIN 7
#define HLW8012_CF_PIN 8 #define HLW8012_CF_PIN 8
// A bit of Dallas
// A bit of Dallas - pin 9
#ifndef DALLAS_SUPPORT #ifndef DALLAS_SUPPORT
#define DALLAS_SUPPORT 1 #define DALLAS_SUPPORT 1
#endif #endif
#define DALLAS_PIN 9 #define DALLAS_PIN 9
// And some ECH1560
// A bit of ECH1560 - pins 10,11, 12
#ifndef ECH1560_SUPPORT #ifndef ECH1560_SUPPORT
#define ECH1560_SUPPORT 1 #define ECH1560_SUPPORT 1
#endif #endif
@ -1604,6 +1604,48 @@
#define ECH1560_MISO_PIN 11 #define ECH1560_MISO_PIN 11
#define ECH1560_INVERTED 12 #define ECH1560_INVERTED 12
#elif defined(TRAVIS02)
// Relay provider dual
#define MANUFACTURER "TravisCI"
#define DEVICE "Virtual board 02"
// A bit of DHT - pin 1
#ifndef DHT_SUPPORT
#define DHT_SUPPORT 1
#endif
#define DHT_PIN 1
// Relay type dual - pins 2,3
#define RELAY_PROVIDER RELAY_PROVIDER_DUAL
#define RELAY1_PIN 2
#define RELAY2_PIN 3
#define RELAY1_TYPE RELAY_TYPE_NORMAL
#define RELAY2_TYPE RELAY_TYPE_NORMAL
// IR - pin 4
#define IR_SUPPORT 1
#define IR_PIN 4
#define IR_BUTTON_SET 1
#elif defined(TRAVIS03)
// Relay provider light/my92XX
#define MANUFACTURER "TravisCI"
#define DEVICE "Virtual board 03"
// MY9231 Light - pins 1,2
#define RELAY_PROVIDER RELAY_PROVIDER_LIGHT
#define LIGHT_PROVIDER LIGHT_PROVIDER_MY92XX
#define DUMMY_RELAY_COUNT 1
#define LIGHT_CHANNELS 5
#define MY92XX_MODEL MY92XX_MODEL_MY9231
#define MY92XX_CHIPS 2
#define MY92XX_DI_PIN 1
#define MY92XX_DCKI_PIN 2
#define MY92XX_COMMAND MY92XX_COMMAND_DEFAULT
#define MY92XX_MAPPING 4, 3, 5, 0, 1
#endif #endif
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------


+ 23
- 2
code/platformio.ini View File

@ -4,8 +4,9 @@ src_dir = espurna
data_dir = espurna/data data_dir = espurna/data
[common] [common]
#platform = espressif8266
platform = https://github.com/platformio/platform-espressif8266.git#v1.5.0
platform = espressif8266@1.6.0
; platform = espressif8266@1.5.0
; platform = https://github.com/platformio/platform-espressif8266.git#v1.5.0
build_flags = -g -DMQTT_MAX_PACKET_SIZE=400 ${env.ESPURNA_FLAGS} build_flags = -g -DMQTT_MAX_PACKET_SIZE=400 ${env.ESPURNA_FLAGS}
debug_flags = -DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM debug_flags = -DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM
build_flags_512k = ${common.build_flags} -Wl,-Tesp8266.flash.512k0.ld build_flags_512k = ${common.build_flags} -Wl,-Tesp8266.flash.512k0.ld
@ -1539,3 +1540,23 @@ lib_ignore = ${common.lib_ignore}
build_flags = ${common.build_flags} -DTRAVIS01 build_flags = ${common.build_flags} -DTRAVIS01
monitor_baud = 115200 monitor_baud = 115200
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
[env:travis02]
platform = ${common.platform}
framework = arduino
board = esp12e
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
build_flags = ${common.build_flags} -DTRAVIS02
monitor_baud = 115200
extra_scripts = ${common.extra_scripts}
[env:travis03]
platform = ${common.platform}
framework = arduino
board = esp12e
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
build_flags = ${common.build_flags} -DTRAVIS03 -DNOWSAUTH -DASYNC_TCP_SSL_ENABLED=1
monitor_baud = 115200
extra_scripts = ${common.extra_scripts}

Loading…
Cancel
Save