Skip to content

Commit 6fbd03b

Browse files
giulcioffigiulcioffi
committed
Update pinout
Rename I2C2 to ISC1 to match Wire1 definition
1 parent 318315f commit 6fbd03b

File tree

2 files changed

+56
-70
lines changed

2 files changed

+56
-70
lines changed

Diff for: ‎variants/NICLA_VISION/pins_arduino.h

+29-38
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,10 @@ extern PinName digitalPinToPinName(pin_size_t P);
3636
#define PIN_A0 (15u)
3737
#define PIN_A1 (16u)
3838
#define PIN_A2 (17u)
39-
#define PIN_A3 (18u)
40-
#define PIN_A4 (19u)
41-
#define PIN_A5 (20u)
42-
#define PIN_A6 (21u)
43-
#define PIN_A7 (22u)
4439

4540
static const uint8_t A0 = PIN_A0;
4641
static const uint8_t A1 = PIN_A1;
4742
static const uint8_t A2 = PIN_A2;
48-
static const uint8_t A3 = PIN_A3;
49-
static const uint8_t A4 = PIN_A4;
50-
static const uint8_t A5 = PIN_A5;
51-
static const uint8_t A6 = PIN_A6;
52-
static const uint8_t A7 = PIN_A7;
5343
#define ADC_RESOLUTION 12
5444

5545
// Digital pins
@@ -77,19 +67,21 @@ static const uint8_t A7 = PIN_A7;
7767
#define D20 (u20)
7868
#define D21 (u21)
7969

80-
//DACs
81-
#define DAC (A6)
82-
8370
// Serial
84-
#define PIN_SERIAL_RX (13ul)
85-
#define PIN_SERIAL_TX (14ul)
71+
#define PIN_SERIAL_RX (2ul)
72+
#define PIN_SERIAL_TX (1ul)
8673

8774
// SPI
8875
#define PIN_SPI_MISO (10u)
8976
#define PIN_SPI_MOSI (8u)
9077
#define PIN_SPI_SCK (9u)
9178
#define PIN_SPI_SS (7u)
9279

80+
#define PIN_SPI_MISO1 (22u)
81+
#define PIN_SPI_MOSI1 (20u)
82+
#define PIN_SPI_SCK1 (21u)
83+
#define PIN_SPI_SS1 (6u)
84+
9385
static const uint8_t SS = PIN_SPI_SS; // SPI Slave SS not used. Set here only for reference.
9486
static const uint8_t MOSI = PIN_SPI_MOSI;
9587
static const uint8_t MISO = PIN_SPI_MISO;
@@ -99,44 +91,50 @@ static const uint8_t SCK = PIN_SPI_SCK;
9991
#define PIN_WIRE_SDA (11u)
10092
#define PIN_WIRE_SCL (12u)
10193

102-
#define SERIAL_HOWMANY 3
94+
#define SERIAL_HOWMANY 2
10395
#define SERIAL1_TX (digitalPinToPinName(PIN_SERIAL_TX))
10496
#define SERIAL1_RX (digitalPinToPinName(PIN_SERIAL_RX))
10597

106-
#define SERIAL2_TX PA_15
107-
#define SERIAL2_RX PF_6
108-
#define SERIAL2_RTS PF_8
109-
#define SERIAL2_CTS PF_9
110-
111-
#define SERIAL3_TX (PJ_8)
112-
#define SERIAL3_RX (PJ_9)
98+
#define SERIAL2_TX PB_6
99+
#define SERIAL2_RX PB_7
100+
#define SERIAL2_RTS PA_12
101+
#define SERIAL2_CTS PA_11
113102

114103
#define SERIAL_CDC 1
115104
#define HAS_UNIQUE_ISERIAL_DESCRIPTOR
116105
#define BOARD_VENDORID 0x2341
117-
#define BOARD_PRODUCTID 0x025b
118-
#define BOARD_NAME "Envie M7"
106+
#define BOARD_PRODUCTID 0x025f
107+
#define BOARD_NAME "Nicla Vision"
119108

