Merge pull request #8369 from Theosakamg/integration_core

APDS-9960 - Custom configuration tntegration on core

tasmota/language/bg_BG.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "Частици"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Жест"
+#define D_COLOR_RED "Red"
+#define D_COLOR_GREEN "Грийн"
+#define D_COLOR_BLUE "син"
+#define D_CCT "CCT"
+#define D_PROXIMITY "близост"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Ускорение - ос X"
 #define D_AY_AXIS "Ускорение - ос Y"

tasmota/language/cs_CZ.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "částic"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Gesto"
+#define D_COLOR_RED "Červená"
+#define D_COLOR_GREEN "Zelená"
+#define D_COLOR_BLUE "Modrá"
+#define D_CCT "CCT"
+#define D_PROXIMITY "Blízkost"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Accel. osa-X"
 #define D_AY_AXIS "Accel. osa-Y"

tasmota/language/de_DE.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "Partikel"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Geste"
+#define D_COLOR_RED "Rot"
+#define D_COLOR_GREEN "Grün"
+#define D_COLOR_BLUE "Blau"
+#define D_CCT "CCT"
+#define D_PROXIMITY "Nähe"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Beschl. X-Achse"
 #define D_AY_AXIS "Beschl. Y-Achse"

tasmota/language/el_GR.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "Particals"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Χειρονομία"
+#define D_COLOR_RED "Κόκκινο"
+#define D_COLOR_GREEN "Πράσινο"
+#define D_COLOR_BLUE "Μπλε"
+#define D_CCT "CCT"
+#define D_PROXIMITY "Εγγύτητα"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Accel. X-Axis"
 #define D_AY_AXIS "Accel. Y-Axis"

tasmota/language/en_GB.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "Particles"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Gesture"
+#define D_COLOR_RED "Red"
+#define D_COLOR_GREEN "Green"
+#define D_COLOR_BLUE "Blue"
+#define D_CCT "CCT"
+#define D_PROXIMITY "Proximity"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Accel. X-Axis"
 #define D_AY_AXIS "Accel. Y-Axis"
@@ -687,6 +695,7 @@
 #define D_UNIT_GALLONS "gal"
 #define D_UNIT_GALLONS_PER_MIN "g/m"
 #define D_UNIT_INCREMENTS "inc"
+#define D_UNIT_KELVIN "°K"
 #define D_UNIT_KILOMETER "km"
 #define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"

tasmota/language/es_ES.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "Partículas"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Gesto"
+#define D_COLOR_RED "Rojo"
+#define D_COLOR_GREEN "Verde"
+#define D_COLOR_BLUE "Azul"
+#define D_CCT "CCT"
+#define D_PROXIMITY "Proximidad"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Accel. X-Axis"
 #define D_AY_AXIS "Accel. Y-Axis"

tasmota/language/fr_FR.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "Particules"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Geste"
+#define D_COLOR_RED "Rouge"
+#define D_COLOR_GREEN "Vert"
+#define D_COLOR_BLUE "Bleu"
+#define D_CCT "CCT"
+#define D_PROXIMITY "Proximité"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Accél. Axe-X"
 #define D_AY_AXIS "Accél. Axe-Y"
@@ -503,7 +511,7 @@
 #define D_CALIBRATE "Étalonner"
 #define D_CALIBRATION "Étalonnage"
 
-//xsns_35_TX20.ino
+// xsns_35_TX20.ino
 #define D_TX20_WIND_DIRECTION "Direction du vent"
 #define D_TX20_WIND_SPEED "Vitesse du vent"
 #define D_TX20_WIND_SPEED_MIN "Vitesse Min"

tasmota/language/he_HE.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "חלקיקים"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Gesture"
+#define D_COLOR_RED "Red"
+#define D_COLOR_GREEN "Green"
+#define D_COLOR_BLUE "Blue"
+#define D_CCT "CCT"
+#define D_PROXIMITY "Proximity"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Accel. X-Axis"
 #define D_AY_AXIS "Accel. Y-Axis"

tasmota/language/hu_HU.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "Részecskék"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Gesztus"
+#define D_COLOR_RED "Red"
+#define D_COLOR_GREEN "Green"
+#define D_COLOR_BLUE "Blue"
+#define D_CCT "CCT"
+#define D_PROXIMITY "közelség"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Gyorsulásm. X-tengely"
 #define D_AY_AXIS "Gyorsulásm. Y-tengely"

