Skip to content

Commit 205d8b2

Browse files
committed
Odds and ends
1 parent 48324f3 commit 205d8b2

File tree

5 files changed

+29
-21
lines changed

5 files changed

+29
-21
lines changed

ChangeLog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ Changes listed here are checked in to GitHub ("master" branch unless specificall
77

88
## Released Versions
99

10+
### 2.2.4
11+
* Some general tidying turned into significant cleanup of neopixel library.
12+
* Fix board manager build script - it will now correct the platform.txt during release process.
13+
1014
### 2.2.3
1115
* Add support for MPLAB SNAP and PICkit4 programmers.
1216

megaavr/extras/tinyNeoPixel.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ This compiles to 2256 bytes and reports 40 bytes of RAM used as well (but, it is
7171

7272
`setPixelColor(uint16_t n, uint32_t c)` set the color of pixel `n` to color c (expressed as a uint_32 - as returned from getColor())
7373

74-
`setPixelColor(uint16_t n, uint32_t c)` set the color of pixel `n` to color c (expressed as a uint_32 - as returned from getColor())
75-
7674
`getPixelColor(uint16_t n)` Returns the color of pin `n` as a uint_32
7775

7876
`fill(uint32_t c, uint16_t first, uint16_t count)` set `count` pixels, starting from `first` to color `c` which is a 32-bit "packed color". If `first` is unspecified, the first LED on the string is assumed. If `count` is unspecified, or if 0 is passed to it, all the LEDs from `first` to the end of the strip will be set. And if `c` is not specified, it is assumed to be 0 (off) - so `fill()` with no arguments is equivalent to `clear()`.

megaavr/platform.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
name=megaTinyCore
88
versionnum.major=2
99
versionnum.minor=2
10-
versionnum.patch=3
10+
versionnum.patch=4
1111
versionnum.postfix=
1212
versionnum.released=1
1313

@@ -148,10 +148,13 @@ tools.avrdude.upload.network_pattern="{network_cmd}" -address {serial.port} -por
148148

149149
# pymcuprog - new in 2.2.0
150150

151-
# board manager version
152-
#tools.pymcuprog.cmd={runtime.tools.python3.path}/python3
151+
# This is for the board manager version
152+
# That is signal to my script of what commeting to remove
153+
#REMOVE#tools.pymcuprog.cmd={runtime.tools.python3.path}/python3
153154

154155
# github version
156+
# the build script will - hopefully - be able to comment this out
157+
# amd ot ccomments out line starting with tools.pymcuprog.cmd
155158
tools.pymcuprog.cmd={runtime.platform.path}/tools/python3/python3
156159

157160
tools.pymcuprog.erase.params.verbose=-v

megaavr/variants/txy6/pins_arduino.h

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,17 @@
4747
#define digitalPinHasPWM(p) ((p) == 0 || (p) == 1 || (p) == 7 || (p) == 8 || (p) == 9 || (p) == 16 )
4848
#endif
4949

50-
51-
#define PIN_SPI_MISO (15)
52-
#define PIN_SPI_SCK (16)
53-
#define PIN_SPI_MOSI (14)
54-
#define PIN_SPI_SS (0)
50+
#define SPI_MUX (0)
51+
#define PIN_SPI_MISO (15)
52+
#define PIN_SPI_SCK (16)
53+
#define PIN_SPI_MOSI (14)
54+
#define PIN_SPI_SS (0)
5555
#ifdef PORTMUX_SPI0_bm
56-
#define PIN_SPI_MISO_PINSWAP_1 (11)
57-
#define PIN_SPI_SCK_PINSWAP_1 (10)
58-
#define PIN_SPI_MOSI_PINSWAP_1 (12)
59-
#define PIN_SPI_SS_PINSWAP_1 (13)
56+
#define PIN_SPI_MISO_PINSWAP_1 (11)
57+
#define PIN_SPI_SCK_PINSWAP_1 (10)
58+
#define PIN_SPI_MOSI_PINSWAP_1 (12)
59+
#define PIN_SPI_SS_PINSWAP_1 (13)
60+
#define SPI_MUX_PINSWAP_1 (PORTMUX_SPI0_bm)
6061
#endif
6162

6263
#define SPI_INTERFACES_COUNT 1

megaavr/variants/txy7/pins_arduino.h

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,17 @@
4747
#endif
4848

4949
#ifdef PORTMUX_SPI0_bm
50-
#define PIN_SPI_MISO_PINSWAP_1 (13)
51-
#define PIN_SPI_SCK_PINSWAP_1 (12)
52-
#define PIN_SPI_MOSI_PINSWAP_1 (14)
50+
#define PIN_SPI_MISO_PINSWAP_1 (13)
51+
#define PIN_SPI_SCK_PINSWAP_1 (12)
52+
#define PIN_SPI_MOSI_PINSWAP_1 (14)
5353
#define PIN_SPI_SS_PINSWAP_1 (15)
54+
#define SPI_MUX_PINSWAP_1 (PORTMUX_SPI0_bm)
5455
#endif
55-
#define PIN_SPI_MISO (19)
56-
#define PIN_SPI_SCK (20)
57-
#define PIN_SPI_MOSI (18)
58-
#define PIN_SPI_SS (0)
56+
#define SPI_MUX (0)
57+
#define PIN_SPI_MISO (19)
58+
#define PIN_SPI_SCK (20)
59+
#define PIN_SPI_MOSI (18)
60+
#define PIN_SPI_SS (0)
5961

6062
#define SPI_INTERFACES_COUNT 1
6163

0 commit comments

Comments
 (0)