Skip to content

Commit

Permalink
2.1.3 - critical regression fix for 8-pin parts
Browse files Browse the repository at this point in the history
  • Loading branch information
SpenceKonde committed Oct 13, 2020
1 parent 2be0ae7 commit 7c515d3
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 11 deletions.
4 changes: 2 additions & 2 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### 2.1.1, 2.1.2
* Fix critical compile bug, then upload bug on 20-pin parts due to boards.txt problem.
### 2.1.1, 2.1.2, 2.1.3
Urgent bugfixes for critical regressions introduced in 2.1.0.

### 2.1.0
* Improve ADC accuracy when switching references
Expand Down
18 changes: 16 additions & 2 deletions megaavr/boards.txt
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,7 @@ atxy2.build.board=generic_txy2
atxy2.build.mcu=attiny{build.attiny}
atxy2.build.millis=-DMILLIS_USE_TIMER{build.millistimer}
atxy2.build.f_cpu={build.speed}000000L

atxy2.menu.serialevent.no=No (saves space)
atxy2.menu.serialevent.yes=Yes
atxy2.menu.serialevent.no.build.serialevent=-DNOSERIALEVENT
Expand Down Expand Up @@ -769,6 +770,20 @@ atxy2.menu.millis.timerd.build.millistimer=D0
atxy2.menu.millis.timerb0.build.millistimer=B0
atxy2.menu.millis.rtc.build.millistimer=RTC

atxy2.menu.resetpin.UPDI=UPDI (pick this unless you have an HV UPDI programmer!)
atxy2.menu.resetpin.UPDI.bootloader.resetpinbits=01
atxy2.menu.resetpin.reset=Reset (DANGER - Bricks chip w/out HV UPDI programmer!)
atxy2.menu.resetpin.reset.bootloader.resetpinbits=10
atxy2.menu.resetpin.gpio=IO (DANGER - Bricks chip w/out HV UPDI programmer! Use PCHV)
atxy2.menu.resetpin.gpio.bootloader.resetpinbits=00

atxy2.menu.startuptime.8= 8ms - A good default, usually fine
atxy2.menu.startuptime.1= 1ms - (aggressive/very fast rising power)
atxy2.menu.startuptime.64= 64ms - (cautious/slow rising power)
atxy2.menu.startuptime.8.bootloader.SYSCFG1=0x03
atxy2.menu.startuptime.1.bootloader.SYSCFG1=0x01
atxy2.menu.startuptime.64.bootloader.SYSCFG1=0x07

atxy2.menu.uartvoltage.5v=Closer to 5v
atxy2.menu.uartvoltage.3v=Closer to 3v
atxy2.menu.uartvoltage.5v.build.uartvoltage=5V
Expand All @@ -789,8 +804,6 @@ atxy2.bootloader.APPEND=0x00
atxy2.bootloader.BOOTEND=0x00
atxy2.bootloader.SYSCFG0=0b1100{bootloader.resetpinbits}0{bootloader.eesavebit}

#

# Xplained boards with Tiny-1 chips

Xplained416.name=Attiny416 Xplained Nano (optiboot)
Expand All @@ -809,6 +822,7 @@ Xplained416.build.speed=20
Xplained416.build.clocksource=0
Xplained416.build.text_section_start=.text=0x200
Xplained416.build.extra_flags={build.serialevent} {build.millis} -DUARTBAUD5V

Xplained416.menu.serialevent.no=No (saves space)
Xplained416.menu.serialevent.yes=Yes
Xplained416.menu.serialevent.no.build.serialevent=-DNOSERIALEVENT
Expand Down
4 changes: 2 additions & 2 deletions megaavr/cores/megatinycore/Arduino.h
Original file line number Diff line number Diff line change
Expand Up @@ -357,10 +357,10 @@ void setup_timers();
#error "tinyAVR 2-series parts are not yet supported"
#endif

#define MEGATINYCORE "2.1.2"
#define MEGATINYCORE "2.1.3"
#define MEGATINYCORE_MAJOR 2
#define MEGATINYCORE_MINOR 1
#define MEGATINYCORE_PATCH 2
#define MEGATINYCORE_PATCH 3
#define MEGATINYCORE_RELEASED 1
#define MEGATINYCORE_NUM 0x02010201

Expand Down
2 changes: 1 addition & 1 deletion megaavr/platform.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5-3rd-party-Hardware-specification

name=megaTinyCore
version=2.1.2
version=2.1.3

# AVR compile variables
# ---------------------
Expand Down
8 changes: 4 additions & 4 deletions megaavr/variants/txy2/pins_arduino.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@
#define HWSERIAL0_TXC_VECTOR (USART0_TXC_vect)
#define HWSERIAL0_TXC_VECTOR_NUM (USART0_TXC_vect_num)
#define HWSERIAL0_MUX_PINSWAP_1 0x01
#define PIN_HWSERIAL0_RX_PINSWAP_1 (PIN_PA1)
#define PIN_HWSERIAL0_TX_PINSWAP_1 (PIN_PA2)
#define PIN_HWSERIAL0_RX_PINSWAP_1 (PIN_PA2)
#define PIN_HWSERIAL0_TX_PINSWAP_1 (PIN_PA1)
#define PIN_HWSERIAL0_XCK_PINSWAP_1 (PIN_PA3)
#define PIN_HWSERIAL0_XDIR_PINSWAP_1 (PIN_PA0)
#define HWSERIAL0_MUX 0x00
#define PIN_HWSERIAL0_RX (PIN_PA6)
#define PIN_HWSERIAL0_TX (PIN_PA7)
#define PIN_HWSERIAL0_RX (PIN_PA7)
#define PIN_HWSERIAL0_TX (PIN_PA6)
#define PIN_HWSERIAL0_XCK (PIN_PA3)
#define PIN_HWSERIAL0_XDIR (PIN_PA0)

Expand Down

0 comments on commit 7c515d3

Please sign in to comment.