tasmota/language/it_IT.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "Particelle"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Gesto"
+#define D_COLOR_RED "Rosso"
+#define D_COLOR_GREEN "Verde"
+#define D_COLOR_BLUE "Blu"
+#define D_CCT "CCT"
+#define D_PROXIMITY "Vicinanza"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Accelerazione asse X"
 #define D_AY_AXIS "Accelerazione asse Y"

tasmota/language/ko_KO.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "입자"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Gesture"
+#define D_COLOR_RED "Red"
+#define D_COLOR_GREEN "Green"
+#define D_COLOR_BLUE "Blue"
+#define D_CCT "CCT"
+#define D_PROXIMITY "Proximity"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Accel. X-Axis"
 #define D_AY_AXIS "Accel. Y-Axis"

tasmota/language/nl_NL.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "Stofdeeltjes"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Gesture"
+#define D_COLOR_RED "Red"
+#define D_COLOR_GREEN "Green"
+#define D_COLOR_BLUE "Blue"
+#define D_CCT "CCT"
+#define D_PROXIMITY "Proximity"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Versn. X-as"
 #define D_AY_AXIS "Versn. Y-as"

tasmota/language/pl_PL.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "Cząstki"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Gesture"
+#define D_COLOR_RED "Red"
+#define D_COLOR_GREEN "Green"
+#define D_COLOR_BLUE "Blue"
+#define D_CCT "CCT"
+#define D_PROXIMITY "Proximity"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Accel. X-Axis"
 #define D_AY_AXIS "Accel. Y-Axis"

tasmota/language/pt_BR.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "Partículas"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Gesture"
+#define D_COLOR_RED "Red"
+#define D_COLOR_GREEN "Green"
+#define D_COLOR_BLUE "Blue"
+#define D_CCT "CCT"
+#define D_PROXIMITY "Proximity"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Accel. X-Axis"
 #define D_AY_AXIS "Accel. Y-Axis"

tasmota/language/pt_PT.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "Partículas"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Gesture"
+#define D_COLOR_RED "Red"
+#define D_COLOR_GREEN "Green"
+#define D_COLOR_BLUE "Blue"
+#define D_CCT "CCT"
+#define D_PROXIMITY "Proximity"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Accel. X-Axis"
 #define D_AY_AXIS "Accel. Y-Axis"

tasmota/language/ro_RO.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "Particule"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Gesture"
+#define D_COLOR_RED "Red"
+#define D_COLOR_GREEN "Green"
+#define D_COLOR_BLUE "Blue"
+#define D_CCT "CCT"
+#define D_PROXIMITY "Proximity"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Accel.Axa-X"
 #define D_AY_AXIS "Accel.Axa-Y"

tasmota/language/ru_RU.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "Particals"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Gesture"
+#define D_COLOR_RED "Red"
+#define D_COLOR_GREEN "Green"
+#define D_COLOR_BLUE "Blue"
+#define D_CCT "CCT"
+#define D_PROXIMITY "Proximity"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Accel. X-Axis"
 #define D_AY_AXIS "Accel. Y-Axis"

tasmota/language/sk_SK.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "častíc"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Gesture"
+#define D_COLOR_RED "Red"
+#define D_COLOR_GREEN "Green"
+#define D_COLOR_BLUE "Blue"
+#define D_CCT "CCT"
+#define D_PROXIMITY "Proximity"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Accel. os-X"
 #define D_AY_AXIS "Accel. os-Y"

tasmota/language/sv_SE.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "Partiklar"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Gesture"
+#define D_COLOR_RED "Red"
+#define D_COLOR_GREEN "Green"
+#define D_COLOR_BLUE "Blue"
+#define D_CCT "CCT"
+#define D_PROXIMITY "Proximity"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Accel. X-Axel"
 #define D_AY_AXIS "Accel. Y-Axel"

tasmota/language/tr_TR.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "Particals"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Gesture"
+#define D_COLOR_RED "Red"
+#define D_COLOR_GREEN "Green"
+#define D_COLOR_BLUE "Blue"
+#define D_CCT "CCT"
+#define D_PROXIMITY "Proximity"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Accel. X-Axis"
 #define D_AY_AXIS "Accel. Y-Axis"

tasmota/language/uk_UA.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "Частинки понад"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Gesture"
+#define D_COLOR_RED "Red"
+#define D_COLOR_GREEN "Green"
+#define D_COLOR_BLUE "Blue"
+#define D_CCT "CCT"
+#define D_PROXIMITY "Proximity"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Приск. Вісь-X"
 #define D_AY_AXIS "Приск. Вісь-Y"

