Skip to content

Commit

Permalink
two new devices
Browse files Browse the repository at this point in the history 
new devices:
esp dht11 & ds18b20 boards

renamed flags to make more sense.
  • Loading branch information
@gn0st1c
gn0st1c committed Apr 10, 2018
1 parent 62c72a7 commit 374e92b
Show file tree
Hide file tree
Showing 7 changed files with 106 additions and 11 deletions.
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,8 @@ Here is the list of supported hardware. For more information please refer to the
|**IKE ESPike**|**STM_RELAY**|**Arniex Swifitch**|
|![Heltec Touch Relay](images/devices/heltec-touch-relay.jpg)|![Generic Relay v4.0](images/devices/generic-relay-40.jpg)|![Generic RGBLed v1.0](images/devices/generic-rgbled-10.jpg)|
|**Heltec Touch Relay**|**Generic Relay v4.0**|**Generic RGBLed v1.0**|
|![Generic DHT11 v1.0](images/devices/generic-dht11-10.jpg)|![Generic DS18B20 v1.0](images/devices/generic-ds18b20-10.jpg)||
|**Generic DHT11 v1.0**|**Generic DS18B20 v1.0**||

**Other supported boards:**
*TODO*
Expand Down
6 changes: 4 additions & 2 deletions code/espurna/config/arduino.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,10 @@
//#define GREEN_ESP8266RELAY
//#define IKE_ESPIKE
//#define ARNIEX_SWIFITCH
//#define GENERIC_ESP01SRELAY40
//#define GENERIC_ESP01SRGBLED10
//#define GENERIC_ESP01S_RELAY_V40
//#define GENERIC_ESP01S_RGBLED_V10
//#define GENERIC_ESP01S_DHT11_V10
//#define GENERIC_ESP01S_DS18B20_V10
//#define HELTEC_TOUCHRELAY

//--------------------------------------------------------------------------------
Expand Down
41 changes: 38 additions & 3 deletions code/espurna/config/hardware.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1223,7 +1223,7 @@
#define RELAY1_TYPE RELAY_TYPE_NORMAL
#define RELAY2_TYPE RELAY_TYPE_NORMAL

// DB18B20
// DS18B20
#ifndef DALLAS_SUPPORT
#define DALLAS_SUPPORT 1
#endif
Expand Down Expand Up @@ -1829,7 +1829,7 @@
// https://www.aliexpress.com/wholesale?catId=0&initiative_id=SB_20180404024035&SearchText=esp-01s+relay
// -----------------------------------------------------------------------------

#elif defined(GENERIC_ESP01SRELAY40)
#elif defined(GENERIC_ESP01S_RELAY_V40)

// Info
#define MANUFACTURER "GENERIC"
Expand All @@ -1848,7 +1848,7 @@
// https://www.aliexpress.com/wholesale?catId=0&initiative_id=SB_20180404023816&SearchText=esp-01s+led+controller
// -----------------------------------------------------------------------------

#elif defined(GENERIC_ESP01SRGBLED10)
#elif defined(GENERIC_ESP01S_RGBLED_V10)

// Info
#define MANUFACTURER "GENERIC"
Expand All @@ -1866,6 +1866,41 @@
// LEDs
#define LED1_PIN 2


// -----------------------------------------------------------------------------
// ESP-01S DHT11 v1.0
// https://www.aliexpress.com/wholesale?catId=0&initiative_id=SB_20180410105907&SearchText=esp-01s+dht11
// -----------------------------------------------------------------------------

#elif defined(GENERIC_ESP01S_DHT11_V10)

// Info
#define MANUFACTURER "GENERIC"
#define DEVICE "ESP01S_DHT11_10"

// DHT11
#ifndef DHT_SUPPORT
#define DHT_SUPPORT 1
#endif
#define DHT_PIN 2

// -----------------------------------------------------------------------------
// ESP-01S DS18B20 v1.0
// https://www.aliexpress.com/wholesale?catId=0&initiative_id=SB_20180410105933&SearchText=esp-01s+ds18b20
// -----------------------------------------------------------------------------

#elif defined(GENERIC_ESP01S_DS18B20_V10)

// Info
#define MANUFACTURER "GENERIC"
#define DEVICE "ESP01S_DS18B20_10"

// DB18B20
#ifndef DALLAS_SUPPORT
#define DALLAS_SUPPORT 1
#endif
#define DALLAS_PIN 2

