Skip to content

Commit d37974d

Browse files
facchinmfacchinm
committed
Add arduino pinout on EnvieM7
1 parent cb4b453 commit d37974d

File tree

6 files changed

+123
-21
lines changed

6 files changed

+123
-21
lines changed

‎variants/ENVIE_M7/defines.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@
4444
-DFEATURE_LWIP=1
4545
-D__FPU_PRESENT=1
4646
-D__MBED__=1
47-
-DMBED_BUILD_TIMESTAMP=1578671293.574875
47+
-DMBED_BUILD_TIMESTAMP=1578934770.558274
4848
-D__MBED_CMSIS_RTOS_CM
49+
-DMBED_TICKLESS
4950
-DSTM32H747xx
5051
-DTARGET_4343W
5152
-DTARGET_CORDIO
@@ -55,7 +56,6 @@
5556
-DTARGET_ENVIE
5657
-DTARGET_ENVIE_M7
5758
-DTARGET_FAMILY_STM32
58-
-DTARGET_FF_ARDUINO
5959
-DTARGET_LIKE_CORTEX_M7
6060
-DTARGET_LIKE_MBED
6161
-DTARGET_M7
@@ -73,3 +73,4 @@
7373
-DUSE_FULL_LL_DRIVER
7474
-DUSE_HAL_DRIVER
7575
-DMBED_NO_GLOBAL_USING_DIRECTIVE=1
76+
-DUSE_ARDUINO_PINOUT

‎variants/ENVIE_M7/includes.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@
3535
-iwithprefixbefore/mbed/hal/usb
3636
-iwithprefixbefore/mbed/hal/storage_abstraction
3737
-iwithprefixbefore/mbed/hal
38-
-iwithprefixbefore/mbed/features/unsupported/dsp/dsp
39-
-iwithprefixbefore/mbed/features/unsupported/dsp/cmsis_dsp
40-
-iwithprefixbefore/mbed/features/unsupported/dsp/
41-
-iwithprefixbefore/mbed/features/storage/system_storage
42-
-iwithprefixbefore/mbed/features/storage/nvstore/source
43-
-iwithprefixbefore/mbed/features/storage/nvstore
4438
-iwithprefixbefore/mbed/features/storage/kvstore/tdbstore
4539
-iwithprefixbefore/mbed/features/storage/kvstore/securestore
4640
-iwithprefixbefore/mbed/features/storage/kvstore/kv_map
@@ -79,7 +73,6 @@
7973
-iwithprefixbefore/mbed/features/netsocket/emac-drivers/TARGET_STM/TARGET_STM32H7/lan8742
8074
-iwithprefixbefore/mbed/features/netsocket/emac-drivers/TARGET_STM/TARGET_STM32H7
8175
-iwithprefixbefore/mbed/features/netsocket/emac-drivers/TARGET_STM
82-
-iwithprefixbefore/mbed/features/netsocket/cellular
8376
-iwithprefixbefore/mbed/features/netsocket
8477
-iwithprefixbefore/mbed/features/nanostack/sal-stack-nanostack/source/libNET/src
8578
-iwithprefixbefore/mbed/features/nanostack/sal-stack-nanostack/source/libNET

‎variants/ENVIE_M7/libs/libmbed.a

-1.63 MB
Binary file not shown.

‎variants/ENVIE_M7/mbed_config.h

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,10 @@
5757
#define MBED_CONF_BLE_PRESENT 1 // set by library:ble
5858
#define MBED_CONF_CELLULAR_CONTROL_PLANE_OPT 0 // set by library:cellular
5959
#define MBED_CONF_CELLULAR_DEBUG_AT 0 // set by library:cellular
60+
#define MBED_CONF_CELLULAR_MAX_CP_DATA_RECV_LEN 1358 // set by library:cellular
6061
#define MBED_CONF_CELLULAR_RANDOM_MAX_START_DELAY 0 // set by library:cellular
61-
#define MBED_CONF_CELLULAR_USE_APN_LOOKUP 1 // set by library:cellular
62-
#define MBED_CONF_CELLULAR_USE_SMS 1 // set by library:cellular
62+
#define MBED_CONF_CELLULAR_USE_APN_LOOKUP 0 // set by library:cellular
63+
#define MBED_CONF_CELLULAR_USE_SMS 0 // set by library:cellular
6364
#define MBED_CONF_CORDIO_DESIRED_ATT_MTU 23 // set by library:cordio
6465
#define MBED_CONF_CORDIO_MAX_PREPARED_WRITES 4 // set by library:cordio
6566
#define MBED_CONF_CORDIO_RX_ACL_BUFFER_SIZE 70 // set by library:cordio
@@ -76,8 +77,10 @@
7677
#define MBED_CONF_ESP8266_POWER_ON_POLARITY 0 // set by library:esp8266
7778
#define MBED_CONF_ESP8266_POWER_ON_TIME_MS 3 // set by library:esp8266
7879
#define MBED_CONF_ESP8266_PROVIDE_DEFAULT 0 // set by library:esp8266
80+
#define MBED_CONF_ESP8266_RX PA_10 // set by library:esp8266[ENVIE]
7981
#define MBED_CONF_ESP8266_SERIAL_BAUDRATE 115200 // set by library:esp8266
8082
#define MBED_CONF_ESP8266_SOCKET_BUFSIZE 8192 // set by library:esp8266
83+
#define MBED_CONF_ESP8266_TX PA_9 // set by library:esp8266[ENVIE]
8184
#define MBED_CONF_EVENTS_PRESENT 1 // set by library:events
8285
#define MBED_CONF_EVENTS_SHARED_DISPATCH_FROM_APPLICATION 0 // set by library:events
8386
#define MBED_CONF_EVENTS_SHARED_EVENTSIZE 768 // set by library:events
@@ -158,7 +161,6 @@
158161
#define MBED_CONF_LWIP_ADDR_TIMEOUT 5 // set by library:lwip
159162
#define MBED_CONF_LWIP_ADDR_TIMEOUT_MODE 1 // set by library:lwip
160163
#define MBED_CONF_LWIP_DEBUG_ENABLED 0 // set by library:lwip
161-
#define MBED_CONF_LWIP_DEFAULT_TCP_RECVMBOX_SIZE 8 // set by library:lwip
162164
#define MBED_CONF_LWIP_DEFAULT_THREAD_STACKSIZE 512 // set by library:lwip
163165
#define MBED_CONF_LWIP_DHCP_TIMEOUT 60 // set by library:lwip
164166
#define MBED_CONF_LWIP_ENABLE_PPP_TRACE 0 // set by library:lwip
@@ -181,7 +183,6 @@
181183
#define MBED_CONF_LWIP_PRESENT 1 // set by library:lwip
182184
#define MBED_CONF_LWIP_RAW_SOCKET_ENABLED 0 // set by library:lwip
183185
#define MBED_CONF_LWIP_SOCKET_MAX 4 // set by library:lwip
184-
#define MBED_CONF_LWIP_TCPIP_MBOX_SIZE 8 // set by library:lwip
185186
#define MBED_CONF_LWIP_TCPIP_THREAD_PRIORITY osPriorityNormal // set by library:lwip
186187
#define MBED_CONF_LWIP_TCPIP_THREAD_STACKSIZE 1200 // set by library:lwip
187188
#define MBED_CONF_LWIP_TCP_CLOSE_TIMEOUT 1000 // set by library:lwip
@@ -241,6 +242,7 @@
241242
#define MBED_CONF_NSAPI_DEFAULT_MESH_TYPE THREAD // set by library:nsapi
242243
#define MBED_CONF_NSAPI_DEFAULT_STACK LWIP // set by library:nsapi
243244
#define MBED_CONF_NSAPI_DEFAULT_WIFI_SECURITY NONE // set by library:nsapi
245+
#define MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT 10 // set by library:nsapi
244246
#define MBED_CONF_NSAPI_DNS_CACHE_SIZE 3 // set by library:nsapi
245247
#define MBED_CONF_NSAPI_DNS_RESPONSE_WAIT_TIME 10000 // set by library:nsapi
246248
#define MBED_CONF_NSAPI_DNS_RETRIES 1 // set by library:nsapi
@@ -270,10 +272,6 @@
270272
#define MBED_CONF_PLATFORM_STDIO_FLUSH_AT_EXIT 1 // set by library:platform
271273
#define MBED_CONF_PLATFORM_STDIO_MINIMAL_CONSOLE_ONLY 0 // set by library:platform
272274
#define MBED_CONF_PLATFORM_USE_MPU 1 // set by library:platform
273-
#define MBED_CONF_PPP_CELL_IFACE_APN_LOOKUP 1 // set by library:ppp-cell-iface
274-
#define MBED_CONF_PPP_CELL_IFACE_AT_PARSER_BUFFER_SIZE 256 // set by library:ppp-cell-iface
275-
#define MBED_CONF_PPP_CELL_IFACE_AT_PARSER_TIMEOUT 8000 // set by library:ppp-cell-iface
276-
#define MBED_CONF_PPP_CELL_IFACE_BAUD_RATE 115200 // set by library:ppp-cell-iface
277275
#define MBED_CONF_PPP_ENABLED 0 // set by library:ppp
278276
#define MBED_CONF_PPP_ENABLE_TRACE 0 // set by library:ppp
279277
#define MBED_CONF_PPP_IPV4_ENABLED 1 // set by library:ppp
@@ -364,6 +362,7 @@
364362
#define MBED_CONF_UBLOX_N2XX_PROVIDE_DEFAULT 0 // set by library:UBLOX_N2XX
365363
#define MBED_CONF_UBLOX_PPP_BAUDRATE 115200 // set by library:UBLOX_PPP
366364
#define MBED_CONF_UBLOX_PPP_PROVIDE_DEFAULT 0 // set by library:UBLOX_PPP
365+
#define MBED_CRC_TABLE_SIZE 16 // set by library:drivers
367366
#define MBED_LFS_BLOCK_SIZE 512 // set by library:littlefs
368367
#define MBED_LFS_ENABLE_INFO 0 // set by library:littlefs
369368
#define MBED_LFS_INTRINSICS 1 // set by library:littlefs
@@ -373,8 +372,6 @@
373372
#define MBED_STACK_DUMP_ENABLED 0 // set by library:platform
374373
#define MEM_ALLOC malloc // set by library:mbed-trace
375374
#define MEM_FREE free // set by library:mbed-trace
376-
#define NVSTORE_ENABLED 1 // set by library:nvstore
377-
#define NVSTORE_MAX_KEYS 16 // set by library:nvstore
378375
#define PPP_DEBUG 0 // set by library:ppp
379376
#define SEC_CCM_CFG 1 // set by library:cordio
380377
#define SMP_DB_MAX_DEVICES 3 // set by library:cordio

‎variants/ENVIE_M7/pins_arduino.h

Lines changed: 76 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,66 @@
1+
#pragma once
12
#include "mbed_config.h"
3+
#include <macros.h>
4+
5+
#ifndef __PINS_ARDUINO__
6+
#define __PINS_ARDUINO__
7+
8+
#ifdef __cplusplus
9+
extern "C" unsigned int PINCOUNT_fn();
10+
#endif
11+
#define PINS_COUNT (PINCOUNT_fn())
12+
#define NUM_DIGITAL_PINS (22u)
13+
#define NUM_ANALOG_INPUTS (7u)
14+
#define NUM_ANALOG_OUTPUTS (1u)
15+
16+
// LEDs
17+
// ----
18+
#define PIN_LED (PK_6)
19+
#define LED_BUILTIN PIN_LED
20+
#define LEDR (PK_5)
21+
#define LEDG (PK_6)
22+
#define LEDB (PK_7)
23+
24+
// Analog pins
25+
// -----------
26+
#define PIN_A0 (15u)
27+
#define PIN_A1 (16u)
28+
#define PIN_A2 (17u)
29+
#define PIN_A3 (18u)
30+
#define PIN_A4 (19u)
31+
#define PIN_A5 (20u)
32+
#define PIN_A6 (21u)
33+
static const uint8_t A0 = PIN_A0;
34+
static const uint8_t A1 = PIN_A1;
35+
static const uint8_t A2 = PIN_A2;
36+
static const uint8_t A3 = PIN_A3;
37+
static const uint8_t A4 = PIN_A4;
38+
static const uint8_t A5 = PIN_A5;
39+
static const uint8_t A6 = PIN_A6;
40+
#define ADC_RESOLUTION 12
41+
42+
// Serial
43+
#define PIN_SERIAL_RX (13ul)
44+
#define PIN_SERIAL_TX (14ul)
45+
46+
// SPI
47+
#define PIN_SPI_MISO (10u)
48+
#define PIN_SPI_MOSI (8u)
49+
#define PIN_SPI_SCK (9u)
50+
#define PIN_SPI_SS (7u)
51+
52+
static const uint8_t SS = PIN_SPI_SS; // SPI Slave SS not used. Set here only for reference.
53+
static const uint8_t MOSI = PIN_SPI_MOSI;
54+
static const uint8_t MISO = PIN_SPI_MISO;
55+
static const uint8_t SCK = PIN_SPI_SCK;
56+
57+
// Wire
58+
#define PIN_WIRE_SDA (18u)
59+
#define PIN_WIRE_SCL (19u)
260

361
#define SERIAL_HOWMANY 1
4-
#define SERIAL1_TX SERIAL_TX
5-
#define SERIAL1_RX SERIAL_RX
62+
#define SERIAL1_TX (digitalPinToPinName(PIN_SERIAL_TX))
63+
#define SERIAL1_RX (digitalPinToPinName(PIN_SERIAL_RX))
664

765
#define SERIAL_CDC 1
866
#define HAS_UNIQUE_ISERIAL_DESCRIPTOR
@@ -14,3 +72,19 @@
1472

1573
uint8_t getUniqueSerialNumber(uint8_t* name);
1674
void _ontouch1200bps_();
75+
76+
77+
#define WIRE_HOWMANY 1
78+
79+
#define I2C_SDA (digitalPinToPinName(PIN_WIRE_SDA))
80+
#define I2C_SCL (digitalPinToPinName(PIN_WIRE_SCL))
81+
82+
#define SPI_HOWMANY 1
83+
84+
#define SPI_MISO (digitalPinToPinName(PIN_SPI_MISO))
85+
#define SPI_MOSI (digitalPinToPinName(PIN_SPI_MOSI))
86+
#define SPI_SCK (digitalPinToPinName(PIN_SPI_SCK))
87+
88+
#define digitalPinToPort(P) (digitalPinToPinName(P)/32)
89+
90+
#endif //__PINS_ARDUINO__

‎variants/ENVIE_M7/variant.cpp

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,43 @@
22

33
RTC_HandleTypeDef RTCHandle;
44

5+
PinDescription g_APinDescription[] = {
6+
// D0 - D7
7+
PH_15, NULL, NULL, // D0
8+
PK_1, NULL, NULL, // D1
9+
PJ_11, NULL, NULL, // D2
10+
PG_7, NULL, NULL, // D3
11+
PC_7, NULL, NULL, // D4
12+
PC_6, NULL, NULL, // D5
13+
PA_8, NULL, NULL, // D6
14+
PI_0, NULL, NULL, // D7
15+
16+
// D8 - D14
17+
PC_3, NULL, NULL, // D8
18+
PI_2, NULL, NULL, // D9
19+
PC_2, NULL, NULL, // D10
20+
PH_8, NULL, NULL, // D11
21+
PH_7, NULL, NULL, // D12
22+
PA_10, NULL, NULL, // D13
23+
PA_9, NULL, NULL, // D14
24+
25+
// A0 - A7
26+
PA_0_ALT0, NULL, NULL, // A0
27+
PA_1_ALT0, NULL, NULL, // A1
28+
PC_2_ALT0, NULL, NULL, // A2
29+
//PC_3_ALT0, NULL, NULL, // A3
30+
PC_3, NULL, NULL, // A3 // FIXME: this is wrong
31+
PC_2, NULL, NULL, // A4
32+
PC_3, NULL, NULL, // A5
33+
PA_4, NULL, NULL, // A6
34+
};
35+
36+
extern "C" {
37+
unsigned int PINCOUNT_fn() {
38+
return (sizeof(g_APinDescription) / sizeof(g_APinDescription[0]));
39+
}
40+
}
41+
542
void initVariant() {
643
RTCHandle.Instance = RTC;
744
// Turn off LED red from bootloader

0 commit comments

Comments
 (0)