Skip to content

Commit 6263e98

Browse files
Tinyu-ZhaoTinyu-Zhao
committed
Remove redundant definitions
1 parent 1deee65 commit 6263e98

File tree

23 files changed

+1
-180
lines changed

23 files changed

+1
-180
lines changed

Diff for: ‎boards.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22600,7 +22600,7 @@ m5stack_dinmeter.build.target=esp32s3
2260022600
m5stack_dinmeter.build.mcu=esp32s3
2260122601
m5stack_dinmeter.build.core=esp32
2260222602
m5stack_dinmeter.build.variant=m5stack_dinmeter
22603-
m5stack_dinmeter.build.board=m5stack_dinmeter
22603+
m5stack_dinmeter.build.board=M5STACK_DINMETER
2260422604

2260522605
m5stack_dinmeter.build.usb_mode=1
2260622606
m5stack_dinmeter.build.cdc_on_boot=1

Diff for: ‎variants/m5stack_atom/pins_arduino.h

-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33

44
#include <stdint.h>
55

6-
#define EXTERNAL_NUM_INTERRUPTS 16
7-
#define NUM_DIGITAL_PINS 40
8-
#define NUM_ANALOG_INPUTS 16
9-
10-
#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
11-
#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
12-
#define digitalPinHasPWM(p) (p < 34)
13-
146
static const uint8_t TX = 1;
157
static const uint8_t RX = 3;
168

Diff for: ‎variants/m5stack_atoms3/pins_arduino.h

-8
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
#define USB_VID 0x303a
88
#define USB_PID 0x1001
99

10-
#define EXTERNAL_NUM_INTERRUPTS 46
11-
#define NUM_DIGITAL_PINS 48
12-
#define NUM_ANALOG_INPUTS 20
13-
1410
// Some boards have too low voltage on this pin (board design bug)
1511
// Use different pin with 3V and connect with 48
1612
// and change this setup for the chosen pin (for example 38)
@@ -20,10 +16,6 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + 48;
2016
#define RGB_BUILTIN LED_BUILTIN
2117
#define RGB_BRIGHTNESS 64
2218

23-
#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
24-
#define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1)
25-
#define digitalPinHasPWM(p) (p < 46)
26-
2719
static const uint8_t TX = 43;
2820
static const uint8_t RX = 44;
2921

Diff for: ‎variants/m5stack_capsule/pins_arduino.h

-8
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@
77
#define USB_VID 0x303a
88
#define USB_PID 0x1001
99

10-
#define EXTERNAL_NUM_INTERRUPTS 23
11-
#define NUM_DIGITAL_PINS 46
12-
#define NUM_ANALOG_INPUTS 15
13-
14-
#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
15-
#define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1)
16-
#define digitalPinHasPWM(p) (p < 46)
17-
1810
static const uint8_t TX = 43;
1911
static const uint8_t RX = 44;
2012

Diff for: ‎variants/m5stack_cardputer/pins_arduino.h

-8
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@
77
#define USB_VID 0x303a
88
#define USB_PID 0x1001
99

10-
#define EXTERNAL_NUM_INTERRUPTS 23
11-
#define NUM_DIGITAL_PINS 46
12-
#define NUM_ANALOG_INPUTS 15
13-
14-
#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
15-
#define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1)
16-
#define digitalPinHasPWM(p) (p < 46)
17-
1810
static const uint8_t TX = 43;
1911
static const uint8_t RX = 44;
2012

Diff for: ‎variants/m5stack_core/pins_arduino.h

-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33

44
#include <stdint.h>
55

6-
#define EXTERNAL_NUM_INTERRUPTS 16
7-
#define NUM_DIGITAL_PINS 20
8-
#define NUM_ANALOG_INPUTS 16
9-
10-
#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
11-
#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
12-
#define digitalPinHasPWM(p) (p < 34)
13-
146
static const uint8_t TX = 1;
157
static const uint8_t RX = 3;
168

Diff for: ‎variants/m5stack_core2/pins_arduino.h

-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33

44
#include <stdint.h>
55

6-
#define EXTERNAL_NUM_INTERRUPTS 16
7-
#define NUM_DIGITAL_PINS 20
8-
#define NUM_ANALOG_INPUTS 16
9-
10-
#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
11-
#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
12-
#define digitalPinHasPWM(p) (p < 34)
13-
146
#define TX2 14
157
#define RX2 13
168

Diff for: ‎variants/m5stack_coreink/pins_arduino.h

