thooge
/
esp32-nmea2000-obp60
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git
1
0
Fork 0
Code Releases Activity

allow more I2C devices at grove ports

This commit is contained in:
andreas 2024-03-21 18:13:37 +01:00
parent 4a62e65a29
commit 8bbe1fd192
3 changed files with 83 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/hardware/GwM5Grove.in
View File

@ -65,7 +65,7 @@
#GROVE
//example: -DSHT3XG1_A : defines STH3Xn1 on grove A - x depends on the other devices
#ifdef SHT3XG1$GS$
#ifdef GWSHT3XG1$GS$
#ifndef M5_GROOVEIIC$GS$
#define M5_GROOVEIIC$GS$
#endif
@ -74,7 +74,7 @@
#endif
#GROVE
#ifdef SHT3XG2$GS$
#ifdef GWSHT3XG2$GS$
#ifndef M5_GROOVEIIC$GS$
#define M5_GROOVEIIC$GS$
#endif
@ -83,7 +83,7 @@
#endif
#GROVE
#ifdef QMP6988G1$GS$
#ifdef GWQMP6988G1$GS$
#ifndef M5_GROOVEIIC$GS$
#define M5_GROOVEIIC$GS$
#endif
@ -92,7 +92,7 @@
#endif
#GROVE
#ifdef QMP6988G2$GS$
#ifdef GWQMP6988G2$GS$
#ifndef M5_GROOVEIIC$GS$
#define M5_GROOVEIIC$GS$
#endif
@ -101,7 +101,7 @@
#endif
#GROVE
#ifdef BME280G1$GS$
#ifdef GWBME280G1$GS$
#ifndef M5_GROOVEIIC$GS$
#define M5_GROOVEIIC$GS$
#endif
@ -110,7 +110,7 @@
#endif
#GROVE
#ifdef BME280G2$GS$
#ifdef GWBME280G2$GS$
#ifndef M5_GROOVEIIC$GS$
#define M5_GROOVEIIC$GS$
#endif

63
webinstall/build.yaml
View File

@ -50,6 +50,69 @@ types:
values:
- value: M5_ENV3#grv#
key: true
resource: qmp69881#grv#1,sht3x#grv#1
- type: checkbox
label: SHT3X-1
description: "SHT30 temperature and humidity sensor 0x44"
key: sht3xg1
target: define
url: "https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/unit/SHT3x_Datasheet_digital.pdf"
values:
- key: true
value: GWSHT3XG1#grv#
resource: sht3x#grv#1
- type: checkbox
label: SHT3X-2
description: "SHT30 temperature and humidity sensor 0x45"
key: sht3xg2
target: define
url: "https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/unit/SHT3x_Datasheet_digital.pdf"
values:
- key: true
value: GWSHT3XG2#grv#
resource: sht3x#grv#2
- type: checkbox
label: QMP6988-1
description: "QMP6988 pressure sensor addr 86"
key: qmp69881g1
target: define
url: "https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/unit/enviii/QMP6988%20Datasheet.pdf"
values:
- key: true
value: GWQMP6988G1#grv#
resource: qmp69881#grv#1
- type: checkbox
label: QMP6988-2
description: "QMP6988 pressure sensor addr 112"
key: qmp69882g2
target: define
url: "https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/unit/enviii/QMP6988%20Datasheet.pdf"
values:
- key: true
value: GWQMP6988G2#grv#
resource: qmp69881#grv#2
- type: checkbox
label: BME280-1
description: "BME280 temperature/humidity/pressure sensor 0x76"
key: bme2801g1
target: define
url: "https://www.bosch-sensortec.com/media/boschsensortec/downloads/datasheets/bst-bme280-ds002.pdf"
values:
- key: true
value: GWBME280G1#grv#
resource: bme280#grv#1
- type: checkbox
label: BME280-2
description: "BME280 temperature/humidity/pressure sensor 0x77"
key: bme2802
target: define
url: "https://www.bosch-sensortec.com/media/boschsensortec/downloads/datasheets/bst-bme280-ds002.pdf"
values:
- key: true
value: GWBME280G2#grv#
resource: bme280#grv#2
- &m5groovecan
type: select
key: m5groovecan#grv#

24
webinstall/cibuild.js
View File

@ -652,12 +652,15 @@ class PipelineInfo{
}
if (round < 1) continue;
if (struct.resource){
let resList=currentResources[struct.resource];
if (! resList){
resList=[];
currentResources[struct.resource]=resList;
}
resList.push(struct);
let splitted=struct.resource.split(",");
splitted.forEach((resource) => {
let resList = currentResources[resource];
if (!resList) {
resList = [];
currentResources[resource] = resList;
}
resList.push(struct);
});
}
if (target === 'define') {
flags += " -D" + struct.value;
@ -680,11 +683,12 @@ class PipelineInfo{
for (let k in currentResources){
let ak=k.replace(/:.*/,'');
let resList=currentResources[k];
if (allowedResources[ak] !== undefined){
if (resList.length > allowedResources[ak]){
errors+=" more than "+allowedResources[ak]+" "+k+" device(s) used";
}
let allowed=allowedResources[ak];
if (allowed === undefined) allowed=1;
if (resList.length > allowed){
errors+=" more than "+allowed+" "+k+" device(s) used";
}
}
if (errors){
setValue('configError',errors);