From c76b8dc289ff9029828be00d19d4e6a717bdea80 Mon Sep 17 00:00:00 2001 From: rbaron Date: Wed, 21 Dec 2022 18:40:48 +0100 Subject: [PATCH] Fix ADC config for nRF52833 --- .../arm/bparasite_nrf52833/bparasite_nrf52833.dts | 15 ++------------- .../bparasite_nrf52833_1_1_0.overlay | 2 +- .../bparasite_nrf52833_1_2_0.overlay | 2 +- .../arm/bparasite_nrf52840/bparasite_nrf52840.dts | 2 +- .../bparasite_nrf52840_1_1_0.overlay | 2 +- .../bparasite_nrf52840_1_2_0.overlay | 2 +- 6 files changed, 7 insertions(+), 18 deletions(-) diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833.dts b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833.dts index 3c40bc1..b1b2313 100644 --- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833.dts +++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833.dts @@ -13,7 +13,7 @@ }; zephyr,user { - io-channels = <&adc 0>, <&adc 1>, <&adc 2>; + io-channels = <&adc 0>, <&adc 2>; }; leds { @@ -43,7 +43,7 @@ compatible = "gpio-keys"; fast_disch: fast_disch { // P0.25. - gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; + gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>; label = "Fast discharge circuitry"; }; }; @@ -108,17 +108,6 @@ }; - // Photo. - channel@1 { - reg = <1>; - zephyr,gain = "ADC_GAIN_1_6"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - // P0.02. - zephyr,input-positive = ; - zephyr,resolution = <10>; - }; - // Battery. channel@2 { reg = <2>; diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_1_0.overlay b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_1_0.overlay index 7c338af..dc1a9da 100644 --- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_1_0.overlay +++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_1_0.overlay @@ -12,7 +12,7 @@ ldr_enable: ldr_enable { // P0.29. gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; - label = "Fast discharge circuitry"; + label = "LDR supply"; }; }; }; diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_2_0.overlay b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_2_0.overlay index 5c6191b..cebbe1d 100644 --- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_2_0.overlay +++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_1_2_0.overlay @@ -11,7 +11,7 @@ photo_transistor_enable: photo_transistor_enable { // P0.29. gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; - label = "Fast discharge circuitry"; + label = "Phototransistor supply"; }; }; }; diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts index f6c77f8..9a6ac04 100644 --- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts +++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts @@ -13,7 +13,7 @@ }; zephyr,user { - io-channels = <&adc 0>, <&adc 2>; + io-channels = <&adc 0>, <&adc 2>; }; leds { diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_1_1_0.overlay b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_1_1_0.overlay index 7c338af..dc1a9da 100644 --- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_1_1_0.overlay +++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_1_1_0.overlay @@ -12,7 +12,7 @@ ldr_enable: ldr_enable { // P0.29. gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; - label = "Fast discharge circuitry"; + label = "LDR supply"; }; }; }; diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_1_2_0.overlay b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_1_2_0.overlay index 5c6191b..cebbe1d 100644 --- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_1_2_0.overlay +++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_1_2_0.overlay @@ -11,7 +11,7 @@ photo_transistor_enable: photo_transistor_enable { // P0.29. gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; - label = "Fast discharge circuitry"; + label = "Phototransistor supply"; }; }; };