120109
#define DFU_MAGIC_SERIAL_ONLY_RESET 0xb0
121110

122111
uint8_t getUniqueSerialNumber(uint8_t* name);
123112
void _ontouch1200bps_();
124113

125-
#define WIRE_HOWMANY 2
114+
#define WIRE_HOWMANY 3
126115

127116
#define I2C_SDA (digitalPinToPinName(PIN_WIRE_SDA))
128117
#define I2C_SCL (digitalPinToPinName(PIN_WIRE_SCL))
129118

130-
#define I2C_SDA_INTERNAL (PB_7)
131-
#define I2C_SCL_INTERNAL (PB_6)
132-
#define I2C_SDA1 I2C_SDA_INTERNAL
133-
#define I2C_SCL1 I2C_SCL_INTERNAL
119+
//#define I2C_SDA_INTERNAL (PB_7)
120+
//#define I2C_SCL_INTERNAL (PB_6)
121+
#define I2C_SDA1 (13u)
122+
#define I2C_SCL1 (14u)
123+
124+
#define I2C_SDA3 (18u)
125+
#define I2C_SCL3 (19u)
134126

135-
#define SPI_HOWMANY 1
127+
#define SPI_HOWMANY 2
136128

137129
#define SPI_MISO (digitalPinToPinName(PIN_SPI_MISO))
138130
#define SPI_MOSI (digitalPinToPinName(PIN_SPI_MOSI))
139131
#define SPI_SCK (digitalPinToPinName(PIN_SPI_SCK))
132+
#define SPI_SS (digitalPinToPinName(PIN_SPI_SS))
133+
134+
#define SPI_MISO1 (digitalPinToPinName(PIN_SPI_MISO1))
135+
#define SPI_MOSI1 (digitalPinToPinName(PIN_SPI_MOSI1))
136+
#define SPI_SCK1 (digitalPinToPinName(PIN_SPI_SCK1))
137+
#define SPI_SS1 (digitalPinToPinName(PIN_SPI_SS1))
140138

141139
#define digitalPinToPort(P) (digitalPinToPinName(P)/32)
142140

@@ -145,13 +143,6 @@ void _ontouch1200bps_();
145143
#define SERIAL_PORT_HARDWARE Serial1
146144
#define SERIAL_PORT_HARDWARE_OPEN Serial2
147145

148-
#define SerialLoRa Serial3
149-
#define LORA_BOOT0 (PG_7)
150-
#define LORA_RESET (PC_7)
151-
#define LORA_IRQ_DUMB (PJ_11)
152-
153-
#define CRYPTO_WIRE Wire1
154-
155146
#define USB_MAX_POWER (500)
156147

157148
#endif //__PINS_ARDUINO__

Diff for: ‎variants/NICLA_VISION/variant.cpp

+27-32
Original file line numberDiff line numberDiff line change
@@ -4,50 +4,45 @@
44
RTC_HandleTypeDef RTCHandle;
55

66
AnalogPinDescription g_AAnalogPinDescription[] = {
7-
{ PA_0C, NULL }, // A0 ADC2_INP0
8-
{ PA_1C, NULL }, // A1 ADC2_INP1
9-
{ PC_2C, NULL }, // A2 ADC3_INP0
10-
{ PC_3C, NULL }, // A3 ADC3_INP1
11-
{ PC_2_ALT0, NULL }, // A4 ADC1_INP12
12-
{ PC_3_ALT2, NULL }, // A5 ADC2_INP13
13-
{ PA_4, NULL }, // A6 ADC1_INP18
14-
{ PA_6, NULL } // A7 ADC1_INP7
7+
{ PC_4, NULL }, // A0 ADC2_INP0
8+
{ PF_13, NULL }, // A1 ADC2_INP1
9+
{ PF_3 , NULL } // A2 ADC3_INP0
1510
};
1611

