diff --git a/lib/spitask/GWDMS22B.cpp b/lib/spitask/GWDMS22B.cpp index 7c3942f..0cf2218 100644 --- a/lib/spitask/GWDMS22B.cpp +++ b/lib/spitask/GWDMS22B.cpp @@ -51,18 +51,6 @@ #define ADD22B12 #endif -#ifdef GWDMS22B13 - #define ADD22B13 ADD22B(DMS22B13,SPI1) - #ifndef GWDMS22B13_CS - #error "you need to define GWDMS22B13_CS" - #endif - #if GWDMS22B11_CS == -1 - #error "multiple devices on one SPI bus need chip select defines - GWDMS22B11_CS is unset" - #endif -#else - #define GWDMS22B13_CS -1 - #define ADD22B13 -#endif #ifdef GWDMS22B21 #define ADD22B21 ADD22B(DMS22B21,SPI2) @@ -87,18 +75,6 @@ #define ADD22B22 #endif -#ifdef GWDMS22B23 - #define ADD22B23 ADD22B(DMS22B23,SPI2) - #ifndef GWDMS22B23_CS - #error "you need to define GWDMS22B23_CS" - #endif - #if GWDMS22B21_CS == -1 - #error "multiple devices on one SPI bus need chip select defines - GWDMS22B11_CS is unset" - #endif -#else - #define GWDMS22B23_CS -1 - #define ADD22B23 -#endif @@ -144,10 +120,8 @@ class GWDMS22B : public SSISensor{ virtual void readConfig(GwConfigHandler *cfg){ DMS22B(DMS22B11); DMS22B(DMS22B12); - DMS22B(DMS22B13); DMS22B(DMS22B21); DMS22B(DMS22B22); - DMS22B(DMS22B23); intv=1000*fintv; } }; @@ -155,9 +129,7 @@ class GWDMS22B : public SSISensor{ void registerDMS22B(GwApi *api,SpiSensorList &sensors){ ADD22B11 ADD22B12 - ADD22B13 ADD22B21 ADD22B22 - ADD22B23 } diff --git a/lib/spitask/config.json b/lib/spitask/config.json index 8b1ece2..cb96db6 100644 --- a/lib/spitask/config.json +++ b/lib/spitask/config.json @@ -13,11 +13,6 @@ "i": "12", "n": "1" }, - { - "b": "1", - "i": "13", - "n": "13" - }, { "b": "2", "i": "21", @@ -27,14 +22,7 @@ "b": "2", "i": "22", "n": "22" - }, - { - "b": "2", - "i": "23", - "n": "23" } - - ], "children": [ { diff --git a/lib/spitask/platformio.ini b/lib/spitask/platformio.ini index a6d5737..d0c8f21 100644 --- a/lib/spitask/platformio.ini +++ b/lib/spitask/platformio.ini @@ -7,8 +7,8 @@ lib_deps = ${env.lib_deps} ${sensors.lib_deps} build_flags= - -D GWSPI0_CLK=21 - -D GWSPI0_MISO=25 + -D GWSPI1_CLK=21 + -D GWSPI1_MISO=25 -D GWDMS22B11 -D GWDMS22B11_CS=22 ${env.build_flags} diff --git a/webinstall/build.yaml b/webinstall/build.yaml index efd05f0..e750233 100644 --- a/webinstall/build.yaml +++ b/webinstall/build.yaml @@ -483,22 +483,6 @@ types: key: dms22b#busname#2cs description: "chip select pin, only necessary for multiple devices on this bus" target: "define:GWDMS22B#busname#2_CS" - - type: checkbox - label: GWDMS22B-#busname#-3 - description: "DMS22B rotatory encoder (SSI)" - key: dms22b#busname#3 - target: define - url: "https://www.mouser.de/datasheet/2/54/bour_s_a0011704065_1-2262614.pdf" - values: - - key: true - value: GWDMS22B#busname#3 - children: - - <<: *gpiopin - label: CS - key: dms22b#busname#3cs - description: "chip select pin, only necessary for multiple devices on this bus" - target: "define:GWDMS22B#busname#3_CS" - - &m5protochildren - *serial1