Skip to content

Commit 57f28e7

Browse files
ci(pre-commit): Apply automatic fixes
1 parent 8b22e15 commit 57f28e7

File tree

2 files changed

+68
-71
lines changed

2 files changed

+68
-71
lines changed

Diff for: variants/lilygo_twatch_s3/pins_arduino.h

+32-33
Original file line numberDiff line numberDiff line change
@@ -8,38 +8,37 @@
88
#define USB_MANUFACTURER "LILYGO"
99
#define USB_PRODUCT "T-Watch-S3"
1010

11+
#define DISP_WIDTH (240)
12+
#define DISP_HEIGHT (240)
1113

12-
#define DISP_WIDTH (240)
13-
#define DISP_HEIGHT (240)
14-
15-
#define DISP_MOSI (13)
16-
#define DISP_MISO (-1)
17-
#define DISP_SCK (18)
18-
#define DISP_RST (-1)
19-
#define DISP_CS (12)
20-
#define DISP_DC (38)
21-
#define DISP_BL (45)
14+
#define DISP_MOSI (13)
15+
#define DISP_MISO (-1)
16+
#define DISP_SCK (18)
17+
#define DISP_RST (-1)
18+
#define DISP_CS (12)
19+
#define DISP_DC (38)
20+
#define DISP_BL (45)
2221

2322
// touch screen
24-
#define TP_INT (16)
25-
#define TP_SDA (39)
26-
#define TP_SCL (40)
23+
#define TP_INT (16)
24+
#define TP_SDA (39)
25+
#define TP_SCL (40)
2726

2827
// Interrupt IO port
29-
#define RTC_INT (17)
30-
#define PMU_INT (21)
31-
#define SENSOR_INT (14)
28+
#define RTC_INT (17)
29+
#define PMU_INT (21)
30+
#define SENSOR_INT (14)
3231

3332
// PDM microphone
34-
#define MIC_SCK (44)
35-
#define MIC_DAT (47)
33+
#define MIC_SCK (44)
34+
#define MIC_DAT (47)
3635

37-
// MAX98357A
38-
#define I2S_BCLK (48)
39-
#define I2S_WCLK (15)
40-
#define I2S_DOUT (46)
36+
// MAX98357A
37+
#define I2S_BCLK (48)
38+
#define I2S_WCLK (15)
39+
#define I2S_DOUT (46)
4140

42-
#define IR_SEND (2)
41+
#define IR_SEND (2)
4342

4443
// TX, RX pin connected to GPS
4544
static const uint8_t TX = 42;
@@ -56,15 +55,15 @@ static const uint8_t MISO = 4;
5655
static const uint8_t SCK = 3;
5756

5857
// LoRa and SD card share SPI bus
59-
#define LORA_SCK (SCK) // share spi bus
60-
#define LORA_MISO (MISO) // share spi bus
61-
#define LORA_MOSI (MOSI) // share spi bus
62-
#define LORA_CS (5)
63-
#define LORA_RST (8)
64-
#define LORA_BUSY (7)
65-
#define LORA_IRQ (9)
66-
67-
#define GPS_TX (TX)
68-
#define GPS_RX (RX)
58+
#define LORA_SCK (SCK) // share spi bus
59+
#define LORA_MISO (MISO) // share spi bus
60+
#define LORA_MOSI (MOSI) // share spi bus
61+
#define LORA_CS (5)
62+
#define LORA_RST (8)
63+
#define LORA_BUSY (7)
64+
#define LORA_IRQ (9)
65+
66+
#define GPS_TX (TX)
67+
#define GPS_RX (RX)
6968

7069
#endif /* Pins_Arduino_h */

Diff for: variants/lilygo_twatch_ultra/pins_arduino.h

+36-38
Original file line numberDiff line numberDiff line change
@@ -3,48 +3,47 @@
33

44
#include <stdint.h>
55

6-
76
#ifndef digitalPinToInterrupt
8-
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
7+
#define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1)
98
#endif
109

1110
#define USB_VID 0x303a
1211
#define USB_PID 0x8227
1312
#define USB_MANUFACTURER "LILYGO"
1413
#define USB_PRODUCT "T-Watch-Ultra"
1514

16-
#define DISP_WIDTH (240)
17-
#define DISP_HEIGHT (296)
15+
#define DISP_WIDTH (240)
16+
#define DISP_HEIGHT (296)
1817

19-
#define DISP_D0 (39)
20-
#define DISP_D1 (40)
21-
#define DISP_D2 (45)
22-
#define DISP_D3 (42)
23-
#define DISP_SCK (41)
24-
#define DISP_RST (6)
25-
#define DISP_CS (38)
26-
#define DISP_TE (37)
18+
#define DISP_D0 (39)
19+
#define DISP_D1 (40)
20+
#define DISP_D2 (45)
21+
#define DISP_D3 (42)
22+
#define DISP_SCK (41)
23+
#define DISP_RST (6)
24+
#define DISP_CS (38)
25+
#define DISP_TE (37)
2726

2827
// touch screen
29-
#define TP_INT (12)
30-
#define TP_RST (46)
28+
#define TP_INT (12)
29+
#define TP_RST (46)
3130
// Interrupt IO port
32-
#define RTC_INT (1)
33-
#define PMU_INT (7)
34-
#define NFC_INT (5)
35-
#define SENSOR_INT (8)
36-
#define NFC_RST (4)
31+
#define RTC_INT (1)
32+
#define PMU_INT (7)
33+
#define NFC_INT (5)
34+
#define SENSOR_INT (8)
35+
#define NFC_RST (4)
3736

3837
// PDM microphone
39-
#define MIC_SCK (17)
40-
#define MIC_DAT (18)
38+
#define MIC_SCK (17)
39+
#define MIC_DAT (18)
4140

42-
// MAX98357A
43-
#define I2S_BCLK (9)
44-
#define I2S_WCLK (10)
45-
#define I2S_DOUT (11)
41+
// MAX98357A
42+
#define I2S_BCLK (9)
43+
#define I2S_WCLK (10)
44+
#define I2S_DOUT (11)
4645

47-
#define SD_CS (21)
46+
#define SD_CS (21)
4847

4948
// TX, RX pin connected to GPS
5049
static const uint8_t TX = 43;
@@ -60,20 +59,19 @@ static const uint8_t MOSI = 34;
6059
static const uint8_t MISO = 33;
6160
static const uint8_t SCK = 35;
6261

63-
#define GPS_TX (TX)
64-
#define GPS_RX (RX)
62+
#define GPS_TX (TX)
63+
#define GPS_RX (RX)
6564

66-
#define TP_SDA (SDA)
67-
#define TP_SCL (SCL)
65+
#define TP_SDA (SDA)
66+
#define TP_SCL (SCL)
6867

6968
// LoRa and SD card share SPI bus
70-
#define LORA_SCK (SCK) // share spi bus
71-
#define LORA_MISO (MISO) // share spi bus
72-
#define LORA_MOSI (MOSI) // share spi bus
73-
#define LORA_CS (36)
74-
#define LORA_RST (47)
75-
#define LORA_BUSY (48)
76-
#define LORA_IRQ (14)
77-
69+
#define LORA_SCK (SCK) // share spi bus
70+
#define LORA_MISO (MISO) // share spi bus
71+
#define LORA_MOSI (MOSI) // share spi bus
72+
#define LORA_CS (36)
73+
#define LORA_RST (47)
74+
#define LORA_BUSY (48)
75+
#define LORA_IRQ (14)
7876

7977
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)