Skip to content

Commit 0404561

Browse files
nonik0nonik0
committed
Rounding out ATtiny 0-series with 204/804/1604 support, copilot re-alphabetized stuff
1 parent 95f5810 commit 0404561

File tree

11 files changed

+14389
-61
lines changed

11 files changed

+14389
-61
lines changed

‎Cargo.toml‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,32 @@ atmega1284p = ["device-selected"]
2929
atmega128a = ["device-selected"]
3030
atmega128rfa1 = ["device-selected"]
3131
atmega16 = ["device-selected"]
32-
atmega16u2 = ["device-selected"]
3332
atmega164pa = ["device-selected"]
3433
atmega168 = ["device-selected"]
34+
atmega16u2 = ["device-selected"]
3535
atmega2560 = ["device-selected"]
36-
atmega8 = ["device-selected"]
37-
atmega8u2 = ["device-selected"]
36+
atmega3208 = ["device-selected"]
37+
atmega3209 = ["device-selected"]
3838
atmega324pa = ["device-selected"]
3939
atmega328p = ["device-selected"]
4040
atmega328pb = ["device-selected"]
41-
atmega3208 = ["device-selected"]
42-
atmega3209 = ["device-selected"]
43-
atmega4808 = ["device-selected"]
44-
atmega4809 = ["device-selected"]
45-
atmega48p = ["device-selected"]
4641
atmega32a = ["device-selected"]
4742
atmega32u2 = ["device-selected"]
4843
atmega32u4 = ["device-selected"]
44+
atmega4808 = ["device-selected"]
45+
atmega4809 = ["device-selected"]
46+
atmega48p = ["device-selected"]
4947
atmega64 = ["device-selected"]
5048
atmega644 = ["device-selected"]
49+
atmega8 = ["device-selected"]
50+
atmega8u2 = ["device-selected"]
5151
atmega88p = ["device-selected"]
5252
attiny13a = ["device-selected"]
53+
attiny1604 = ["device-selected"]
54+
attiny1614 = ["device-selected"]
5355
attiny167 = ["device-selected"]
5456
attiny202 = ["device-selected"]
57+
attiny204 = ["device-selected"]
5558
attiny212 = ["device-selected"]
5659
attiny214 = ["device-selected"]
5760
attiny2313 = ["device-selected"]
@@ -63,6 +66,7 @@ attiny412 = ["device-selected"]
6366
attiny414 = ["device-selected"]
6467
attiny416 = ["device-selected"]
6568
attiny44a = ["device-selected"]
69+
attiny804 = ["device-selected"]
6670
attiny816 = ["device-selected"]
6771
attiny828 = ["device-selected"]
6872
attiny84 = ["device-selected"]
@@ -71,9 +75,8 @@ attiny84a = ["device-selected"]
7175
attiny85 = ["device-selected"]
7276
attiny861 = ["device-selected"]
7377
attiny88 = ["device-selected"]
74-
attiny1614 = ["device-selected"]
75-
avr64du32 = ["device-selected"]
7678
avr64du28 = ["device-selected"]
79+
avr64du32 = ["device-selected"]
7780
rt = ["avr-device-macros"]
7881

7982
critical-section-impl = ["critical-section/restore-state-u8"]

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
all: deps chips
22