1712
PinDescription g_APinDescription[] = {
1813
// D0 - D7
19-
{ PH_15, NULL, NULL, NULL }, // D0
20-
{ PK_1, NULL, NULL, NULL }, // D1
21-
{ PJ_11, NULL, NULL, NULL }, // D2
22-
{ PG_7, NULL, NULL, NULL }, // D3
14+
{ PG_12, NULL, NULL, NULL }, // D0
15+
{ PA_9, NULL, NULL, NULL }, // D1 TX
16+
{ PA_10, NULL, NULL, NULL }, // D2 RX
17+
{ PG_1, NULL, NULL, NULL }, // D3
2318
{ PC_7, NULL, NULL, NULL }, // D4
2419
{ PC_6, NULL, NULL, NULL }, // D5
25-
{ PA_8, NULL, NULL, NULL }, // D6
26-
{ PI_0, NULL, NULL, NULL }, // D7
20+
{ PF_6, NULL, NULL, NULL }, // SPI_SS1
21+
{ PE_11, NULL, NULL, NULL }, // SPI_SS
2722

2823
// D8 - D14
29-
{ PC_3, NULL, NULL, NULL }, // D8
30-
{ PI_1, NULL, NULL, NULL }, // D9
31-
{ PC_2, NULL, NULL, NULL }, // D10
32-
{ PH_8, NULL, NULL, NULL }, // D11
33-
{ PH_7, NULL, NULL, NULL }, // D12
34-
{ PA_10, NULL, NULL, NULL }, // D13
35-
{ PA_9, NULL, NULL, NULL }, // D14
24+
{ PE_14, NULL, NULL, NULL }, // SPI_COPI
25+
{ PE_12, NULL, NULL, NULL }, // SPI_SCK
26+
{ PE_13, NULL, NULL, NULL }, // SPI_CIPO
27+
{ PB_9, NULL, NULL, NULL }, // SDA
28+
{ PB_8, NULL, NULL, NULL }, // SCL
29+
{ PF_0, NULL, NULL, NULL }, // SDA2
30+
{ PF_1, NULL, NULL, NULL }, // SCL2
3631

3732
// A0 - A6
38-
{ PA_0C, NULL, NULL, NULL }, // A0 ADC2_INP0
39-
{ PA_1C, NULL, NULL, NULL }, // A1 ADC2_INP1
40-
{ PC_2C, NULL, NULL, NULL }, // A2 ADC3_INP0
41-
{ PC_3C, NULL, NULL, NULL }, // A3 ADC3_INP1
42-
{ PC_2_ALT0, NULL, NULL, NULL }, // A4 ADC1_INP12
43-
{ PC_3_ALT0, NULL, NULL, NULL }, // A5 ADC1_INP13
44-
{ PA_4, NULL, NULL, NULL }, // A6 ADC1_INP18
45-
{ PA_6, NULL, NULL, NULL }, // A7 ADC1_INP7
33+
{ PC_4, NULL, NULL, NULL }, // A0 ADC2_INP0
34+
{ PF_13, NULL, NULL, NULL }, // A1 ADC2_INP1
35+
{ PF_3, NULL, NULL, NULL }, // A2 ADC3_INP0
36+
{ PC_9, NULL, NULL, NULL }, // SDA3
37+
{ PA_8, NULL, NULL, NULL }, // SCL3
38+
{ PF_11, NULL, NULL, NULL }, // SPI_COPI1
39+
{ PF_7, NULL, NULL, NULL }, // SPI_SCK1
40+
{ PF_8, NULL, NULL, NULL }, // SPI_CIPO1
4641

4742
// LEDS
48-
{ PK_5, NULL, NULL, NULL }, // LEDR
49-
{ PK_6, NULL, NULL, NULL }, // LEDG
50-
{ PK_7, NULL, NULL, NULL }, // LEDB
43+
{ PE_3, NULL, NULL, NULL }, // LEDR
44+
{ PC_13, NULL, NULL, NULL }, // LEDG
45+
{ PF_4, NULL, NULL, NULL }, // LEDB
5146

5247
{ PA_0, NULL, NULL, NULL },
5348
{ PA_1, NULL, NULL, NULL },

0 commit comments

Comments
 (0)