Skip to content

Commit af188aa

Browse files
committed
Merge branch 'MergeToBlockly' into BlocklyProp
2 parents fe73a03 + ceba2c5 commit af188aa

File tree

5 files changed

+3
-3
lines changed

5 files changed

+3
-3
lines changed
Binary file not shown.

Learn/Simple Libraries/TextDevices/libsimpletext/serial_open.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ serial *serial_open(int rxpin, int txpin, int mode, int baudrate)
2020

2121
/* set pins first for boards that can misbehave intentionally like the Quickstart */
2222
if(txpin >= SERIAL_MIN_PIN && txpin <= SERIAL_MAX_PIN) {
23-
DIRA |= (1<<txpin);
2423
OUTA |= (1<<txpin);
24+
DIRA |= (1<<txpin);
2525
}
2626
if(rxpin >= SERIAL_MIN_PIN && rxpin <= SERIAL_MAX_PIN) {
2727
DIRA &= ~(1<<rxpin);
-4 Bytes
Binary file not shown.

Learn/Simple Libraries/Utility/libcolormath/compareRRGGBB.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
int compareRRGGBB(int c1, int c2)
2020
{
21-
return 255 - ((abs((c1 & 0xFF0000) >> 16 - (c2 & 0xFF0000) >> 16) + abs((c1 & 0xFF00) >> 8 - (c2 & 0xFF00) >> 8) + abs(c1 & 0xFF - c2 & 0xFF)) / 3);
21+
return 255 - ((abs(((c1 & 0xFF0000) >> 16) - ((c2 & 0xFF0000) >> 16)) + abs(((c1 & 0xFF00) >> 8) - ((c2 & 0xFF00) >> 8)) + abs((c1 & 0xFF) - (c2 & 0xFF))) / 3);
2222
}
2323

2424

Learn/Simple Libraries/Utility/libcolormath/libcolormath.side

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ get8bitColor.c
55
getColorRRGGBB.c
66
remapColor.c
77
>compiler=C
8-
>memtype=lmm main ram
8+
>memtype=cmm main ram compact
99
>optimize=-Os
1010
>-m32bit-doubles
1111
>-fno-exceptions

0 commit comments

Comments
 (0)