// -----------------------------------------------------------------------------
// Heltec Touch Relay
// https://www.aliexpress.com/wholesale?catId=0&initiative_id=SB_20180408043114&SearchText=esp8266+touch+relay
Expand Down
12 changes: 10 additions & 2 deletions code/espurna/migrate.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -859,15 +859,15 @@ void migrate() {
setSetting("relayGPIO", 0, 5);
setSetting("relayType", 0, RELAY_TYPE_INVERSE);

#elif defined(GENERIC_ESP01SRELAY40)
#elif defined(GENERIC_ESP01S_RELAY_V40)

setSetting("board", 65);
setSetting("ledGPIO", 0, 2);
setSetting("ledLogic", 0, 0);
setSetting("relayGPIO", 0, 0);
setSetting("relayType", 0, RELAY_TYPE_NORMAL);

#elif defined(GENERIC_ESP01SRGBLED10)
#elif defined(GENERIC_ESP01S_RGBLED_V10)

setSetting("board", 66);
setSetting("ledGPIO", 0, 2);
Expand All @@ -880,6 +880,14 @@ void migrate() {
setSetting("relayGPIO", 0, 12);
setSetting("relayType", 0, RELAY_TYPE_NORMAL);

#elif defined(GENERIC_ESP01S_DHT11_V10)

setSetting("board", 68);

#elif defined(GENERIC_ESP01S_DS18B20_V10)

setSetting("board", 69);

#else

// Allow users to define new settings without migration config
Expand Down
56 changes: 52 additions & 4 deletions code/platformio.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1881,7 +1881,7 @@ board = esp01_1m
board_flash_mode = dout
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
build_flags = ${common.build_flags_1m} -DGENERIC_ESP01SRELAY40
build_flags = ${common.build_flags_1m} -DGENERIC_ESP01S_RELAY_V40
monitor_baud = 115200
extra_scripts = ${common.extra_scripts}

Expand All @@ -1892,7 +1892,7 @@ board = esp01_1m
board_flash_mode = dout
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
build_flags = ${common.build_flags_1m} -DGENERIC_ESP01SRELAY40
build_flags = ${common.build_flags_1m} -DGENERIC_ESP01S_RELAY_V40
upload_speed = 115200
upload_port = "${env.ESPURNA_IP}"
upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
Expand All @@ -1905,7 +1905,7 @@ board = esp01_1m
board_flash_mode = dout
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
build_flags = ${common.build_flags_1m} -DGENERIC_ESP01SRGBLED10
build_flags = ${common.build_flags_1m} -DGENERIC_ESP01S_RGBLED_V10
monitor_baud = 115200
extra_scripts = ${common.extra_scripts}

Expand All @@ -1916,7 +1916,55 @@ board = esp01_1m
board_flash_mode = dout
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
build_flags = ${common.build_flags_1m} -DGENERIC_ESP01SRGBLED10
build_flags = ${common.build_flags_1m} -DGENERIC_ESP01S_RGBLED_V10
upload_speed = 115200
upload_port = "${env.ESPURNA_IP}"
upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
extra_scripts = ${common.extra_scripts}

[env:generic-esp01s-dht11-10]
platform = ${common.platform}
framework = arduino
board = esp01_1m
board_flash_mode = dout
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
build_flags = ${common.build_flags_1m} -DGENERIC_ESP01S_DHT11_V10
monitor_baud = 115200
extra_scripts = ${common.extra_scripts}

[env:generic-esp01s-dht11-10-ota]
platform = ${common.platform}
framework = arduino
board = esp01_1m
board_flash_mode = dout
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
build_flags = ${common.build_flags_1m} -DGENERIC_ESP01S_DHT11_V10
upload_speed = 115200
upload_port = "${env.ESPURNA_IP}"
upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
extra_scripts = ${common.extra_scripts}

[env:generic-esp01s-ds18b20-10]
platform = ${common.platform}
framework = arduino
board = esp01_1m
board_flash_mode = dout
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
build_flags = ${common.build_flags_1m} -DGENERIC_ESP01S_DS18B20_V10
monitor_baud = 115200
extra_scripts = ${common.extra_scripts}

[env:generic-esp01s-ds18b20-10-ota]
platform = ${common.platform}
framework = arduino
board = esp01_1m
board_flash_mode = dout
lib_deps = ${common.lib_deps}
lib_ignore = ${common.lib_ignore}
build_flags = ${common.build_flags_1m} -DGENERIC_ESP01S_DS18B20_V10
upload_speed = 115200
upload_port = "${env.ESPURNA_IP}"
upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
Expand Down
Binary file added images/devices/generic-dht11-10.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/devices/generic-ds18b20-10.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 374e92b

Please sign in to comment.