-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33

44
#include <stdint.h>
55

6-
#define EXTERNAL_NUM_INTERRUPTS 16
7-
#define NUM_DIGITAL_PINS 40
8-
#define NUM_ANALOG_INPUTS 16
9-
10-
#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
11-
#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
12-
#define digitalPinHasPWM(p) (p < 34)
13-
146
#define TX2 14
157
#define RX2 13
168

Diff for: ‎variants/m5stack_cores3/pins_arduino.h

-8
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
#define USB_VID 0x303a
88
#define USB_PID 0x1001
99

10-
#define EXTERNAL_NUM_INTERRUPTS 46
11-
#define NUM_DIGITAL_PINS 48
12-
#define NUM_ANALOG_INPUTS 20
13-
1410
// Some boards have too low voltage on this pin (board design bug)
1511
// Use different pin with 3V and connect with 48
1612
// and change this setup for the chosen pin (for example 38)
@@ -20,10 +16,6 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + 48;
2016
#define RGB_BUILTIN LED_BUILTIN
2117
#define RGB_BRIGHTNESS 64
2218

23-
#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
24-
#define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1)
25-
#define digitalPinHasPWM(p) (p < 46)
26-
2719
static const uint8_t TX = 43;
2820
static const uint8_t RX = 44;
2921

Diff for: ‎variants/m5stack_fire/pins_arduino.h

-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33

44
#include <stdint.h>
55

6-
#define EXTERNAL_NUM_INTERRUPTS 16
7-
#define NUM_DIGITAL_PINS 20
8-
#define NUM_ANALOG_INPUTS 16
9-
10-
#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
11-
#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
12-
#define digitalPinHasPWM(p) (p < 34)
13-
146
static const uint8_t TX = 1;
157
static const uint8_t RX = 3;
168

Diff for: ‎variants/m5stack_paper/pins_arduino.h

-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33

44
#include <stdint.h>
55

6-
#define EXTERNAL_NUM_INTERRUPTS 16
7-
#define NUM_DIGITAL_PINS 40
8-
#define NUM_ANALOG_INPUTS 16
9-
10-
#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
11-
#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
12-
#define digitalPinHasPWM(p) (p < 34)
13-
146
#define TX2 14
157
#define RX2 13
168

Diff for: ‎variants/m5stack_poe_cam/pins_arduino.h

-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33

44
#include <stdint.h>
55

6-
#define EXTERNAL_NUM_INTERRUPTS 16
7-
#define NUM_DIGITAL_PINS 40
8-
#define NUM_ANALOG_INPUTS 16
9-
10-
#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
11-
#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
12-
#define digitalPinHasPWM(p) (p < 34)
13-
146
static const uint8_t TX = 1;
157
static const uint8_t RX = 3;
168

Diff for: ‎variants/m5stack_stamp_c3/pins_arduino.h

-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33

44
#include <stdint.h>
55

6-
#define EXTERNAL_NUM_INTERRUPTS 22
7-
#define NUM_DIGITAL_PINS 22
8-
#define NUM_ANALOG_INPUTS 6
9-
10-
#define analogInputToDigitalPin(p) (((p) < NUM_ANALOG_INPUTS) ? (esp32_adc2gpio[(p)]) : -1)
11-
#define digitalPinToInterrupt(p) (((p) < NUM_DIGITAL_PINS) ? (p) : -1)
12-
#define digitalPinHasPWM(p) (p < EXTERNAL_NUM_INTERRUPTS)
13-
146
static const uint8_t TX = 21;
157
static const uint8_t RX = 20;
168

Diff for: ‎variants/m5stack_stamp_pico/pins_arduino.h

-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33

44
#include <stdint.h>
55

6-
#define EXTERNAL_NUM_INTERRUPTS 16
7-
#define NUM_DIGITAL_PINS 40
8-
#define NUM_ANALOG_INPUTS 16
9-
10-
#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
11-
#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
12-
#define digitalPinHasPWM(p) (p < 34)
13-
146
static const uint8_t TX = 1;
157
static const uint8_t RX = 3;
168

Diff for: ‎variants/m5stack_stamp_s3/pins_arduino.h

-8
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@
77
#define USB_VID 0x303a
88
#define USB_PID 0x1001
99

10-
#define EXTERNAL_NUM_INTERRUPTS 23
11-
#define NUM_DIGITAL_PINS 46
12-
#define NUM_ANALOG_INPUTS 15
13-
14-
#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
15-
#define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1)
16-
#define digitalPinHasPWM(p) (p < 46)
17-
1810
static const uint8_t TX = 43;
1911
static const uint8_t RX = 44;
2012

