Remove redundant definitions

Tinyu-Zhao · Tinyu-Zhao · commit 6263e98be120 · 2024-08-13T10:15:29.000+08:00
diff --git a/boards.txt b/boards.txt
@@ -22600,7 +22600,7 @@ m5stack_dinmeter.build.target=esp32s3
 m5stack_dinmeter.build.mcu=esp32s3
 m5stack_dinmeter.build.core=esp32
 m5stack_dinmeter.build.variant=m5stack_dinmeter
-m5stack_dinmeter.build.board=m5stack_dinmeter
+m5stack_dinmeter.build.board=M5STACK_DINMETER
 
 m5stack_dinmeter.build.usb_mode=1
 m5stack_dinmeter.build.cdc_on_boot=1
diff --git a/variants/m5stack_atom/pins_arduino.h b/variants/m5stack_atom/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
-
-#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 34)
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
diff --git a/variants/m5stack_atoms3/pins_arduino.h b/variants/m5stack_atoms3/pins_arduino.h
@@ -7,10 +7,6 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
-
 // Some boards have too low voltage on this pin (board design bug)
 // Use different pin with 3V and connect with 48
 // 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;
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
-#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 48) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 46)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
diff --git a/variants/m5stack_capsule/pins_arduino.h b/variants/m5stack_capsule/pins_arduino.h
@@ -7,14 +7,6 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 23
-#define NUM_DIGITAL_PINS        46
-#define NUM_ANALOG_INPUTS       15
-
-#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 48) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 46)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
diff --git a/variants/m5stack_cardputer/pins_arduino.h b/variants/m5stack_cardputer/pins_arduino.h
@@ -7,14 +7,6 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 23
-#define NUM_DIGITAL_PINS        46
-#define NUM_ANALOG_INPUTS       15
-
-#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 48) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 46)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
diff --git a/variants/m5stack_core/pins_arduino.h b/variants/m5stack_core/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        20
-#define NUM_ANALOG_INPUTS       16
-
-#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 34)
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
diff --git a/variants/m5stack_core2/pins_arduino.h b/variants/m5stack_core2/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        20
-#define NUM_ANALOG_INPUTS       16
-
-#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 34)
-
 #define TX2 14
 #define RX2 13
 
diff --git a/variants/m5stack_coreink/pins_arduino.h b/variants/m5stack_coreink/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
-
-#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 34)
-
 #define TX2 14
 #define RX2 13
 
diff --git a/variants/m5stack_cores3/pins_arduino.h b/variants/m5stack_cores3/pins_arduino.h
@@ -7,10 +7,6 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS        48
-#define NUM_ANALOG_INPUTS       20
-
 // Some boards have too low voltage on this pin (board design bug)
 // Use different pin with 3V and connect with 48
 // 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;
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
-#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 48) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 46)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
diff --git a/variants/m5stack_fire/pins_arduino.h b/variants/m5stack_fire/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        20
-#define NUM_ANALOG_INPUTS       16
-
-#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 34)
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
diff --git a/variants/m5stack_paper/pins_arduino.h b/variants/m5stack_paper/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
-
-#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 34)
-
 #define TX2 14
 #define RX2 13
 
diff --git a/variants/m5stack_poe_cam/pins_arduino.h b/variants/m5stack_poe_cam/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
-
-#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 34)
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
diff --git a/variants/m5stack_stamp_c3/pins_arduino.h b/variants/m5stack_stamp_c3/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 22
-#define NUM_DIGITAL_PINS        22
-#define NUM_ANALOG_INPUTS       6
-
-#define analogInputToDigitalPin(p) (((p) < NUM_ANALOG_INPUTS) ? (esp32_adc2gpio[(p)]) : -1)
-#define digitalPinToInterrupt(p)   (((p) < NUM_DIGITAL_PINS) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < EXTERNAL_NUM_INTERRUPTS)
-
 static const uint8_t TX = 21;
 static const uint8_t RX = 20;
 
diff --git a/variants/m5stack_stamp_pico/pins_arduino.h b/variants/m5stack_stamp_pico/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
-
-#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 34)
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
diff --git a/variants/m5stack_stamp_s3/pins_arduino.h b/variants/m5stack_stamp_s3/pins_arduino.h
@@ -7,14 +7,6 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 23
-#define NUM_DIGITAL_PINS        46
-#define NUM_ANALOG_INPUTS       15
-
-#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 48) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 46)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
diff --git a/variants/m5stack_station/pins_arduino.h b/variants/m5stack_station/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        20
-#define NUM_ANALOG_INPUTS       16
-
-#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 34)
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
diff --git a/variants/m5stack_stickc/pins_arduino.h b/variants/m5stack_stickc/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
-
-#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 34)
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
diff --git a/variants/m5stack_stickc_plus/pins_arduino.h b/variants/m5stack_stickc_plus/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
-
-#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 34)
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
diff --git a/variants/m5stack_stickc_plus2/pins_arduino.h b/variants/m5stack_stickc_plus2/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
-
-#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 34)
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
diff --git a/variants/m5stack_timer_cam/pins_arduino.h b/variants/m5stack_timer_cam/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
-
-#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 34)
-
 static const uint8_t LED_BUILTIN = 2;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 
diff --git a/variants/m5stack_tough/pins_arduino.h b/variants/m5stack_tough/pins_arduino.h
@@ -3,17 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        20
-#define NUM_ANALOG_INPUTS       16
-
-#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 34)
-
-#define TX2 14
-#define RX2 13
-
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
diff --git a/variants/m5stack_unit_cam/pins_arduino.h b/variants/m5stack_unit_cam/pins_arduino.h
@@ -3,14 +3,6 @@
 
 #include <stdint.h>
 
-#define EXTERNAL_NUM_INTERRUPTS 16
-#define NUM_DIGITAL_PINS        40
-#define NUM_ANALOG_INPUTS       16
-
-#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 40) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 34)
-
 static const uint8_t LED_BUILTIN = 4;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 
diff --git a/variants/m5stack_unit_cams3/pins_arduino.h b/variants/m5stack_unit_cams3/pins_arduino.h
@@ -7,14 +7,6 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 23
-#define NUM_DIGITAL_PINS        46
-#define NUM_ANALOG_INPUTS       15
-
-#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
-#define digitalPinToInterrupt(p)   (((p) < 48) ? (p) : -1)
-#define digitalPinHasPWM(p)        (p < 46)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
