From b50f869a004631ca673c12f23282bd1a51e24d73 Mon Sep 17 00:00:00 2001 From: Andrew Dona-Couch Date: Wed, 19 Aug 2020 18:21:45 -0400 Subject: [PATCH] Simplify ATtiny84 ADC patch --- patch/attiny84.yaml | 138 +++++++++++++++++++++----------------------- 1 file changed, 67 insertions(+), 71 deletions(-) diff --git a/patch/attiny84.yaml b/patch/attiny84.yaml index 59884ac..bdaa9c7 100644 --- a/patch/attiny84.yaml +++ b/patch/attiny84.yaml @@ -59,87 +59,83 @@ ADC: bitWidth: 2 access: read-write MUX: - _write_constraint: enum - _replace_enum: - ADC0: [0, "Single-ended Input ADC0"] - ADC1: [1, "Single-ended Input ADC1"] - ADC2: [2, "Single-ended Input ADC2"] - ADC3: [3, "Single-ended Input ADC3"] - ADC4: [4, "Single-ended Input ADC4"] - ADC5: [5, "Single-ended Input ADC5"] - ADC6: [6, "Single-ended Input ADC6"] - ADC7: [7, "Single-ended Input ADC7"] + ADC0: [0, "Single-ended Input ADC0"] + ADC1: [1, "Single-ended Input ADC1"] + ADC2: [2, "Single-ended Input ADC2"] + ADC3: [3, "Single-ended Input ADC3"] + ADC4: [4, "Single-ended Input ADC4"] + ADC5: [5, "Single-ended Input ADC5"] + ADC6: [6, "Single-ended Input ADC6"] + ADC7: [7, "Single-ended Input ADC7"] - ADC_GND: [32, "0V (GND)"] - ADC_VBG: [33, "Internal Reference (VBG)"] - TEMPSENS: [34, "Temperature sensor"] + ADC_GND: [32, "0V (GND)"] + ADC_VBG: [33, "Internal Reference (VBG)"] + TEMPSENS: [34, "Temperature sensor"] - ADC0_ADC0_20X: [35, "Differential Inputs Positive ADC0 Negative ADC0 20x Gain"] - ADC0_ADC1_1X: [8, "Differential Inputs Positive ADC0 Negative ADC1 1x Gain"] - ADC0_ADC1_20X: [9, "Differential Inputs Postive ADC0 Negative ADC1 20x Gain"] - ADC0_ADC3_1X: [10, "Differential Inputs Positive ADC0 Negative ADC3 1x Gain"] - ADC0_ADC3_20X: [11, "Differential Inputs Positive ADC0 Negative ADC3 20x Gain"] + ADC0_ADC0_20X: [35, "Differential Inputs Positive ADC0 Negative ADC0 20x Gain"] + ADC0_ADC1_1X: [8, "Differential Inputs Positive ADC0 Negative ADC1 1x Gain"] + ADC0_ADC1_20X: [9, "Differential Inputs Postive ADC0 Negative ADC1 20x Gain"] + ADC0_ADC3_1X: [10, "Differential Inputs Positive ADC0 Negative ADC3 1x Gain"] + ADC0_ADC3_20X: [11, "Differential Inputs Positive ADC0 Negative ADC3 20x Gain"] - ADC1_ADC0_1X: [40, "Differential Inputs Positive ADC1 Negative ADC0 1x Gain"] - ADC1_ADC0_20X: [41, "Differential Inputs Positive ADC1 Negative ADC0 20x Gain"] - ADC1_ADC2_1X: [12, "Differential Inputs Positive ADC1 Negative ADC2 1x Gain"] - ADC1_ADC2_20X: [13, "Differential Inputs Positive ADC1 Negative ADC2 20x Gain"] - ADC1_ADC3_1X: [14, "Differential Inputs Positive ADC1 Negative ADC3 1x Gain"] - ADC1_ADC3_20X: [15, "Differential Inputs Positive ADC1 Negative ADC3 20x Gain"] + ADC1_ADC0_1X: [40, "Differential Inputs Positive ADC1 Negative ADC0 1x Gain"] + ADC1_ADC0_20X: [41, "Differential Inputs Positive ADC1 Negative ADC0 20x Gain"] + ADC1_ADC2_1X: [12, "Differential Inputs Positive ADC1 Negative ADC2 1x Gain"] + ADC1_ADC2_20X: [13, "Differential Inputs Positive ADC1 Negative ADC2 20x Gain"] + ADC1_ADC3_1X: [14, "Differential Inputs Positive ADC1 Negative ADC3 1x Gain"] + ADC1_ADC3_20X: [15, "Differential Inputs Positive ADC1 Negative ADC3 20x Gain"] - ADC2_ADC1_1X: [44, "Differential Inputs Positive ADC2 Negative ADC2 1x Gain"] - ADC2_ADC1_20X: [45, "Differential Inputs Positive ADC2 Negative ADC2 20x Gain"] - ADC2_ADC3_1X: [16, "Differential Inputs Positive ADC2 Negative ADC3 1x Gain"] - ADC2_ADC3_20X: [17, "Differential Inputs Positive ADC2 Negative ADC3 20x Gain"] + ADC2_ADC1_1X: [44, "Differential Inputs Positive ADC2 Negative ADC2 1x Gain"] + ADC2_ADC1_20X: [45, "Differential Inputs Positive ADC2 Negative ADC2 20x Gain"] + ADC2_ADC3_1X: [16, "Differential Inputs Positive ADC2 Negative ADC3 1x Gain"] + ADC2_ADC3_20X: [17, "Differential Inputs Positive ADC2 Negative ADC3 20x Gain"] - ADC3_ADC0_1X: [42, "Differential Inputs Positive ADC3 Negative ADC0 1x Gain"] - ADC3_ADC0_20X: [43, "Differential Inputs Positive ADC3 Negative ADC0 20x Gain"] - ADC3_ADC1_1X: [46, "Differential Inputs Positive ADC3 Negative ADC1 1x Gain"] - ADC3_ADC1_20X: [47, "Differential Inputs Positive ADC3 Negative ADC1 20x Gain"] - ADC3_ADC2_1X: [48, "Differential Inputs Positive ADC3 Negative ADC2 1x Gain"] - ADC3_ADC2_20X: [49, "Differential Inputs Positive ADC3 Negative ADC2 20x Gain"] - ADC3_ADC3_1X: [36, "Differential Inputs Positive ADC3 Negative ADC3 1x Gain"] - ADC3_ADC3_20X: [37, "Differential Inputs Positive ADC3 Negative ADC3 20x Gain"] - ADC3_ADC4_1X: [18, "Differential Inputs Positive ADC4 Negative ADC0 1x Gain"] - ADC3_ADC4_20X: [19, "Differential Inputs Positive ADC4 Negative ADC0 20x Gain"] - ADC3_ADC5_1X: [20, "Differential Inputs Positive ADC5 Negative ADC1 1x Gain"] - ADC3_ADC5_20X: [21, "Differential Inputs Positive ADC5 Negative ADC1 20x Gain"] - ADC3_ADC6_1X: [22, "Differential Inputs Positive ADC6 Negative ADC2 1x Gain"] - ADC3_ADC6_20X: [23, "Differential Inputs Positive ADC6 Negative ADC2 20x Gain"] - ADC3_ADC7_1X: [24, "Differential Inputs Positive ADC7 Negative ADC3 1x Gain"] - ADC3_ADC7_20X: [25, "Differential Inputs Positive ADC7 Negative ADC3 20x Gain"] + ADC3_ADC0_1X: [42, "Differential Inputs Positive ADC3 Negative ADC0 1x Gain"] + ADC3_ADC0_20X: [43, "Differential Inputs Positive ADC3 Negative ADC0 20x Gain"] + ADC3_ADC1_1X: [46, "Differential Inputs Positive ADC3 Negative ADC1 1x Gain"] + ADC3_ADC1_20X: [47, "Differential Inputs Positive ADC3 Negative ADC1 20x Gain"] + ADC3_ADC2_1X: [48, "Differential Inputs Positive ADC3 Negative ADC2 1x Gain"] + ADC3_ADC2_20X: [49, "Differential Inputs Positive ADC3 Negative ADC2 20x Gain"] + ADC3_ADC3_1X: [36, "Differential Inputs Positive ADC3 Negative ADC3 1x Gain"] + ADC3_ADC3_20X: [37, "Differential Inputs Positive ADC3 Negative ADC3 20x Gain"] + ADC3_ADC4_1X: [18, "Differential Inputs Positive ADC4 Negative ADC0 1x Gain"] + ADC3_ADC4_20X: [19, "Differential Inputs Positive ADC4 Negative ADC0 20x Gain"] + ADC3_ADC5_1X: [20, "Differential Inputs Positive ADC5 Negative ADC1 1x Gain"] + ADC3_ADC5_20X: [21, "Differential Inputs Positive ADC5 Negative ADC1 20x Gain"] + ADC3_ADC6_1X: [22, "Differential Inputs Positive ADC6 Negative ADC2 1x Gain"] + ADC3_ADC6_20X: [23, "Differential Inputs Positive ADC6 Negative ADC2 20x Gain"] + ADC3_ADC7_1X: [24, "Differential Inputs Positive ADC7 Negative ADC3 1x Gain"] + ADC3_ADC7_20X: [25, "Differential Inputs Positive ADC7 Negative ADC3 20x Gain"] - ADC4_ADC3_1X: [50, "Differential Inputs Positive ADC4 Negative ADC3 1x Gain"] - ADC4_ADC3_20X: [51, "Differential Inputs Positive ADC4 Negative ADC3 20x Gain"] - ADC4_ADC5_1X: [26, "Differential Inputs Positive ADC4 Negative ADC5 1x Gain"] - ADC4_ADC5_20X: [27, "Differential Inputs Positive ADC4 Negative ADC5 20x Gain"] + ADC4_ADC3_1X: [50, "Differential Inputs Positive ADC4 Negative ADC3 1x Gain"] + ADC4_ADC3_20X: [51, "Differential Inputs Positive ADC4 Negative ADC3 20x Gain"] + ADC4_ADC5_1X: [26, "Differential Inputs Positive ADC4 Negative ADC5 1x Gain"] + ADC4_ADC5_20X: [27, "Differential Inputs Positive ADC4 Negative ADC5 20x Gain"] - ADC5_ADC3_1X: [52, "Differential Inputs Positive ADC5 Negative ADC3 1x Gain"] - ADC5_ADC3_20X: [53, "Differential Inputs Positive ADC5 Negative ADC3 20x Gain"] - ADC5_ADC4_1X: [58, "Differential Inputs Positive ADC5 Negative ADC4 1x Gain"] - ADC5_ADC4_20X: [59, "Differential Inputs Positive ADC5 Negative ADC4 20x Gain"] - ADC5_ADC6_1X: [28, "Differential Inputs Positive ADC5 Negative ADC6 1x Gain"] - ADC5_ADC6_20X: [29, "Differential Inputs Positive ADC5 Negative ADC6 20x Gain"] + ADC5_ADC3_1X: [52, "Differential Inputs Positive ADC5 Negative ADC3 1x Gain"] + ADC5_ADC3_20X: [53, "Differential Inputs Positive ADC5 Negative ADC3 20x Gain"] + ADC5_ADC4_1X: [58, "Differential Inputs Positive ADC5 Negative ADC4 1x Gain"] + ADC5_ADC4_20X: [59, "Differential Inputs Positive ADC5 Negative ADC4 20x Gain"] + ADC5_ADC6_1X: [28, "Differential Inputs Positive ADC5 Negative ADC6 1x Gain"] + ADC5_ADC6_20X: [29, "Differential Inputs Positive ADC5 Negative ADC6 20x Gain"] - ADC6_ADC3_1X: [54, "Differential Inputs Positive ADC6 Negative ADC3 1x Gain"] - ADC6_ADC3_20X: [55, "Differential Inputs Positive ADC6 Negative ADC3 20x Gain"] - ADC6_ADC5_1X: [60, "Differential Inputs Positive ADC6 Negative ADC5 1x Gain"] - ADC6_ADC5_20X: [61, "Differential Inputs Positive ADC6 Negative ADC5 20x Gain"] - ADC6_ADC7_1X: [30, "Differential Inputs Positive ADC6 Negative ADC7 1x Gain"] - ADC6_ADC7_20X: [31, "Differential Inputs Positive ADC6 Negative ADC7 20x Gain"] + ADC6_ADC3_1X: [54, "Differential Inputs Positive ADC6 Negative ADC3 1x Gain"] + ADC6_ADC3_20X: [55, "Differential Inputs Positive ADC6 Negative ADC3 20x Gain"] + ADC6_ADC5_1X: [60, "Differential Inputs Positive ADC6 Negative ADC5 1x Gain"] + ADC6_ADC5_20X: [61, "Differential Inputs Positive ADC6 Negative ADC5 20x Gain"] + ADC6_ADC7_1X: [30, "Differential Inputs Positive ADC6 Negative ADC7 1x Gain"] + ADC6_ADC7_20X: [31, "Differential Inputs Positive ADC6 Negative ADC7 20x Gain"] - ADC7_ADC3_1X: [56, "Differential Inputs Positive ADC7 Negative ADC3 1x Gain"] - ADC7_ADC3_20X: [57, "Differential Inputs Positive ADC7 Negative ADC3 20x Gain"] - ADC7_ADC6_1X: [62, "Differential Inputs Positive ADC7 Negative ADC6 1x Gain"] - ADC7_ADC6_20X: [63, "Differential Inputs Positive ADC7 Negative ADC6 20x Gain"] - ADC7_ADC7_1X: [38, "Differential Inputs Positive ADC7 Negative ADC7 1x Gain"] - ADC7_ADC7_20X: [39, "Differential Inputs Positive ADC7 Negative ADC7 20x Gain"] + ADC7_ADC3_1X: [56, "Differential Inputs Positive ADC7 Negative ADC3 1x Gain"] + ADC7_ADC3_20X: [57, "Differential Inputs Positive ADC7 Negative ADC3 20x Gain"] + ADC7_ADC6_1X: [62, "Differential Inputs Positive ADC7 Negative ADC6 1x Gain"] + ADC7_ADC6_20X: [63, "Differential Inputs Positive ADC7 Negative ADC6 20x Gain"] + ADC7_ADC7_1X: [38, "Differential Inputs Positive ADC7 Negative ADC7 1x Gain"] + ADC7_ADC7_20X: [39, "Differential Inputs Positive ADC7 Negative ADC7 20x Gain"] REFS: - _write_constraint: enum - _replace_enum: - VCC: [0, "Vcc used as Voltage Reference, disconnected from Aref"] - AREF: [1, "External Voltage Reference at AREF pin, Internal Voltage Reference turned off"] - INTERNAL: [2, "Internal 1.1V Voltage Reference"] + VCC: [0, "Vcc used as Voltage Reference, disconnected from Aref"] + AREF: [1, "External Voltage Reference at AREF pin, Internal Voltage Reference turned off"] + INTERNAL: [2, "Internal 1.1V Voltage Reference"] CPU: _modify: OSCCAL: -- 2.48.1