Diff for: ‎variants/m5stack_station/pins_arduino.h

-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33

44
#include <stdint.h>
55

6-
#define EXTERNAL_NUM_INTERRUPTS 16
7-
#define NUM_DIGITAL_PINS 20
8-
#define NUM_ANALOG_INPUTS 16
9-
10-
#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
11-
#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
12-
#define digitalPinHasPWM(p) (p < 34)
13-
146
static const uint8_t TX = 1;
157
static const uint8_t RX = 3;
168

Diff for: ‎variants/m5stack_stickc/pins_arduino.h

-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33

44
#include <stdint.h>
55

6-
#define EXTERNAL_NUM_INTERRUPTS 16
7-
#define NUM_DIGITAL_PINS 40
8-
#define NUM_ANALOG_INPUTS 16
9-
10-
#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
11-
#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
12-
#define digitalPinHasPWM(p) (p < 34)
13-
146
static const uint8_t TX = 1;
157
static const uint8_t RX = 3;
168

Diff for: ‎variants/m5stack_stickc_plus/pins_arduino.h

-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33

44
#include <stdint.h>
55

6-
#define EXTERNAL_NUM_INTERRUPTS 16
7-
#define NUM_DIGITAL_PINS 40
8-
#define NUM_ANALOG_INPUTS 16
9-
10-
#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
11-
#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
12-
#define digitalPinHasPWM(p) (p < 34)
13-
146
static const uint8_t TX = 1;
157
static const uint8_t RX = 3;
168

Diff for: ‎variants/m5stack_stickc_plus2/pins_arduino.h

-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33

44
#include <stdint.h>
55

6-
#define EXTERNAL_NUM_INTERRUPTS 16
7-
#define NUM_DIGITAL_PINS 40
8-
#define NUM_ANALOG_INPUTS 16
9-
10-
#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
11-
#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
12-
#define digitalPinHasPWM(p) (p < 34)
13-
146
static const uint8_t TX = 1;
157
static const uint8_t RX = 3;
168

Diff for: ‎variants/m5stack_timer_cam/pins_arduino.h

-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33

44
#include <stdint.h>
55

6-
#define EXTERNAL_NUM_INTERRUPTS 16
7-
#define NUM_DIGITAL_PINS 40
8-
#define NUM_ANALOG_INPUTS 16
9-
10-
#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
11-
#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
12-
#define digitalPinHasPWM(p) (p < 34)
13-
146
static const uint8_t LED_BUILTIN = 2;
157
#define BUILTIN_LED LED_BUILTIN // backward compatibility
168

Diff for: ‎variants/m5stack_tough/pins_arduino.h

-11
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,6 @@
33

44
#include <stdint.h>
55

6-
#define EXTERNAL_NUM_INTERRUPTS 16
7-
#define NUM_DIGITAL_PINS 20
8-
#define NUM_ANALOG_INPUTS 16
9-
10-
#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
11-
#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
12-
#define digitalPinHasPWM(p) (p < 34)
13-
14-
#define TX2 14
15-
#define RX2 13
16-
176
static const uint8_t TX = 1;
187
static const uint8_t RX = 3;
198

Diff for: ‎variants/m5stack_unit_cam/pins_arduino.h

-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33

44
#include <stdint.h>
55

6-
#define EXTERNAL_NUM_INTERRUPTS 16
7-
#define NUM_DIGITAL_PINS 40
8-
#define NUM_ANALOG_INPUTS 16
9-
10-
#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
11-
#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1)
12-
#define digitalPinHasPWM(p) (p < 34)
13-
146
static const uint8_t LED_BUILTIN = 4;
157
#define BUILTIN_LED LED_BUILTIN // backward compatibility
168

Diff for: ‎variants/m5stack_unit_cams3/pins_arduino.h

-8
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@
77
#define USB_VID 0x303a
88
#define USB_PID 0x1001
99

10-
#define EXTERNAL_NUM_INTERRUPTS 23
11-
#define NUM_DIGITAL_PINS 46
12-
#define NUM_ANALOG_INPUTS 15
13-
14-
#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
15-
#define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1)
16-
#define digitalPinHasPWM(p) (p < 46)
17-
1810
static const uint8_t TX = 43;
1911
static const uint8_t RX = 44;
2012

0 commit comments

Comments
 (0)