3-
CHIPS := at90usb1286 atmega1280 atmega1284p atmega128a atmega128rfa1 atmega16 atmega164pa atmega168 atmega16u2 atmega2560 atmega8 atmega8u2 atmega324pa atmega328p atmega328pb atmega32a atmega32u2 atmega32u4 atmega3208 atmega3209 atmega4808 atmega4809 atmega48p atmega64 atmega644 atmega88p attiny13a attiny202 attiny212 attiny214 attiny2313 attiny2313a attiny26 attiny402 attiny404 attiny412 attiny414 attiny416 attiny44a attiny84 attiny85 attiny88 attiny816 attiny828 attiny841 attiny84a attiny861 attiny167 attiny1614 avr64du32 avr64du28
3+
CHIPS := at90usb1286 atmega1280 atmega1284p atmega128a atmega128rfa1 atmega16 atmega164pa atmega168 atmega16u2 atmega2560 atmega8 atmega8u2 atmega324pa atmega328p atmega328pb atmega32a atmega32u2 atmega32u4 atmega3208 atmega3209 atmega4808 atmega4809 atmega48p atmega64 atmega644 atmega88p attiny13a attiny202 attiny204 attiny212 attiny214 attiny2313 attiny2313a attiny26 attiny402 attiny404 attiny412 attiny414 attiny416 attiny44a attiny84 attiny85 attiny88 attiny804 attiny816 attiny828 attiny841 attiny84a attiny861 attiny167 attiny1604 attiny1614 avr64du32 avr64du28
44

55
RUSTUP_TOOLCHAIN ?= nightly
66

‎README.md‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,25 @@ Via the feature you can select which chip you want the register specifications f
1717
| `atmega8` | `atmega8u2` | `atmega3208` | `at90usb1286` | `attiny13a` |
1818
| `atmega48p` | `atmega16u2` | `atmega3209` | | `attiny167` |
1919
| `atmega64` | `atmega32u2` | `atmega4808` | | `attiny202` |
20-
| `atmega644` | `atmega32u4` | `atmega4809` | | `attiny212` |
21-
| `atmega88p` | `avr64du32` | | | `attiny214` |
22-
| `atmega16` | `avr64du28` | | | `attiny402` |
23-
| `atmega168` | | | | `attiny404` |
24-
| `atmega324pa` | | | | `attiny412` |
25-
| `atmega328p` | | | | `attiny414` |
26-
| `atmega328pb` | | | | `attiny416` |
27-
| `atmega32a` | | | | `attiny44a` |
28-
| `atmega1280` | | | | `attiny84` |
29-
| `atmega1284p` | | | | `attiny85` |
30-
| `atmega128a` | | | | `attiny88` |
31-
| `atmega128rfa1` | | | | `attiny816` |
32-
| `atmega2560` | | | | `attiny828` |
33-
| `atmega164pa` | | | | `attiny841` |
20+
| `atmega644` | `atmega32u4` | `atmega4809` | | `attiny204` |
21+
| `atmega88p` | `avr64du32` | | | `attiny212` |
22+
| `atmega16` | `avr64du28` | | | `attiny214` |
23+
| `atmega168` | | | | `attiny402` |
24+
| `atmega324pa` | | | | `attiny404` |
25+
| `atmega328p` | | | | `attiny412` |
26+
| `atmega328pb` | | | | `attiny414` |
27+
| `atmega32a` | | | | `attiny416` |
28+
| `atmega1280` | | | | `attiny44a` |
29+
| `atmega1284p` | | | | `attiny84` |
30+
| `atmega128a` | | | | `attiny85` |
31+
| `atmega128rfa1` | | | | `attiny88` |
32+
| `atmega2560` | | | | `attiny804` |
33+
| `atmega164pa` | | | | `attiny816` |
34+
| | | | | `attiny828` |
35+
| | | | | `attiny841` |
3436
| | | | | `attiny84a` |
3537
| | | | | `attiny861` |
38+
| | | | | `attiny1604` |
3639
| | | | | `attiny1614` |
3740
| | | | | `attiny2313` |
3841
| | | | | `attiny2313a` |

‎patch/attiny1604.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
_svd: ../svd/attiny1604.svd
2+
3+
_include:
4+
- common/attiny-xmega/common.yaml
5+
- common/attiny-xmega/0-series.yaml

‎patch/attiny204.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
_svd: ../svd/attiny204.svd
2+
3+
_include:
4+
- common/attiny-xmega/common.yaml
5+
- common/attiny-xmega/0-series.yaml

