jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 11:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

pin configs and renames to prepare PR

Browse Source
This commit is contained in:
Staars 2020-02-06 17:05:37 +01:00
parent a4e613a992
commit 8d48cf3731
25 changed files with 61 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasmota/language/bg-BG.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_SLAVE_RESET "Slave RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

2
tasmota/language/cs-CZ.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_SLAVE_RESET "Slave RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

2
tasmota/language/de-DE.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_SLAVE_RESET "Slave RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

2
tasmota/language/el-GR.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_SLAVE_RESET "Slave RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

2
tasmota/language/en-GB.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_SLAVE_RESET "Slave RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

2
tasmota/language/es-ES.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_SLAVE_RESET "Slave RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

2
tasmota/language/fr-FR.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Esclave Rst" #define D_SENSOR_SLAVE_RESET "Esclave Rst"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

2
tasmota/language/he-HE.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_SLAVE_RESET "Slave RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

2
tasmota/language/hu-HU.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_SLAVE_RESET "Slave RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

2
tasmota/language/it-IT.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_SLAVE_RESET "Slave RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

2
tasmota/language/ko-KO.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_SLAVE_RESET "Slave RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

2
tasmota/language/nl-NL.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_SLAVE_RESET "Slave RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

2
tasmota/language/pl-PL.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_SLAVE_RESET "Slave RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

2
tasmota/language/pt-BR.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_SLAVE_RESET "Slave RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

2
tasmota/language/pt-PT.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_SLAVE_RESET "Slave RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

2
tasmota/language/ru-RU.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_SLAVE_RESET "Slave RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "А" #define D_UNIT_AMPERE "А"

2
tasmota/language/sk-SK.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_SLAVE_RESET "Slave RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

2
tasmota/language/sv-SE.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_SLAVE_RESET "Slave RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

2
tasmota/language/tr-TR.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_SLAVE_RESET "Slave RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"

2
tasmota/language/uk-UA.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_SLAVE_RESET "Slave RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "А" #define D_UNIT_AMPERE "А"

2
tasmota/language/zh-CN.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_SLAVE_RESET "Slave RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "安" #define D_UNIT_AMPERE "安"

2
tasmota/language/zh-TW.h
View File

@ -635,6 +635,8 @@
#define D_SENSOR_SLAVE_RESET "Slave RST" #define D_SENSOR_SLAVE_RESET "Slave RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX"
// Units // Units
#define D_UNIT_AMPERE "安" #define D_UNIT_AMPERE "安"

1
tasmota/my_user_config.h
View File

@ -542,6 +542,7 @@
//#define USE_IBEACON // Add support for bluetooth LE passive scan of ibeacon devices (uses HM17 module) //#define USE_IBEACON // Add support for bluetooth LE passive scan of ibeacon devices (uses HM17 module)
//#define USE_GPS // Add support for GPS and NTP Server for becoming Stratus 1 Time Source (+ 3.1kb flash, +132 bytes RAM) //#define USE_GPS // Add support for GPS and NTP Server for becoming Stratus 1 Time Source (+ 3.1kb flash, +132 bytes RAM)
// #define USE_FLOG // Add support for GPS logging in OTA's Flash (Experimental) (+ 2.9kb flash, +8 bytes RAM) // #define USE_FLOG // Add support for GPS logging in OTA's Flash (Experimental) (+ 2.9kb flash, +8 bytes RAM)
#define USE_HM10 // Add support for HM-10 as a BLE-bridge for the LYWSD03 (+... code)
// -- Power monitoring sensors -------------------- // -- Power monitoring sensors --------------------
#define USE_ENERGY_MARGIN_DETECTION // Add support for Energy Margin detection (+1k6 code) #define USE_ENERGY_MARGIN_DETECTION // Add support for Energy Margin detection (+1k6 code)

8
tasmota/tasmota_template.h
View File

