From b7f64de661424d10783572055deecc69488a1015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xose=20P=C3=A9rez?= Date: Fri, 22 Feb 2019 00:47:57 +0100 Subject: [PATCH] Change naming for BlitzWolf SHP2 and SHP6 (now SHPX) boards --- code/espurna/config/arduino.h | 4 ++-- code/espurna/config/hardware.h | 14 +++++++++----- code/platformio.ini | 16 ++++++++-------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/code/espurna/config/arduino.h b/code/espurna/config/arduino.h index a1eb2e8d..f737a677 100644 --- a/code/espurna/config/arduino.h +++ b/code/espurna/config/arduino.h @@ -92,7 +92,7 @@ //#define NEO_COOLCAM_NAS_WR01W //#define ESTINK_WIFI_POWER_STRIP //#define PILOTAK_ESP_DIN_V1 -//#define BLITZWOLF_BWSHP2 +//#define BLITZWOLF_BWSHPX //#define BH_ONOFRE //#define ITEAD_SONOFF_IFAN02 //#define GENERIC_AG_L4 @@ -115,7 +115,7 @@ //#define GOSUND_SP1_V23 //#define GOSUND_WS1 //#define ARILUX_AL_LC02_V14 -//#define BLITZWOLF_BWSHP2_V23 +//#define BLITZWOLF_BWSHPX_V23 //-------------------------------------------------------------------------------- // Features (values below are non-default values) diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h index e6879ffb..2f867469 100644 --- a/code/espurna/config/hardware.h +++ b/code/espurna/config/hardware.h @@ -2723,7 +2723,8 @@ #define RELAY2_TYPE RELAY_TYPE_NORMAL // ----------------------------------------------------------------------------- -// Several boards under different names uing a power chip labelled BL0937 or HJL-01 +// BlitzWolf SHP2 and SHP6 +// Also several boards under different names uing a power chip labelled BL0937 or HJL-01 // * Blitzwolf (https://www.amazon.es/Inteligente-Temporización-Dispositivos-Cualquier-BlitzWolf/dp/B07BMQP142) // * HomeCube (https://www.amazon.de/Steckdose-Homecube-intelligente-Verbrauchsanzeige-funktioniert/dp/B076Q2LKHG) // * Coosa (https://www.amazon.com/COOSA-Monitoring-Function-Campatible-Assiatant/dp/B0788W9TDR) @@ -2731,11 +2732,11 @@ // * Ablue (https://www.amazon.de/Intelligente-Steckdose-Ablue-Funktioniert-Assistant/dp/B076DRFRZC) // ----------------------------------------------------------------------------- -#elif defined(BLITZWOLF_BWSHP2) +#elif defined(BLITZWOLF_BWSHPX) // Info #define MANUFACTURER "BLITZWOLF" - #define DEVICE "BWSHP2" + #define DEVICE "BWSHPX" // Buttons #define BUTTON1_PIN 13 @@ -2770,13 +2771,15 @@ // ----------------------------------------------------------------------------- // Same as the above but new board version marked V2.3 +// BlitzWolf SHP2 V2.3 +// Gosund SP1 V2.3 // ----------------------------------------------------------------------------- -#elif defined(BLITZWOLF_BWSHP2_V23) +#elif defined(BLITZWOLF_BWSHPX_V23) // Info #define MANUFACTURER "BLITZWOLF" - #define DEVICE "BWSHP2V2.3" + #define DEVICE "BWSHPX_V23" // Buttons #define BUTTON1_PIN 3 @@ -2873,6 +2876,7 @@ #define LED1_PIN 1 #define LED1_PIN_INVERSE 1 +// This one is the same as the BLITZWOLF_BWSHPX_V23 #elif defined(GOSUND_SP1_V23) // Info diff --git a/code/platformio.ini b/code/platformio.ini index a3eb8548..2ae0baa8 100644 --- a/code/platformio.ini +++ b/code/platformio.ini @@ -2772,52 +2772,52 @@ upload_port = ${common.upload_port} upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} -[env:blitzwolf-bwshp2] +[env:blitzwolf-bwshpx] platform = ${common.platform} framework = ${common.framework} board = ${common.board_1m} board_build.flash_mode = ${common.flash_mode} lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} -build_flags = ${common.build_flags_1m0m} -DBLITZWOLF_BWSHP2 +build_flags = ${common.build_flags_1m0m} -DBLITZWOLF_BWSHPX upload_speed = ${common.upload_speed} monitor_speed = ${common.monitor_speed} extra_scripts = ${common.extra_scripts} -[env:blitzwolf-bwshp2-ota] +[env:blitzwolf-bwshpx-ota] platform = ${common.platform} framework = ${common.framework} board = ${common.board_1m} board_build.flash_mode = ${common.flash_mode} lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} -build_flags = ${common.build_flags_1m0m} -DBLITZWOLF_BWSHP2 +build_flags = ${common.build_flags_1m0m} -DBLITZWOLF_BWSHPX upload_speed = ${common.upload_speed} monitor_speed = ${common.monitor_speed} upload_port = ${common.upload_port} upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} -[env:blitzwolf-bwshp2-v23] +[env:blitzwolf-bwshpx-v23] platform = ${common.platform} framework = ${common.framework} board = ${common.board_1m} board_build.flash_mode = ${common.flash_mode} lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} -build_flags = ${common.build_flags_1m0m} -DBLITZWOLF_BWSHP2_V23 +build_flags = ${common.build_flags_1m0m} -DBLITZWOLF_BWSHPX_V23 upload_speed = ${common.upload_speed} monitor_speed = ${common.monitor_speed} extra_scripts = ${common.extra_scripts} -[env:blitzwolf-bwshp2-v23-ota] +[env:blitzwolf-bwshpx-v23-ota] platform = ${common.platform} framework = ${common.framework} board = ${common.board_1m} board_build.flash_mode = ${common.flash_mode} lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} -build_flags = ${common.build_flags_1m0m} -DBLITZWOLF_BWSHP2_V23 +build_flags = ${common.build_flags_1m0m} -DBLITZWOLF_BWSHPX_V23 upload_speed = ${common.upload_speed} monitor_speed = ${common.monitor_speed} upload_port = ${common.upload_port}