‎patch/attiny804.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
_svd: ../svd/attiny804.svd
2+
3+
_include:
4+
- common/attiny-xmega/common.yaml
5+
- common/attiny-xmega/0-series.yaml

‎src/devices/mod.rs‎

Lines changed: 38 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#[allow(private_no_mangle_statics)]
33
#[no_mangle]
44
pub(crate) static mut DEVICE_PERIPHERALS: bool = false;
5-
65
/// [AT90USB1286](https://www.microchip.com/wwwproducts/en/AT90USB1286)
76
#[cfg(feature = "at90usb1286")]
87
pub mod at90usb1286;
@@ -59,14 +58,6 @@ pub mod atmega328pb;
5958
#[cfg(feature = "atmega32a")]
6059
pub mod atmega32a;
6160

62-
/// [ATmega32u2](https://www.microchip.com/wwwproducts/en/ATmega32u2)
63-
#[cfg(feature = "atmega32u2")]
64-
pub mod atmega32u2;
65-
66-
/// [ATmega32U4](https://www.microchip.com/wwwproducts/en/ATmega32U4)
67-
#[cfg(feature = "atmega32u4")]
68-
pub mod atmega32u4;
69-
7061
/// [ATmega3208](https://www.microchip.com/wwwproducts/en/ATmega3208)
7162
#[cfg(feature = "atmega3208")]
7263
pub mod atmega3208;
@@ -75,6 +66,14 @@ pub mod atmega3208;
7566
#[cfg(feature = "atmega3209")]
7667
pub mod atmega3209;
7768

69+
/// [ATmega32u2](https://www.microchip.com/wwwproducts/en/ATmega32u2)
70+
#[cfg(feature = "atmega32u2")]
71+
pub mod atmega32u2;
72+
73+
/// [ATmega32U4](https://www.microchip.com/wwwproducts/en/ATmega32U4)
74+
#[cfg(feature = "atmega32u4")]
75+
pub mod atmega32u4;
76+
7877
/// [ATmega4808](https://www.microchip.com/wwwproducts/en/ATmega4808)
7978
#[cfg(feature = "atmega4808")]
8079
pub mod atmega4808;
@@ -87,14 +86,6 @@ pub mod atmega4809;
8786
#[cfg(feature = "atmega48p")]
8887
pub mod atmega48p;
8988

90-
/// [ATmega8](https://www.microchip.com/wwwproducts/en/ATmega8)
91-
#[cfg(feature = "atmega8")]
92-
pub mod atmega8;
93-
94-
/// [ATmega8u2](https://www.microchip.com/wwwproducts/en/ATmega8u2)
95-
#[cfg(feature = "atmega8u2")]
96-
pub mod atmega8u2;
97-
9889
/// [ATmega64](https://www.microchip.com/wwwproducts/en/ATmega64)
9990
#[cfg(feature = "atmega64")]
10091
pub mod atmega64;
@@ -103,6 +94,14 @@ pub mod atmega64;
10394
#[cfg(feature = "atmega644")]
10495
pub mod atmega644;
10596

97+
/// [ATmega8](https://www.microchip.com/wwwproducts/en/ATmega8)
98+
#[cfg(feature = "atmega8")]
99+
pub mod atmega8;
100+
101+
/// [ATmega8u2](https://www.microchip.com/wwwproducts/en/ATmega8u2)
102+
#[cfg(feature = "atmega8u2")]
103+
pub mod atmega8u2;
104+
106105
/// [ATmega88P](https://www.microchip.com/wwwproducts/en/ATmega88P)
107106
#[cfg(feature = "atmega88p")]
108107
pub mod atmega88p;
@@ -111,9 +110,9 @@ pub mod atmega88p;
111110
#[cfg(feature = "attiny13a")]
112111
pub mod attiny13a;
113112

