Ublox and PinName fixes

pull/7304/head
cedrick kukela 2018-06-15 07:46:02 -04:00 committed by Leon Lindenfelser
parent c18eef804e
commit e2e5d9ed43
4 changed files with 35 additions and 36 deletions

View File

@ -252,22 +252,22 @@ typedef enum {
LED4 = D3,
// SERIAL PORT
SERIAL_TX = D1,
SERIAL_RX = D0,
SERIAL_RTS = D6,
SERIAL_CTS = D3,
SERIAL_DCD = D4,
SERIAL_DSR = D5,
SERIAL_DTR = D7,
SERIAL_RI = D8,
SERIAL_TX = D1,
SERIAL_RX = D0,
SERIAL_RTS = D6,
SERIAL_CTS = D3,
SERIAL_DCD = D4,
SERIAL_DSR = D5,
SERIAL_DTR = D7,
SERIAL_RI = D8,
// SPI1 and SPI2 are available on Arduino pins
SPI1_MOSI = D11,
SPI1_MISO = D12,
SPI1_SCK = D13,
SPI2_MOSI = D2,
SPI2_MISO = A0,
SPI2_SCK = D9,
SPI1_MOSI = D11,
SPI1_MISO = D12,
SPI1_SCK = D13,
SPI2_MOSI = D2,
SPI2_MISO = A0,
SPI2_SCK = D9,
// SPI3 connects to flash part
SPI3_MOSI = PC_12,
@ -276,10 +276,10 @@ typedef enum {
SPI3_SSEL = PG_12,
// I2C1 and I2C3 are available on Arduino pins
I2C1_SCL = D15,
I2C1_SDA = D14,
I2C3_SCL = D7,
I2C3_SDA = A5,
I2C1_SCL = D15,
I2C1_SDA = D14,
I2C3_SCL = D7,
I2C3_SDA = A5,
// Modem
RADIO_PWR = PC_3,
@ -310,7 +310,6 @@ typedef enum {
MDMDTR = RADIO_DTR, // Data Terminal Ready
MDMRI = RADIO_RI, // Ring Indicator
CELL_GPIO5 = PE_11,
CELL_GPIO2 = PE_13,
CELL_GPIO3 = PE_14,
@ -325,10 +324,10 @@ typedef enum {
MDMRST = RADIO_RESET,
MDMCURRENTSENSE = (int) 0xFFFFFFFF,
// GNSS
GNSSEN = (int) 0xFFFFFFFF, // VCC_IO to GNSS, should be set to push-pull, no pull-up, output
GNSSTXD =(int) 0xFFFFFFFF,
GNSSRXD = (int) 0xFFFFFFFF,
// GNSS
GNSSEN = (int) 0xFFFFFFFF, // VCC_IO to GNSS, should be set to push-pull, no pull-up, output
GNSSTXD =(int) 0xFFFFFFFF,
GNSSRXD = (int) 0xFFFFFFFF,
PWR3V3 = (int) 0xFFFFFFFF,
WAKEUP = D3,

View File

@ -31,7 +31,7 @@ static void press_power_button(int time_us)
#if defined(TARGET_UBLOX_C030_R410M)
gpio_init_inout(&gpio, MDMPWRON, PIN_OUTPUT, OpenDrain, 0);
#else
gpio_init_out_ex(&gpio, MDMPWRON, 0);
gpio_init_inout(&gpio, MDMPWRON, PIN_OUTPUT, OpenDrainNoPull, 0);
#endif
wait_us(time_us);
@ -43,9 +43,9 @@ void onboard_modem_init()
gpio_t gpio;
// Take us out of reset
gpio_init_out_ex(&gpio, RADIO_PWR, 1);
gpio_init_out_ex(&gpio, BUF_EN, 0);
gpio_init_out_ex(&gpio, MDMRST, 1);
gpio_init_inout(&gpio, RADIO_PWR, PIN_OUTPUT, PushPullNoPull, 1);
gpio_init_inout(&gpio, BUF_EN, PIN_OUTPUT, OpenDrainNoPull, 0);
gpio_init_inout(&gpio, MDMRST, PIN_OUTPUT, OpenDrainNoPull, 1);
}
void onboard_modem_deinit()
@ -53,9 +53,9 @@ void onboard_modem_deinit()
gpio_t gpio;
// Back into reset
gpio_init_out_ex(&gpio, RADIO_PWR, 0);
gpio_init_out_ex(&gpio, BUF_EN, 1);
gpio_init_out_ex(&gpio, MDMRST, 0);
gpio_init_inout(&gpio, RADIO_PWR, PIN_OUTPUT, PushPullNoPull, 0);
gpio_init_inout(&gpio, BUF_EN, PIN_OUTPUT, OpenDrainNoPull, 1);
gpio_init_inout(&gpio, MDMRST,PIN_OUTPUT, OpenDrainNoPull, 0);
}
void onboard_modem_power_up()
@ -65,7 +65,7 @@ void onboard_modem_power_up()
press_power_button(1000000);
#else
/* keep the power line low for 50 microseconds */
press_power_button(50);
press_power_button(1000000);
#endif
/* give modem a little time to respond */
@ -79,7 +79,7 @@ void onboard_modem_power_down()
press_power_button(1500000);
#else
/* keep the power line low for 1 seconds */
press_power_button(1000000);
press_power_button(1500000);
#endif
}

View File

@ -22,15 +22,15 @@ void ublox_board_init(void) {
gpio_t gpio;
// Enable power to 3V3
gpio_init_inout(&gpio, RADIO_PWR, PIN_OUTPUT, OpenDrain, 1);
gpio_init_inout(&gpio, VUSB_EN, PIN_OUTPUT, OpenDrain, 0);
gpio_init_inout(&gpio, RADIO_PWR, PIN_OUTPUT, PushPullNoPull, 1);
gpio_init_inout(&gpio, VUSB_EN, PIN_OUTPUT, OpenDrainNoPull, 0);
// start with modem disabled
gpio_init_out_ex(&gpio, MDMRST, 0);
#if defined(TARGET_UBLOX_C030_R410M)
gpio_init_inout(&gpio, MDMPWRON, PIN_OUTPUT, OpenDrain, 1);
#else
gpio_init_out_ex(&gpio, MDMPWRON, 0);
gpio_init_inout(&gpio, MDMPWRON, PIN_OUTPUT, OpenDrainNoPull, 1);
#endif
gpio_init_out_ex(&gpio, MDMRTS, 0);
//gpio_init_in_ex(&gpio, MDMCURRENTSENSE, PullNone);

View File

@ -2263,7 +2263,7 @@
"release_versions": ["2", "5"],
"device_name": "STM32L471QG",
"bootloader_supported": true,
"features": ["IPV4"]
"features": ["IPV4", "NANOSTACK", "COMMON_PAL"]
},
"MTB_MTS_DRAGONFLY": {
"inherits": ["FAMILY_STM32"],