Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
zephyr,gain = "ADC_GAIN_1";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
zephyr,input-positive = <NRF_SAADC_AIN4>; /* P1.11 */
zephyr,input-positive = <NRF_SAADC_AIN0>; /* P1.00 */
zephyr,resolution = <10>;
};

Expand All @@ -29,7 +29,7 @@
zephyr,gain = "ADC_GAIN_1";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
zephyr,input-positive = <NRF_SAADC_AIN2>; /* P1.06 */
zephyr,input-positive = <NRF_SAADC_AIN1>; /* P1.01 */
zephyr,resolution = <12>;
zephyr,oversampling = <8>;
};
Expand All @@ -49,8 +49,8 @@
zephyr,gain = "ADC_GAIN_1";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
zephyr,input-positive = <NRF_SAADC_AIN6>; /* P1.13 */
zephyr,input-negative = <NRF_SAADC_AIN7>; /* P1.14 */
zephyr,input-positive = <NRF_SAADC_AIN5>; /* P1.10 */
zephyr,input-negative = <NRF_SAADC_AIN6>; /* P1.11 */
zephyr,resolution = <12>;
};
};
1 change: 1 addition & 0 deletions samples/zephyr/drivers/adc/adc_dt/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ tests:
- [email protected]/nrf54lm20a/cpuapp
- nrf54lv10dk/nrf54lv10a/cpuapp
- [email protected]/nrf54lv10a/cpuapp
- [email protected]/nrf54lv10a/cpuapp
harness: console
timeout: 10
harness_config:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
zephyr,gain = "ADC_GAIN_1";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
zephyr,input-positive = <NRF_SAADC_AIN4>; /* P1.11 */
zephyr,input-positive = <NRF_SAADC_AIN0>; /* P1.00 */
zephyr,resolution = <10>;
};

Expand All @@ -35,7 +35,7 @@
zephyr,gain = "ADC_GAIN_1";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
zephyr,input-positive = <NRF_SAADC_AIN2>; /* P1.06 */
zephyr,input-positive = <NRF_SAADC_AIN1>; /* P1.01 */
zephyr,resolution = <12>;
zephyr,oversampling = <8>;
};
Expand All @@ -55,8 +55,8 @@
zephyr,gain = "ADC_GAIN_1";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
zephyr,input-positive = <NRF_SAADC_AIN6>; /* P1.13 */
zephyr,input-negative = <NRF_SAADC_AIN7>; /* P1.14 */
zephyr,input-positive = <NRF_SAADC_AIN5>; /* P1.10 */
zephyr,input-negative = <NRF_SAADC_AIN6>; /* P1.11 */
zephyr,resolution = <12>;
};
};
1 change: 1 addition & 0 deletions samples/zephyr/drivers/adc/adc_sequence/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ tests:
- [email protected]/nrf54lm20a/cpuapp
- nrf54lv10dk/nrf54lv10a/cpuapp
- [email protected]/nrf54lv10a/cpuapp
- [email protected]/nrf54lv10a/cpuapp
harness: console
timeout: 10
harness_config:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

/*
* Test requires loopback P1.12 to VDDIO
*/

/ {
zephyr,user {
io-channels = <&adc 0>;
reference-mv = <1800>;
reference-mv = <1300>;
expected-accuracy = <64>;
};
};
Expand All @@ -22,7 +26,7 @@
zephyr,gain = "ADC_GAIN_1";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
zephyr,input-positive = <NRF_SAADC_AIN2>;
zephyr,input-positive = <NRF_SAADC_AIN7>;
zephyr,resolution = <14>;
};
};
1 change: 1 addition & 0 deletions tests/zephyr/drivers/adc/adc_accuracy_test/testcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ tests:
- [email protected]/nrf54lm20a/cpuapp
- nrf54lv10dk/nrf54lv10a/cpuapp
- [email protected]/nrf54lv10a/cpuapp
- [email protected]/nrf54lv10a/cpuapp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
zephyr,gain = "ADC_GAIN_1";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
zephyr,input-positive = <NRF_SAADC_AIN1>;
zephyr,input-positive = <NRF_SAADC_AIN0>; /* P1.00 */
zephyr,resolution = <10>;
};

Expand All @@ -29,7 +29,7 @@
zephyr,gain = "ADC_GAIN_1";
zephyr,reference = "ADC_REF_EXTERNAL0";
zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
zephyr,input-positive = <NRF_SAADC_AIN4>;
zephyr,input-positive = <NRF_SAADC_AIN1>; /* P1.01 */
zephyr,resolution = <12>;
};

Expand All @@ -38,7 +38,7 @@
zephyr,gain = "ADC_GAIN_1";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
zephyr,input-positive = <NRF_SAADC_AIN2>;
zephyr,input-positive = <NRF_SAADC_AIN7>; /* P1.12 */
zephyr,resolution = <10>;
};
};
1 change: 1 addition & 0 deletions tests/zephyr/drivers/adc/adc_api/testcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ tests:
- [email protected]/nrf54lm20a/cpuapp
- nrf54lv10dk/nrf54lv10a/cpuapp
- [email protected]/nrf54lv10a/cpuapp
- [email protected]/nrf54lv10a/cpuapp
1 change: 1 addition & 0 deletions tests/zephyr/drivers/adc/adc_error_cases/testcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ tests:
- [email protected]/nrf54lm20a/cpuapp
- nrf54lv10dk/nrf54lv10a/cpuapp
- [email protected]/nrf54lv10a/cpuapp
- [email protected]/nrf54lv10a/cpuapp
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 095611fffb22b6a3c74303e85b810f5d51219489
revision: c75ff492b1189debd53940f77d6369d6a160735c
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading