Skip to content

Commit 1ab14b2

Browse files
add pinout file (pins_mc)
1 parent c091f4a commit 1ab14b2

15 files changed

+170
-66
lines changed

Diff for: src/AnalogInClass.cpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
#include "AnalogInClass.h"
99

1010
/* Private defines -----------------------------------------------------------*/
11-
#define CH0_IN1 PD_4
12-
#define CH0_IN2 PD_5
13-
#define CH0_IN3 PE_3
14-
#define CH0_IN4 PG_3
15-
16-
#define CH1_IN1 PD_7
17-
#define CH1_IN2 PH_6
18-
#define CH1_IN3 PJ_7
19-
#define CH1_IN4 PH_15
20-
21-
#define CH2_IN1 PH_10
22-
#define CH2_IN2 PA_4
23-
#define CH2_IN3 PA_8
24-
#define CH2_IN4 PC_6
11+
#define CH0_IN1 MC_AI_CH0_IN1_PIN
12+
#define CH0_IN2 MC_AI_CH0_IN2_PIN
13+
#define CH0_IN3 MC_AI_CH0_IN3_PIN
14+
#define CH0_IN4 MC_AI_CH0_IN4_PIN
15+
16+
#define CH1_IN1 MC_AI_CH1_IN1_PIN
17+
#define CH1_IN2 MC_AI_CH1_IN2_PIN
18+
#define CH1_IN3 MC_AI_CH1_IN3_PIN
19+
#define CH1_IN4 MC_AI_CH1_IN4_PIN
20+
21+
#define CH2_IN1 MC_AI_CH2_IN1_PIN
22+
#define CH2_IN2 MC_AI_CH2_IN2_PIN
23+
#define CH2_IN3 MC_AI_CH2_IN3_PIN
24+
#define CH2_IN4 MC_AI_CH2_IN4_PIN
2525

2626
/* Functions -----------------------------------------------------------------*/
2727
AnalogInClass::AnalogInClass(PinName ai0_pin, PinName ai1_pin, PinName ai2_pin)

Diff for: src/AnalogInClass.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
/* Includes ------------------------------------------------------------------*/
1414
#include <Arduino.h>
1515
#include <mbed.h>
16+
#include "pins_mc.h"
1617

1718
/* Exported defines ----------------------------------------------------------*/
1819