tasmota/language/zh_CN.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "颗粒物直径大于"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Gesture"
+#define D_COLOR_RED "Red"
+#define D_COLOR_GREEN "Green"
+#define D_COLOR_BLUE "Blue"
+#define D_CCT "CCT"
+#define D_PROXIMITY "Proximity"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "加速度计X轴分量"
 #define D_AY_AXIS "加速度计Y轴分量"

tasmota/language/zh_TW.h

@@ -482,6 +482,14 @@
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
 #define D_PARTICALS_BEYOND "顆粒物直徑大於"
 
+// xsns_27_apds9960.ino
+#define D_GESTURE "Gesture"
+#define D_COLOR_RED "Red"
+#define D_COLOR_GREEN "Green"
+#define D_COLOR_BLUE "Blue"
+#define D_CCT "CCT"
+#define D_PROXIMITY "Proximity"
+
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Accel. X-Axis"
 #define D_AY_AXIS "Accel. Y-Axis"

tasmota/my_user_config.h

@@ -478,6 +478,10 @@
 //  #define USE_SI1145                             // [I2cDriver19] Enable SI1145/46/47 sensor (I2C address 0x60) (+1k code)
 //  #define USE_LM75AD                             // [I2cDriver20] Enable LM75AD sensor (I2C addresses 0x48 - 0x4F) (+0k5 code)
 //  #define USE_APDS9960                           // [I2cDriver21] Enable APDS9960 Proximity Sensor (I2C address 0x39). Disables SHT and VEML6070 (+4k7 code)
+    #define USE_APDS9960_GESTURE                   // Enable APDS9960 Gesture feature (+2k code)
+    #define USE_APDS9960_PROXIMITY                 // Enable APDS9960 Proximity feature (>50 code)
+    #define USE_APDS9960_COLOR                     // Enable APDS9960 Color feature (+0.8k code)
+    #define USE_APDS9960_STARTMODE  0              // Default to enable Gesture mode
 //  #define USE_MCP230xx                           // [I2cDriver22] Enable MCP23008/MCP23017 - Must define I2C Address in #define USE_MCP230xx_ADDR below - range 0x20 - 0x27 (+4k7 code)
 //    #define USE_MCP230xx_ADDR 0x20               // Enable MCP23008/MCP23017 I2C Address to use (Must be within range 0x20 through 0x26 - set according to your wired setup)
 //    #define USE_MCP230xx_OUTPUT                  // Enable MCP23008/MCP23017 OUTPUT support through sensor29 commands (+1k5 code)

tasmota/xsns_27_apds9960.ino

@@ -48,6 +48,7 @@
 //   #undef USE_TSL2561     // possible address conflict on the I2C-bus
 //   #endif
 // #endif
+
 #define XSNS_27                   27
 #define XI2C_21                   21              // See I2CDEVICES.md
 
@@ -61,17 +62,9 @@
 #define APDS9930_CHIPID_1         0x12  // we will check, if someone got an incorrect sensor
 #define APDS9930_CHIPID_2         0x39  // there are case reports about "accidentially bought" 9930's
 
-
-// TODO() : Move to my_user_config.h file
-#define USE_APDS9960_GESTURE                // Enable Gesture feature (+2k code)
-#define USE_APDS9960_PROXIMITY              // Enable Proximity feature (>50 code)
-#define USE_APDS9960_COLOR                  // Enable Color feature (+0.8k code)
-
 #define APDS9960_MODE_GESTURE     0
 #define APDS9960_MODE_COLOR       1
 
-#define USE_APDS9960_STARTMODE    APDS9960_MODE_GESTURE
-
 /* Gesture parameters */
 #define GESTURE_THRESHOLD_OUT     10
 #define GESTURE_SENSITIVITY_1     50
@@ -80,19 +73,8 @@
 #define APDS9960_LONG_RECOVERY           50  // long pause after sensor overload in loops
 #define APDS9960_MAX_GESTURE_CYCLES      50  // how many FIFO-reads are allowed to prevent crash
 
-
-// TODO() : Move to Translate file
-#define D_GESTURE     "Gesture"
-#define D_COLOR_RED   "Red"
-#define D_COLOR_GREEN "Green"
-#define D_COLOR_BLUE  "Blue"
-#define D_CCT         "CCT"
-#define D_PROXIMITY   "Proximity"
-
-#define D_UNIT_KELVIN "°K"
-
 /******************************************************************************\
- * constants
+ * Constants
 \******************************************************************************/
 
 const char APDS9960_TAG[]         PROGMEM = "APDS9960";  // Only one actualy