Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for pipsolar inverter #20408

Merged
merged 5 commits into from
Jan 10, 2024
Merged

Add support for pipsolar inverter #20408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3125181
Add support for pipsolar inverter
Jan 6, 2024
17eeaf1
Fix CI-Warnings
Jan 6, 2024
9bee004
Remove unneeded define
Jan 6, 2024
ae71c12
Pipsolar: Fix dat result
Jan 7, 2024
f62ccfe
Add support for the rules engine
Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CODE_OWNERS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ In addition to @arendst the following code is mainly owned by:
| xdrv_88_esp32_shelly_pro | @arendst
| xdrv_89_esp32_dali | @eeak
| xdrv_90_esp32_dingtian_relay | @barbudor
| xdrv_92_pipsolar | @chefpro
| |
| xdrv_122_file_settings_demo | @arendst
| xdrv_127_debug | @arendst
Expand Down
2 changes: 2 additions & 0 deletions tasmota/berry/include/be_gpio_defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,8 @@ const be_const_member_t lv_gpio_constants[] = {
{ "ZIGBEE_RST", (int32_t) GPIO_ZIGBEE_RST },
{ "ZIGBEE_RX", (int32_t) GPIO_ZIGBEE_RX },
{ "ZIGBEE_TX", (int32_t) GPIO_ZIGBEE_TX },
{ "PIPSOLAR_RX", (int32_t) GPIO_PIPSOLAR_RX },
{ "PIPSOLAR_TX", (int32_t) GPIO_PIPSOLAR_TX },

};

Expand Down
13 changes: 13 additions & 0 deletions tasmota/include/i18n.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,6 +809,19 @@
// xsns_71_veml7700.ino
#define D_JSON_WHITE_CONTENT "WhiteContent"

// xdrv_92_pipsolar.ino
#define D_CMND_PIP_PREFIX "PipSolar"
#define D_CMND_PIP_QT "QT"
#define D_CMND_PIP_QET "QET"
#define D_CMND_PIP_QEY "QEY"
#define D_CMND_PIP_QEM "QEM"
#define D_CMND_PIP_QED "QED"
#define D_CMND_PIP_QEH "QEH"
#define D_CMND_PIP_DAT "DAT"
#define D_CMND_PIP_POLLVALUES "PollValues"
#define D_CMND_PIP_BAUDRATE "BaudRate"
#define D_CMND_PIP_SERIALCONFIG "SerialConfig"

/********************************************************************************************/

// Log message prefix
Expand Down
7 changes: 7 additions & 0 deletions tasmota/include/tasmota_template.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ enum UserSelectablePins {
GPIO_HC8_RXD, // HC8 Serial interface
GPIO_I2S_DAC, // Audio DAC support for ESP32 and ESP32S2
GPIO_MAGIC_SWITCH, // MagicSwitch as in Sonoff BasicR4
GPIO_PIPSOLAR_TX, GPIO_PIPSOLAR_RX, // pipsolar inverter
GPIO_SENSOR_END };

// Error as warning to rethink GPIO usage with max 2045
Expand Down Expand Up @@ -477,6 +478,7 @@ const char kSensorNames[] PROGMEM =
D_SENSOR_HC8_RX "|"
D_SENSOR_I2S_DAC "|"
D_GPIO_MAGIC_SWITCH "|"
D_SENSOR_PIPSOLAR_TX "|" D_SENSOR_PIPSOLAR_RX "|"
;

