Skip to content

Commit 4866d9c

Browse files
cedrickkukela-cdadbridge
authored andcommitted
Ublox and PinName fixes
1 parent 8c14749 commit 4866d9c

File tree

4 files changed

+35
-36
lines changed

4 files changed

+35
-36
lines changed

targets/TARGET_STM/TARGET_STM32L4/TARGET_MTS_DRAGONFLY_L471QG/PinNames.h

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -252,22 +252,22 @@ typedef enum {
252252
LED4 = D3,
253253

254254
// SERIAL PORT
255-
SERIAL_TX = D1,
256-
SERIAL_RX = D0,
257-
SERIAL_RTS = D6,
258-
SERIAL_CTS = D3,
259-
SERIAL_DCD = D4,
260-
SERIAL_DSR = D5,
261-
SERIAL_DTR = D7,
262-
SERIAL_RI = D8,
255+
SERIAL_TX = D1,
256+
SERIAL_RX = D0,
257+
SERIAL_RTS = D6,
258+
SERIAL_CTS = D3,
259+
SERIAL_DCD = D4,
260+
SERIAL_DSR = D5,
261+
SERIAL_DTR = D7,
262+
SERIAL_RI = D8,
263263

264264
// SPI1 and SPI2 are available on Arduino pins
265-
SPI1_MOSI = D11,
266-
SPI1_MISO = D12,
267-
SPI1_SCK = D13,
268-
SPI2_MOSI = D2,
269-
SPI2_MISO = A0,
270-
SPI2_SCK = D9,
265+
SPI1_MOSI = D11,
266+
SPI1_MISO = D12,
267+
SPI1_SCK = D13,
268+
SPI2_MOSI = D2,
269+
SPI2_MISO = A0,
270+
SPI2_SCK = D9,
271271

272272
// SPI3 connects to flash part
273273
SPI3_MOSI = PC_12,
@@ -276,10 +276,10 @@ typedef enum {
276276
SPI3_SSEL = PG_12,
277277

278278
// I2C1 and I2C3 are available on Arduino pins
279-
I2C1_SCL = D15,
280-
I2C1_SDA = D14,
281-
I2C3_SCL = D7,
282-
I2C3_SDA = A5,
279+
I2C1_SCL = D15,
280+
I2C1_SDA = D14,
281+
I2C3_SCL = D7,
282+
I2C3_SDA = A5,
283283

284284
// Modem
285285
RADIO_PWR = PC_3,
@@ -310,7 +310,6 @@ typedef enum {
310310
MDMDTR = RADIO_DTR, // Data Terminal Ready
311311
MDMRI = RADIO_RI, // Ring Indicator
312312

313-
314313
CELL_GPIO5 = PE_11,
315314
CELL_GPIO2 = PE_13,
316315
CELL_GPIO3 = PE_14,
@@ -325,10 +324,10 @@ typedef enum {
325324
MDMRST = RADIO_RESET,
326325
MDMCURRENTSENSE = (int) 0xFFFFFFFF,
327326

328-
// GNSS
329-
GNSSEN = (int) 0xFFFFFFFF, // VCC_IO to GNSS, should be set to push-pull, no pull-up, output
330-
GNSSTXD =(int) 0xFFFFFFFF,
331-
GNSSRXD = (int) 0xFFFFFFFF,
327+
// GNSS
328+
GNSSEN = (int) 0xFFFFFFFF, // VCC_IO to GNSS, should be set to push-pull, no pull-up, output
329+
GNSSTXD =(int) 0xFFFFFFFF,
330+
GNSSRXD = (int) 0xFFFFFFFF,
332331
PWR3V3 = (int) 0xFFFFFFFF,
333332

334333
WAKEUP = D3,

targets/TARGET_STM/TARGET_STM32L4/TARGET_MTS_DRAGONFLY_L471QG/onboard_modem_api.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ static void press_power_button(int time_us)
3131
#if defined(TARGET_UBLOX_C030_R410M)
3232
gpio_init_inout(&gpio, MDMPWRON, PIN_OUTPUT, OpenDrain, 0);
3333
#else
34-
gpio_init_out_ex(&gpio, MDMPWRON, 0);
34+
gpio_init_inout(&gpio, MDMPWRON, PIN_OUTPUT, OpenDrainNoPull, 0);
3535
#endif
3636

3737
wait_us(time_us);
@@ -43,19 +43,19 @@ void onboard_modem_init()
4343
gpio_t gpio;
4444

4545
// Take us out of reset
46-
gpio_init_out_ex(&gpio, RADIO_PWR, 1);
47-
gpio_init_out_ex(&gpio, BUF_EN, 0);
48-
gpio_init_out_ex(&gpio, MDMRST, 1);
46+
gpio_init_inout(&gpio, RADIO_PWR, PIN_OUTPUT, PushPullNoPull, 1);
47+
gpio_init_inout(&gpio, BUF_EN, PIN_OUTPUT, OpenDrainNoPull, 0);
48+
gpio_init_inout(&gpio, MDMRST, PIN_OUTPUT, OpenDrainNoPull, 1);
4949
}
5050

5151
void onboard_modem_deinit()
5252
{
5353
gpio_t gpio;
5454

5555
// Back into reset
56-
gpio_init_out_ex(&gpio, RADIO_PWR, 0);
57-
gpio_init_out_ex(&gpio, BUF_EN, 1);
58-
gpio_init_out_ex(&gpio, MDMRST, 0);
56+
gpio_init_inout(&gpio, RADIO_PWR, PIN_OUTPUT, PushPullNoPull, 0);
57+
gpio_init_inout(&gpio, BUF_EN, PIN_OUTPUT, OpenDrainNoPull, 1);
58+
gpio_init_inout(&gpio, MDMRST,PIN_OUTPUT, OpenDrainNoPull, 0);
5959
}
6060

6161
void onboard_modem_power_up()
@@ -65,7 +65,7 @@ void onboard_modem_power_up()
6565
press_power_button(1000000);
6666
#else
6767
/* keep the power line low for 50 microseconds */
68-
press_power_button(50);
68+
press_power_button(1000000);
6969
#endif
7070

7171
/* give modem a little time to respond */
@@ -79,7 +79,7 @@ void onboard_modem_power_down()
7979
press_power_button(1500000);
8080
#else
8181
/* keep the power line low for 1 seconds */
82-
press_power_button(1000000);
82+
press_power_button(1500000);
8383
#endif
8484
}
8585

targets/TARGET_STM/TARGET_STM32L4/TARGET_MTS_DRAGONFLY_L471QG/ublox_low_level_api.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ void ublox_board_init(void) {
2222
gpio_t gpio;
2323

2424
// Enable power to 3V3
25-
gpio_init_inout(&gpio, RADIO_PWR, PIN_OUTPUT, OpenDrain, 1);
26-
gpio_init_inout(&gpio, VUSB_EN, PIN_OUTPUT, OpenDrain, 0);
25+
gpio_init_inout(&gpio, RADIO_PWR, PIN_OUTPUT, PushPullNoPull, 1);
26+
gpio_init_inout(&gpio, VUSB_EN, PIN_OUTPUT, OpenDrainNoPull, 0);
2727

2828
// start with modem disabled
2929
gpio_init_out_ex(&gpio, MDMRST, 0);
3030
#if defined(TARGET_UBLOX_C030_R410M)
3131
gpio_init_inout(&gpio, MDMPWRON, PIN_OUTPUT, OpenDrain, 1);
3232
#else
33-
gpio_init_out_ex(&gpio, MDMPWRON, 0);
33+
gpio_init_inout(&gpio, MDMPWRON, PIN_OUTPUT, OpenDrainNoPull, 1);
3434
#endif
3535
gpio_init_out_ex(&gpio, MDMRTS, 0);
3636
//gpio_init_in_ex(&gpio, MDMCURRENTSENSE, PullNone);

targets/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2187,7 +2187,7 @@
21872187
"release_versions": ["2", "5"],
21882188
"device_name": "STM32L471QG",
21892189
"bootloader_supported": true,
2190-
"features": ["IPV4"]
2190+
"features": ["IPV4", "NANOSTACK", "COMMON_PAL"]
21912191
},
21922192
"MTB_MTS_DRAGONFLY": {
21932193
"inherits": ["FAMILY_STM32"],

0 commit comments

Comments
 (0)