114-
/// [ATtiny167](https://www.microchip.com/wwwproducts/en/ATtiny167)
115-
#[cfg(feature = "attiny167")]
116-
pub mod attiny167;
113+
/// [ATtiny1604](https://www.microchip.com/wwwproducts/en/ATtiny1604)
114+
#[cfg(feature = "attiny1604")]
115+
pub mod attiny1604;
117116

118117
/// [ATtiny1614](https://www.microchip.com/wwwproducts/en/ATtiny1614)
119118
#[cfg(feature = "attiny1614")]
@@ -123,6 +122,10 @@ pub mod attiny1614;
123122
#[cfg(feature = "attiny202")]
124123
pub mod attiny202;
125124

125+
/// [ATtiny204](https://www.microchip.com/wwwproducts/en/ATtiny204)
126+
#[cfg(feature = "attiny204")]
127+
pub mod attiny204;
128+
126129
/// [ATtiny212](https://www.microchip.com/wwwproducts/en/ATtiny212)
127130
#[cfg(feature = "attiny212")]
128131
pub mod attiny212;
@@ -143,11 +146,11 @@ pub mod attiny2313a;
143146
#[cfg(feature = "attiny26")]
144147
pub mod attiny26;
145148

146-
/// [ATtiny402](https://www.microchip.com/en-us/product/ATTINY402)
149+
/// [ATtiny402](https://www.microchip.com/en-us/product/ATTiny402)
147150
#[cfg(feature = "attiny402")]
148151
pub mod attiny402;
149152

150-
/// [ATtiny404](https://www.microchip.com/en-us/product/ATTINY404)
153+
/// [ATtiny404](https://www.microchip.com/en-us/product/ATTiny404)
151154
#[cfg(feature = "attiny404")]
152155
pub mod attiny404;
153156

@@ -163,10 +166,14 @@ pub mod attiny414;
163166
#[cfg(feature = "attiny416")]
164167
pub mod attiny416;
165168

166-
/// [ATtiny44a](https://www.microchip.com/en-us/product/ATtiny44a)
169+
/// [ATtiny44a](https://www.microchip.com/en-us/product/ATTiny44a)
167170
#[cfg(feature = "attiny44a")]
168171
pub mod attiny44a;
169172

173+
/// [ATtiny804](https://www.microchip.com/wwwproducts/en/ATtiny804)
174+
#[cfg(feature = "attiny804")]
175+
pub mod attiny804;
176+
170177
/// [ATtiny816](https://www.microchip.com/wwwproducts/en/ATtiny816)
171178
#[cfg(feature = "attiny816")]
172179
pub mod attiny816;
@@ -183,7 +190,7 @@ pub mod attiny84;
183190
#[cfg(feature = "attiny841")]
184191
pub mod attiny841;
185192

186-
/// [ATtiny84a](https://www.microchip.com/en-us/product/ATtiny84a)
193+
/// [ATtiny84a](https://www.microchip.com/en-us/product/ATTiny84a)
187194
#[cfg(feature = "attiny84a")]
188195
pub mod attiny84a;
189196

@@ -199,10 +206,14 @@ pub mod attiny861;
199206
#[cfg(feature = "attiny88")]
200207
pub mod attiny88;
201208

202-
/// [AVR64DU32](https://www.microchip.com/wwwproducts/en/AVR64DU32)
203-
#[cfg(feature = "avr64du32")]
204-
pub mod avr64du32;
209+
/// [ATtiny167](https://www.microchip.com/wwwproducts/en/ATtiny167)
210+
#[cfg(feature = "attiny167")]
211+
pub mod attiny167;
205212

206213
/// [AVR64DU28](https://www.microchip.com/wwwproducts/en/AVR64DU28)
207214
#[cfg(feature = "avr64du28")]
208215
pub mod avr64du28;
216+
217+
/// [AVR64DU32](https://www.microchip.com/wwwproducts/en/AVR64DU32)
218+
#[cfg(feature = "avr64du32")]
219+
pub mod avr64du32;

0 commit comments

Comments
 (0)