const char kSensorNamesFixed[] PROGMEM =
Expand Down Expand Up @@ -1150,6 +1152,11 @@ const uint16_t kGpioNiceList[] PROGMEM = {
AGPIO(GPIO_MAGIC_SWITCH) + MAX_MAGIC_SWITCH_MODES,
#endif

#ifdef USE_PIPSOLAR // xdrv_92_pipsolar.ino
AGPIO(GPIO_PIPSOLAR_TX), // pipsolar inverter Serial interface
AGPIO(GPIO_PIPSOLAR_RX), // pipsolar inverter Serial interface
#endif

/*-------------------------------------------------------------------------------------------*\
* ESP32 specifics
\*-------------------------------------------------------------------------------------------*/
Expand Down
4 changes: 4 additions & 0 deletions tasmota/language/af_AF.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "Gemiddelde Stralingsdosis"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_AF_AF_H_
4 changes: 4 additions & 0 deletions tasmota/language/bg_BG.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "средна доза радиация"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_BG_BG_H_
4 changes: 4 additions & 0 deletions tasmota/language/ca_AD.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "dosi mitjana de radiació"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_CA_AD_H_
4 changes: 4 additions & 0 deletions tasmota/language/cs_CZ.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "průměrná dávka záření"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_CS_CZ_H_
4 changes: 4 additions & 0 deletions tasmota/language/de_DE.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "durchschnittliche Strahlendosis"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_DE_DE_H_
4 changes: 4 additions & 0 deletions tasmota/language/el_GR.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "μέση δόση ακτινοβολίας"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_EL_GR_H_
4 changes: 4 additions & 0 deletions tasmota/language/en_GB.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1223,4 +1223,8 @@
#define D_AVG_RAD_DOSE "Radiation"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_EN_GB_H_
4 changes: 4 additions & 0 deletions tasmota/language/es_ES.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "dosis media de radiación"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_ES_ES_H_
4 changes: 4 additions & 0 deletions tasmota/language/fr_FR.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1223,4 +1223,8 @@
#define D_AVG_RAD_DOSE "dose moyenne de rayonnement"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_FR_FR_H_
4 changes: 4 additions & 0 deletions tasmota/language/fy_NL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "gemiddelde stralingsdosis"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_FY_NL_H_
4 changes: 4 additions & 0 deletions tasmota/language/he_HE.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "מינון קרינה ממוצע"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_HE_HE_H_
4 changes: 4 additions & 0 deletions tasmota/language/hu_HU.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,4 +1225,8 @@
#define D_AVG_RAD_DOSE "átlagos sugárdózis"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_HU_HU_H_
4 changes: 4 additions & 0 deletions tasmota/language/it_IT.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1223,4 +1223,8 @@
#define D_AVG_RAD_DOSE "Radiazioni"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_IT_IT_H_
4 changes: 4 additions & 0 deletions tasmota/language/ko_KO.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "average radiation dose"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_KO_KO_H_
4 changes: 4 additions & 0 deletions tasmota/language/nl_NL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "gemiddelde stralingsdosis"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_NL_NL_H_
4 changes: 4 additions & 0 deletions tasmota/language/pl_PL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "Średnia Dawka Promieniowania"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_PL_PL_D_H_
4 changes: 4 additions & 0 deletions tasmota/language/pt_BR.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "dose média de radiação"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_PT_BR_H_
4 changes: 4 additions & 0 deletions tasmota/language/pt_PT.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "dose média de radiação"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_PT_PT_H_
4 changes: 4 additions & 0 deletions tasmota/language/ro_RO.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "doza medie de radiație"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_RO_RO_H_
4 changes: 4 additions & 0 deletions tasmota/language/ru_RU.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1223,4 +1223,8 @@
#define D_AVG_RAD_DOSE "средняя доза облучения"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_RU_RU_H_
4 changes: 4 additions & 0 deletions tasmota/language/sk_SK.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "priemerná dávka žiarenia"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_SK_SK_H_
4 changes: 4 additions & 0 deletions tasmota/language/sv_SE.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "genomsnittlig stråldos"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_SV_SE_H_
4 changes: 4 additions & 0 deletions tasmota/language/tr_TR.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "ortalama radyasyon dozu"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_TR_TR_H_
4 changes: 4 additions & 0 deletions tasmota/language/uk_UA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "середня доза радіації"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_UK_UA_H_
4 changes: 4 additions & 0 deletions tasmota/language/vi_VN.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "liều bức xạ trung bình"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_VI_VN_H_
4 changes: 4 additions & 0 deletions tasmota/language/zh_CN.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "平均辐射剂量"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_ZH_CN_H_
4 changes: 4 additions & 0 deletions tasmota/language/zh_TW.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,4 +1222,8 @@
#define D_AVG_RAD_DOSE "平均輻射劑量"
#define D_UNIT_US_H "µSv/h"

// ixrv92_pipsolar.ino
#define D_SENSOR_PIPSOLAR_TX "Pipsolar TX"
#define D_SENSOR_PIPSOLAR_RX "Pipsolar RX"

#endif // _LANGUAGE_ZH_TW_H_
Loading