@ -216,6 +216,8 @@ enum UserSelectablePins {
GPIO_HPMA_TX, // Honeywell HPMA115S0 Serial interface GPIO_HPMA_TX, // Honeywell HPMA115S0 Serial interface
GPIO_GPS_RX, // GPS serial interface GPIO_GPS_RX, // GPS serial interface
GPIO_GPS_TX, // GPS serial interface GPIO_GPS_TX, // GPS serial interface
GPIO_HM10_RX, // HM10-BLE-Mijia-bridge serial interface
GPIO_HM10_TX, // HM10-BLE-Mijia-bridge serial interface
GPIO_SENSOR_END }; GPIO_SENSOR_END };
// Programmer selectable GPIO functionality // Programmer selectable GPIO functionality
@ -296,7 +298,7 @@ const char kSensorNames[] PROGMEM =
D_SENSOR_DEEPSLEEP "|" D_SENSOR_EXS_ENABLE "|" D_SENSOR_DEEPSLEEP "|" D_SENSOR_EXS_ENABLE "|"
D_SENSOR_SLAVE_TX "|" D_SENSOR_SLAVE_RX "|" D_SENSOR_SLAVE_RESET "|" D_SENSOR_SLAVE_RESET "i|" D_SENSOR_SLAVE_TX "|" D_SENSOR_SLAVE_RX "|" D_SENSOR_SLAVE_RESET "|" D_SENSOR_SLAVE_RESET "i|"
D_SENSOR_HPMA_RX "|" D_SENSOR_HPMA_TX "|" D_SENSOR_HPMA_RX "|" D_SENSOR_HPMA_TX "|"
D_SENSOR_GPS_RX "|" D_SENSOR_GPS_TX D_SENSOR_GPS_RX "|" D_SENSOR_GPS_TX "|" D_SENSOR_HM10_RX "|" D_SENSOR_HM10_TX
; ;
const char kSensorNamesFixed[] PROGMEM = const char kSensorNamesFixed[] PROGMEM =
@ -737,6 +739,10 @@ const uint8_t kGpioNiceList[] PROGMEM = {
GPIO_GPS_RX, // GPS serial interface GPIO_GPS_RX, // GPS serial interface
GPIO_GPS_TX, // GPS serial interface GPIO_GPS_TX, // GPS serial interface
#endif #endif
#ifdef USE_HM10
GPIO_HM10_RX, // GPS serial interface
GPIO_HM10_TX, // GPS serial interface
#endif
#ifdef USE_MGC3130 #ifdef USE_MGC3130
GPIO_MGC3130_XFER, GPIO_MGC3130_XFER,

18
tasmota/xsns_92_MI_HM10.ino → tasmota/xsns_62_MI_HM10.ino
View File

@ -22,15 +22,13 @@
-------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------
--- ---
0.9.0.0 20200130 started - initial development by Christian Baars 0.9.0.0 20200130 started - initial development by Christian Baars (support LYWSD03 only)
forked - from arendst/tasmota - https://github.com/arendst/Tasmota forked - from arendst/tasmota - https://github.com/arendst/Tasmota
*/ */
#ifdef USE_HM10
#define XSNS_92 92 #define XSNS_62 62
#define HM_PIN_RX 5 // D1 Hardcoded while developing
#define HM_PIN_TX 4 // D2
#include <TasmotaSerial.h> #include <TasmotaSerial.h>
#include <vector> #include <vector>
@ -263,7 +261,7 @@ uint32_t MIBLEgetSensorSlot(uint8_t (&_serial)[6], uint8_t _type){
void HM10SerialInit(void) { void HM10SerialInit(void) {
HM10.mode.init = false; HM10.mode.init = false;
HM10.serialSpeed = HM10_BAUDRATE; HM10.serialSpeed = HM10_BAUDRATE;
HM10Serial = new TasmotaSerial(HM_PIN_RX, HM_PIN_TX, 1, 0, HM10_MAX_RX_BUF); HM10Serial = new TasmotaSerial(pin[GPIO_HM10_RX], pin[GPIO_HM10_TX], 1, 0, HM10_MAX_RX_BUF);
if (HM10Serial->begin(HM10.serialSpeed)) { if (HM10Serial->begin(HM10.serialSpeed)) {
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s start serial communication fixed to 115200 baud"),D_CMND_HM10); AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s start serial communication fixed to 115200 baud"),D_CMND_HM10);
if (HM10Serial->hardwareSerial()) { if (HM10Serial->hardwareSerial()) {
@ -728,18 +726,17 @@ void HM10Show(bool json)
* Interface * Interface
\*********************************************************************************************/ \*********************************************************************************************/
bool Xsns92(uint8_t function) bool Xsns62(uint8_t function)
{ {
bool result = false; bool result = false;
// if ((pin[HM_PIN_RX] < 99) && (pin[HM_PIN_TX] < 99)) { if ((pin[GPIO_HM10_RX] < 99) && (pin[GPIO_HM10_TX] < 99)) {
if (true) {
switch (function) { switch (function) {
case FUNC_INIT: case FUNC_INIT:
HM10SerialInit(); // init and start communication HM10SerialInit(); // init and start communication
break; break;
case FUNC_EVERY_50_MSECOND: case FUNC_EVERY_50_MSECOND:
HM10SerialHandleFeedback(); // -> sniff for device feedback very often HM10SerialHandleFeedback(); // check for device feedback very often
break; break;
case FUNC_EVERY_100_MSECOND: case FUNC_EVERY_100_MSECOND:
if (HM10_TASK_LIST[0][0] != TASK_HM10_NOTASK) { if (HM10_TASK_LIST[0][0] != TASK_HM10_NOTASK) {
@ -764,3 +761,4 @@ bool Xsns92(uint8_t function)
} }
return result; return result;
} }
#endif //USE_HM10