8000 Apply review fixes: · zencuke/circuitpython@89b2788 · GitHub
[go: up one dir, main page]

Skip to content

Commit 89b2788

Browse files
committed
Apply review fixes:
* fix formatting * fix copyrights * fix CIRCUITPYTHON_GAMEPAD guards * add CIRCUITPYTHON_PEW guards to reset * fix module list order
1 parent 8e50aeb commit 89b2788

File tree

10 files changed

+13
-12
lines changed

10 files changed

+13
-12
lines changed

ports/atmel-samd/boards/pewpew10/board.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626

2727
#include "boards/board.h"
2828

29-
void board_init(void)
30-
{
29+
void board_init(void) {
3130
}
3231

3332
bool board_requests_safe_mode(void) {

ports/atmel-samd/supervisor/port.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868

6969
#include "tusb.h"
7070

71-
#ifdef CIRCUITPY_GAMEPAD_TICKS
71+
#if CIRCUITPY_GAMEPAD
7272
#include "shared-module/gamepad/__init__.h"
7373
#endif
7474
#include "shared-module/_pew/PewPew.h"
@@ -223,10 +223,12 @@ void reset_port(void) {
223223

224224
reset_gclks();
225225

226-
#ifdef CIRCUITPY_GAMEPAD_TICKS
226+
#if CIRCUITPY_GAMEPAD
227227
gamepad_reset();
228228
#endif
229+
#ifdef CIRCUITPY_PEW
229230
pew_reset();
231+
#endif
230232

231233
reset_event_system();
232234

py/circuitpy_mpconfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,7 @@ extern const struct _mp_obj_module_t pew_module;
528528
NETWORK_MODULE \
529529
SOCKET_MODULE \
530530
WIZNET_MODULE \
531+
PEW_MODULE \
531532
PIXELBUF_MODULE \
532533
PULSEIO_MODULE \
533534
RANDOM_MODULE \
@@ -543,7 +544,6 @@ extern const struct _mp_obj_module_t pew_module;
543544
USB_HID_MODULE \
544545
USB_MIDI_MODULE \
545546
USTACK_MODULE \
546-
PEW_MODULE \
547547

548548
// If weak links are enabled, just include strong links in the main list of modules,
549549
// and also include the underscore alternate names.

shared-bindings/_pew/PewPew.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* The MIT License (MIT)
55
*
6-
* Copyright (c) 2016 Radomir Dopieralski for Adafruit Industries
6+
* Copyright (c) 2019 Radomir Dopieralski
77
*
88
* Permission is hereby granted, free of charge, to any person obtaining a copy
99
* of this software and associated documentation files (the "Software"), to deal

shared-bindings/_pew/PewPew.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* The MIT License (MIT)
55
*
6-
* Copyright (c) 2016 Radomir Dopieralski for Adafruit Industries
6+
* Copyright (c) 2019 Radomir Dopieralski
77
*
88
* Permission is hereby granted, free of charge, to any person obtaining a copy
99
* of this software and associated documentation files (the "Software"), to deal

shared-bindings/_pew/__init__.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* The MIT License (MIT)
55
*
6-
* Copyright (c) 2016 Radomir Dopieralski for Adafruit Industries
6+
* Copyright (c) 2019 Radomir Dopieralski
77
*
88
* Permission is hereby granted, free of charge, to any person obtaining a copy
99
* of this software and associated documentation files (the "Software"), to deal

shared-module/_pew/PewPew.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* The MIT License (MIT)
55
*
6-
* Copyright (c) 2016 Radomir Dopieralski for Adafruit Industries
6+
* Copyright (c) 2019 Radomir Dopieralski
77
*
88
* Permission is hereby granted, free of charge, to any person obtaining a copy
99
* of this software and associated documentation files (the "Software"), to deal

shared-module/_pew/PewPew.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* The MIT License (MIT)
55
*
6-
* Copyright (c) 2016 Radomir Dopieralski for Adafruit Industries
6+
* Copyright (c) 2019 Radomir Dopieralski
77
*
88
* Permission is hereby granted, free of charge, to any person obtaining a copy
99
* of this software and associated documentation files (the "Software"), to deal

shared-module/_pew/__init__.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* The MIT License (MIT)
55
*
6-
* Copyright (c) 2016 Radomir Dopieralski for Adafruit Industries
6+
* Copyright (c) 2019 Radomir Dopieralski
77
*
88
* Permission is hereby granted, free of charge, to any person obtaining a copy
99
* of this software and associated documentation files (the "Software"), to deal

shared-module/_pew/__init__.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* The MIT License (MIT)
55
*
6-
* Copyright (c) 2016 Scott Shawcroft for Adafruit Industries
6+
* Copyright (c) 2019 Radomir Dopieralski
77
*
88
* Permission is hereby granted, free of charge, to any person obtaining a copy
99
* of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)
0