From 934307c321cfeac33aa96ee4caa427a1f2699e84 Mon Sep 17 00:00:00 2001 From: danmeam Date: Wed, 25 May 2022 00:11:05 +0200 Subject: [PATCH] fix --- src/include/target/DIY_900_RX_PWMP_AD.h | 29 ------------------------- src/targets/diy_900.ini | 10 +++------ 2 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 src/include/target/DIY_900_RX_PWMP_AD.h diff --git a/src/include/target/DIY_900_RX_PWMP_AD.h b/src/include/target/DIY_900_RX_PWMP_AD.h deleted file mode 100644 index 38030af33d..0000000000 --- a/src/include/target/DIY_900_RX_PWMP_AD.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef DEVICE_NAME -#define DEVICE_NAME "DIY900 PWMP_AD" -#endif - -#define CRSF_RCVR_NO_SERIAL - -// GPIO pin definitions -// same as DIY_900_RX_ESP8285_SX127x except with no serial/button and PWM outputs -// -// Add: -// analogWrite -> 0-255 -// digitalWrite -> 0-1 -// to rx_main -#define GPIO_PIN_NSS 15 -#define GPIO_PIN_DIO0 4 -#define GPIO_PIN_MOSI 13 -#define GPIO_PIN_MISO 12 -#define GPIO_PIN_SCK 14 -//#define GPIO_PIN_RST 2 -//#define GPIO_PIN_RCSIGNAL_RX -1 // does not use UART -//#define GPIO_PIN_RCSIGNAL_TX -1 -#define GPIO_PIN_LED_RED 16 -#if defined(DEBUG_LOG) -#define GPIO_PIN_PWM_OUTPUTS {0,2,5,9,10} -#else -#define GPIO_PIN_PWM_OUTPUTS {0,1,2,3,5,9,10} -#endif - -#define POWER_OUTPUT_FIXED 15 //MAX power for 900 RXes \ No newline at end of file diff --git a/src/targets/diy_900.ini b/src/targets/diy_900.ini index fd2c2d2f45..966ba91fd3 100644 --- a/src/targets/diy_900.ini +++ b/src/targets/diy_900.ini @@ -70,13 +70,9 @@ board_config = generic.rx_900.pwmp extends = env:DIY_900_RX_PWMP_via_UART [env:DIY_900_RX_PWMP_AD_via_UART] -extends = env_common_esp82xx -build_flags = - ${env_common_esp82xx.build_flags} - ${radio_900.build_flags} - ${common_env_data.build_flags_rx} - -include target/DIY_900_RX_PWMP_AD.h -src_filter = ${env_common_esp82xx.src_filter} - +extends = env:Unified_ESP8285_900_RX_via_UART +board_config = generic.rx_900.pwmp + [env:DIY_900_RX_PWMP_AD_via_WIFI] extends = env:DIY_900_RX_PWMP_AD_via_UART