mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7806 from he-so/dev-arendst 

Make CC1101 GDO0 and GDO2 pins user configurable
This commit is contained in:
Theo Arends 2020-02-28 15:50:52 +01:00 committed by GitHub
parent 9c8dd2139d cc8dfc22a8
commit c0a490a54e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "A"

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "A"

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "A"

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "A"

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "A"

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "A"

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "A"

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "A"

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "A"

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "A"

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "A"

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "A"

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "A"

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "A"

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "A"

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "А"

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "A"

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "A"

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "A"

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "А"

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "安"

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

@ -641,6 +641,8 @@
#define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx"
#define D_SENSOR_LE01MR_TX "LE-01MR Tx"
#define D_SENSOR_CC1101_GDO0 "CC1101 GDO0"
#define D_SENSOR_CC1101_GDO2 "CC1101 GDO2"
// Units
#define D_UNIT_AMPERE "安"

10
tasmota/tasmota_template.h
View File

@ -222,6 +222,8 @@ enum UserSelectablePins {
GPIO_HM10_TX, // HM10-BLE-Mijia-bridge serial interface
GPIO_LE01MR_RX, // F&F LE-01MR energy meter
GPIO_LE01MR_TX, // F&F LE-01MR energy meter
GPIO_CC1101_GDO0, // CC1101 pin for RX
GPIO_CC1101_GDO2, // CC1101 pin for RX
GPIO_SENSOR_END };
// Programmer selectable GPIO functionality
@ -305,7 +307,8 @@ const char kSensorNames[] PROGMEM =
D_SENSOR_GPS_RX "|" D_SENSOR_GPS_TX "|"
D_SENSOR_DS18X20 "o|" D_SENSOR_DHT11 "o|"
D_SENSOR_HM10_RX "|" D_SENSOR_HM10_TX "|"
D_SENSOR_LE01MR_RX "|" D_SENSOR_LE01MR_TX
D_SENSOR_LE01MR_RX "|" D_SENSOR_LE01MR_TX "|"
D_SENSOR_CC1101_GDO0 "|" D_SENSOR_CC1101_GDO2
;
const char kSensorNamesFixed[] PROGMEM =
@ -790,7 +793,10 @@ const uint8_t kGpioNiceList[] PROGMEM = {
#ifdef USE_DEEPSLEEP
GPIO_DEEPSLEEP,
#endif
#ifdef USE_KEELOQ
GPIO_CC1101_GDO0, // CC1101 pin for RX
GPIO_CC1101_GDO2, // CC1101 pin for RX
#endif
};
const uint8_t kModuleNiceList[] PROGMEM = {

4
tasmota/xdrv_36_keeloq.ino
View File

@ -27,8 +27,8 @@
#define Lowpulse 400
#define Highpulse 800
#define TX_PORT 4 // Outputport for transmission
#define RX_PORT 5 // Inputport for reception
#define TX_PORT pin[GPIO_CC1101_GDO2] // Outputport for transmission
#define RX_PORT pin[GPIO_CC1101_GDO0] // Inputport for reception
const char kJaroliftCommands[] PROGMEM = "Keeloq|" // prefix
"SendRaw|SendButton|Set";