@@ -36,7 +37,7 @@ class AnalogInClass {
3637
* @param ai1_pin The analog pin number of the channel 1
3738
* @param ai2_pin The analog pin number of the channel 2
3839
*/
39-
AnalogInClass(PinName ai0_pin = PC_3C, PinName ai1_pin = PC_2C, PinName ai2_pin = PA_1C);
40+
AnalogInClass(PinName ai0_pin = MC_AI_AI0_PIN, PinName ai1_pin = MC_AI_AI1_PIN, PinName ai2_pin = MC_AI_AI2_PIN);
4041

4142
/**
4243
* @brief Destruct the AnalogInClass object.

Diff for: src/AnalogOutClass.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/* Includes -------------------------------------------------------------------*/
1313
#include <Arduino.h>
1414
#include <mbed.h>
15+
#include "pins_mc.h"
1516

1617
/* Class ----------------------------------------------------------------------*/
1718

@@ -29,7 +30,7 @@ class AnalogOutClass {
2930
* @param ao2_pin The analog pin number of the channel 2
3031
* @param ao3_pin The analog pin number of the channel 2
3132
*/
32-
AnalogOutClass(PinName ao0_pin = PJ_11, PinName ao1_pin = PK_1, PinName ao2_pin = PG_7, PinName ao3_pin = PC_7);
33+
AnalogOutClass(PinName ao0_pin = MC_AO_AO0_PIN, PinName ao1_pin = MC_AO_AO1_PIN, PinName ao2_pin = MC_AO_AO2_PIN, PinName ao3_pin = MC_AO_AO3_PIN);
3334

3435
/**
3536
* @brief Destruct the AnalogOutClass object.

Diff for: src/CANCommClass.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @brief Header file for the CANCommClass used to initialize and interact with the CAN Bus communication protocol on the Portenta Machine Control board.
55
*
66
* This library provides a class to manage the CAN Bus communication protocol of the Portenta Machine Control board.
7-
* It allows initializing and interacting with the CAN Bus protocol. The library also initializes the corresponding LED for CAN.
7+
* It allows initializing and interacting with the CAN Bus protocol.
88
*/
99

1010
#ifndef __CAN_COMM_CLASS_H
@@ -15,6 +15,7 @@
1515
#include <pinDefinitions.h>
1616
#include <mbed.h>
1717
#include <Arduino_CAN.h>
18+
#include "pins_mc.h"
1819

1920
/* Class ----------------------------------------------------------------------*/
2021

@@ -35,7 +36,7 @@ class CANCommClass {
3536
* @param can_rx_pin The pin for receiving data on the CAN Bus.
3637
* @param can_stb_pin The pin to control the standby (low-power) mode of the CAN transceiver.
3738
*/
38-
CANCommClass(PinName can_tx_pin = PB_8, PinName can_rx_pin = PH_13, PinName can_stb_pin = PA_13);
39+
CANCommClass(PinName can_tx_pin = MC_CAN_TX_PIN, PinName can_rx_pin = MC_CAN_RX_PIN, PinName can_stb_pin = MC_CAN_STB_PIN);
3940

4041
/**
4142
* @brief Destruct the CANCommClass object.

Diff for: src/DigitalOutputsClass.h

+10-9
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/* Includes -------------------------------------------------------------------*/
1313
#include <Arduino.h>
1414
#include <mbed.h>
15+
#include "pins_mc.h"
1516

1617
/* Class ----------------------------------------------------------------------*/
1718

@@ -36,15 +37,15 @@ class DigitalOutputsClass {
3637
* @param do7_pin The pin number for the digital output channel 7.
3738
* @param latch_pin The pin number for the latch mode control.
3839
*/
39-
DigitalOutputsClass(PinName do0_pin = PI_6,
40-
PinName do1_pin = PH_9,
41-
PinName do2_pin = PJ_9,
42-
PinName do3_pin = PE_2,
43-
PinName do4_pin = PI_3,
44-
PinName do5_pin = PI_2,
45-
PinName do6_pin = PD_3,
46-
PinName do7_pin = PA_14,
47-
PinName latch_pin = PB_2);
40+
DigitalOutputsClass(PinName do0_pin = MC_DO_DO0_PIN,
41+
PinName do1_pin = MC_DO_DO1_PIN,
42+
PinName do2_pin = MC_DO_DO2_PIN,
43+
PinName do3_pin = MC_DO_DO3_PIN,
44+
PinName do4_pin = MC_DO_DO4_PIN,
45+
PinName do5_pin = MC_DO_DO5_PIN,
46+
PinName do6_pin = MC_DO_DO6_PIN,
47+
PinName do7_pin = MC_DO_DO7_PIN,
48+
PinName latch_pin = MC_DO_LATCH_PIN);
4849

4950
/**
5051
* @brief Destruct the DigitalOutputsClass object.

Diff for: src/EncoderClass.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "utility/QEI/QEI.h"
1717
#include <Arduino.h>
1818
#include <mbed.h>
19+
#include "pins_mc.h"
1920

2021
/* Class ----------------------------------------------------------------------*/
2122

@@ -42,8 +43,8 @@ class EncoderClass {
4243
* @param enc1_B_pin Pin assignment for encoder 1 channel B (default: PI_7).
4344
* @param enc1_I_pin Pin assignment for encoder 1 Index channel (default: PJ_10).
4445
*/
45-
EncoderClass(PinName enc0_A_pin = PJ_8, PinName enc0_B_pin = PH_12, PinName enc0_I_pin = PH_11,
46-
PinName enc1_A_pin = PC_13, PinName enc1_B_pin = PI_7, PinName enc1_I_pin = PJ_10);
46+
EncoderClass(PinName enc0_A_pin = MC_ENC_0A_PIN, PinName enc0_B_pin = MC_ENC_0B_PIN, PinName enc0_I_pin = MC_ENC_0I_PIN,
47+
PinName enc1_A_pin = MC_ENC_1A_PIN, PinName enc1_B_pin = MC_ENC_1B_PIN, PinName enc1_I_pin = MC_ENC_1I_PIN);
4748

4849
/**
4950
* @brief Destruct the EncoderClass object.

Diff for: src/ProgrammableDIOClass.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "utility/ioexpander/ArduinoIOExpander.h"
1414
#include <Arduino.h>
1515
#include <mbed.h>
16+
#include "pins_mc.h"
1617

1718
/* Class ----------------------------------------------------------------------*/
1819

@@ -31,7 +32,7 @@ class ProgrammableDIOClass : public ArduinoIOExpanderClass {
3132
*
3233
* @param latch_pin The pin number for the latch mode control.
3334
*/
34-
ProgrammableDIOClass(PinName latch_pin = PH_14);
35+
ProgrammableDIOClass(PinName latch_pin = MC_PDIO_LATCH_PIN);
3536

3637
/**
3738
* @brief Destruct the ProgrammableDIOClass object.

Diff for: src/RS485CommClass.cpp

+18-18
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ RS485CommClass::~RS485CommClass()
1919

2020
void RS485CommClass::begin(unsigned long baudrate, int predelay, int postdelay) {
2121
/* Pinout configuration */
22-
pinMode(PinNameToIndex(PA_0), OUTPUT);
23-
pinMode(PinNameToIndex(PI_9), OUTPUT);
22+
pinMode(PinNameToIndex(MC_RS485_TX_PIN), OUTPUT);
23+
pinMode(PinNameToIndex(MC_RS485_RX_PIN), OUTPUT);
2424

25-
pinMode(PinNameToIndex(PG_9), OUTPUT);
26-
pinMode(PinNameToIndex(PA_10), OUTPUT);
27-
pinMode(PinNameToIndex(PI_15), OUTPUT);
28-
pinMode(PinNameToIndex(PI_14), OUTPUT);
29-
pinMode(PinNameToIndex(PG_14), OUTPUT);
30-
pinMode(PinNameToIndex(PA_9), OUTPUT);
25+
pinMode(PinNameToIndex(MC_RS485_EN_PIN), OUTPUT);
26+
pinMode(PinNameToIndex(MC_RS485_RS232_PIN), OUTPUT);
27+
pinMode(PinNameToIndex(MC_RS485_FDTERM_PIN), OUTPUT);
28+
pinMode(PinNameToIndex(MC_RS485_TERM_PIN), OUTPUT);
29+
pinMode(PinNameToIndex(MC_RS485_SLEW_PIN), OUTPUT);
30+
pinMode(PinNameToIndex(MC_RS485_HF_PIN), OUTPUT);
3131

3232
/* Turn-off LEDs RS485 */
33-
digitalWrite(PinNameToIndex(PA_0), LOW);
34-
digitalWrite(PinNameToIndex(PI_9), LOW);
33+
digitalWrite(PinNameToIndex(MC_RS485_TX_PIN), LOW);
34+
digitalWrite(PinNameToIndex(MC_RS485_RX_PIN), LOW);
3535

3636
/* Set defaults for RS485 */
3737
_disable();
@@ -58,23 +58,23 @@ void RS485CommClass::end() {
5858
}
5959

6060
void RS485CommClass::setModeRS232(bool enable) {
61-
digitalWrite(PinNameToIndex(PA_10), enable ? LOW : HIGH);
61+
digitalWrite(PinNameToIndex(MC_RS485_RS232_PIN), enable ? LOW : HIGH);
6262
}
6363

6464
void RS485CommClass::setYZTerm(bool enable) {
65-
digitalWrite(PinNameToIndex(PI_15), enable ? HIGH : LOW);
65+
digitalWrite(PinNameToIndex(MC_RS485_FDTERM_PIN), enable ? HIGH : LOW);
6666
}
6767

6868
void RS485CommClass::setABTerm(bool enable) {
69-
digitalWrite(PinNameToIndex(PI_14), enable ? HIGH : LOW);
69+
digitalWrite(PinNameToIndex(MC_RS485_TERM_PIN), enable ? HIGH : LOW);
7070
}
7171

7272
void RS485CommClass::setSlew(bool enable) {
73-
digitalWrite(PinNameToIndex(PG_14), enable ? LOW : HIGH);
73+
digitalWrite(PinNameToIndex(MC_RS485_SLEW_PIN), enable ? LOW : HIGH);
7474
}
7575

7676
void RS485CommClass::setFullDuplex(bool enable) {
77-
digitalWrite(PinNameToIndex(PA_9), enable ? LOW : HIGH);
77+
digitalWrite(PinNameToIndex(MC_RS485_HF_PIN), enable ? LOW : HIGH);
7878
if (enable) {
7979
// RS485 Full Duplex require YZ and AB 120 Ohm termination enabled
8080
setYZTerm(true);
@@ -83,13 +83,13 @@ void RS485CommClass::setFullDuplex(bool enable) {
8383
}
8484

8585
void RS485CommClass::_enable() {
86-
digitalWrite(PinNameToIndex(PG_9), HIGH);
86+
digitalWrite(PinNameToIndex(MC_RS485_EN_PIN), HIGH);
8787
}
8888

8989
void RS485CommClass::_disable() {
90-
digitalWrite(PinNameToIndex(PG_9), LOW);
90+
digitalWrite(PinNameToIndex(MC_RS485_EN_PIN), LOW);
9191
}
9292

93-
arduino::UART _UART4_ {PA_0, PI_9, NC, NC};
93+
arduino::UART _UART4_ {MC_RS485_TX_PIN, MC_RS485_RX_PIN, NC, NC};
9494
RS485CommClass MachineControl_RS485Comm(_UART4_);
9595
/**** END OF FILE ****/

Diff for: src/RS485CommClass.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <ArduinoRS485.h>
1515
#include <Arduino.h>
1616
#include <mbed.h>
17+
#include "pins_mc.h"
1718

1819
/* Class ----------------------------------------------------------------------*/
1920

@@ -36,7 +37,8 @@ class RS485CommClass : public RS485Class {
3637
* @param rs_de_pin The pin for enabling the RS485 driver.
3738
* @param rs_re_pin The pin for setting the RS485 driver in receive or transmit mode.
3839
*/
39-
RS485CommClass(arduino::UART& uart_itf, PinName rs_tx_pin = PA_0, PinName rs_de_pin = PI_13, PinName rs_re_pin = PI_10);
40+
RS485CommClass(arduino::UART& uart_itf, PinName rs_tx_pin = MC_RS485_TX_PIN, PinName rs_de_pin = MC_RS485_DE_PIN, PinName rs_re_pin = MC_RS485_RE_PIN);
41+
4042

4143
/**
4244
* @brief Destruct the RS485CommClass object.

Diff for: src/RTDTempProbeClass.h

+6-5
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "utility/THERMOCOUPLE/MAX31855.h"
1616
#include <Arduino.h>
1717
#include <mbed.h>
18+
#include "pins_mc.h"
1819

1920
/* Class ----------------------------------------------------------------------*/
2021

@@ -38,11 +39,11 @@ class RTDTempProbeClass: public MAX31865Class {
3839
* @param ch_sel2_pin The pin number for the third channel selection bit.
3940
* @param rtd_th_pin The pin number for the RTD connection.
4041
*/
41-
RTDTempProbeClass(PinName rtd_cs_pin = PA_6,
42-
PinName ch_sel0_pin = PD_6,
43-
PinName ch_sel1_pin = PI_4,
44-
PinName ch_sel2_pin = PG_10,
45-
PinName rtd_th_pin = PC_15);
42+
RTDTempProbeClass(PinName rtd_cs_pin = MC_RTD_CS_PIN,
43+
PinName ch_sel0_pin = MC_RTD_SEL0_PIN,
44+
PinName ch_sel1_pin = MC_RTD_SEL1_PIN,
45+
PinName ch_sel2_pin = MC_RTD_SEL2_PIN,
46+
PinName rtd_th_pin = MC_RTD_TH_PIN);
4647

4748
/**
4849
* @brief Destruct the RTDTempProbeClass object.

Diff for: src/RtcControllerClass.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "utility/RTC/PCF8563T.h"
1515
#include <Arduino.h>
1616
#include <mbed.h>
17+
#include "pins_mc.h"
1718

1819
/* Class ----------------------------------------------------------------------*/
1920

@@ -33,7 +34,7 @@ class RtcControllerClass : public PCF8563TClass {
3334
*
3435
* @param int_pin The pin number for the interrupt pin (default is PB_9).
3536
*/
36-
RtcControllerClass(PinName int_pin = PB_9);
37+
RtcControllerClass(PinName int_pin = MC_RTC_INT_PIN);
3738

3839
/**
3940
* @brief Destructor for the RtcControllerClass.

Diff for: src/TCTempProbeClass.h

+5-4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "utility/THERMOCOUPLE/MAX31855.h"
1616
#include <Arduino.h>
1717
#include <mbed.h>
18+
#include "pins_mc.h"
1819

1920
/* Class ----------------------------------------------------------------------*/
2021

@@ -37,10 +38,10 @@ class TCTempProbeClass: public MAX31855Class {
3738
* @param ch_sel1_pin The pin number for the second channel selection bit.
3839
* @param ch_sel2_pin The pin number for the third channel selection bit.
3940
*/
40-
TCTempProbeClass(PinName tc_cs_pin = PI_0,
41-
PinName ch_sel0_pin = PD_6,
42-
PinName ch_sel1_pin = PI_4,
43-
PinName ch_sel2_pin = PG_10);
41+
TCTempProbeClass(PinName tc_cs_pin = MC_TC_CS_PIN,
42+
PinName ch_sel0_pin = MC_TC_SEL0_PIN,
43+
PinName ch_sel1_pin = MC_TC_SEL1_PIN,
44+
PinName ch_sel2_pin = MC_TC_SEL2_PIN);
4445

4546
/**
4647
* @brief Destruct the TCTempProbeClass object.

Diff for: src/USBClass.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ bool USBClass::begin() {
1919
pinMode(_power, OUTPUT);
2020
pinMode(_usbflag, INPUT);
2121

22-
_powerEnable();
22+
_enable();
2323

2424
return true;
2525
}
2626

2727
void USBClass::end() {
28-
_powerDisable();
28+
_disable();
2929
}
3030

3131
bool USBClass::getFaultStatus() {
@@ -41,11 +41,11 @@ bool USBClass::getFaultStatus() {
4141
return res;
4242
}
4343

44-
void USBClass::_powerEnable() {
44+
void USBClass::_enable() {
4545
digitalWrite(_power, LOW);
4646
}
4747

48-
void USBClass::_powerDisable() {
48+
void USBClass::_disable() {
4949
digitalWrite(_power, HIGH);
5050
}
5151

Diff for: src/USBClass.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
/* Includes -------------------------------------------------------------------*/
1414
#include <Arduino.h>
1515
#include <mbed.h>
16+
#include "pins_mc.h"
1617

1718
/* Class ----------------------------------------------------------------------*/
1819

@@ -32,7 +33,7 @@ class USBClass {
3233
* @param power_pin The pin number for controlling the power to the USBA VBUS.
3334
* @param usbflag_pin The pin number for reading the fault status of the USBA VBUS.
3435
*/
35-
USBClass(PinName power_pin = PB_14, PinName usbflag_pin = PB_15);
36+
USBClass(PinName power_pin = MC_USB_PWR_PIN, PinName usbflag_pin = MC_USB_FLAG_PIN);
3637

3738
/**
3839
* @brief Destruct the USBClass object.
@@ -76,14 +77,14 @@ class USBClass {
7677
*
7778
* This private method is used to enable power to the USBA VBUS.
7879
*/
79-
void _powerEnable();
80+
void _enable();
8081

8182
/**
8283
* @brief Disable power to the USBA VBUS.
8384
*
8485
* This private method is used to disable power to the USBA VBUS.
8586
*/
86-
void _powerDisable();
87+
void _disable();
8788
};
8889

8990
extern USBClass MachineControl_USBController;

0 commit comments

Comments
 (0)