Merge pull request #11266 from u-blox/feature_adc_temp_conf

ADC internal temperature support and EMAC header fix
pull/11336/head
Martin Kojtal 2019-08-26 11:08:47 +02:00 committed by GitHub
commit 02d1873c06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 1 deletions

View File

@ -1,3 +1,19 @@
/*---------------------------------------------------------------------------
* Copyright (c) 2019, u-blox Malmö, All Rights Reserved
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#if DEVICE_WIFI
#include "mbed_interface.h"

View File

@ -55,7 +55,10 @@ const PinMap PinMap_ADC[] = {
};
const PinMap PinMap_ADC_Internal[] = {
{NC, NC, 0}
{ADC_TEMP, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)},
{ADC_VREF, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)},
{ADC_VBAT, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)},
{NC, NC, 0}
};

View File

@ -150,6 +150,11 @@ typedef enum {
SPI0_CS = PE_11,
SPI1_CS = PE_9,
// ADC internal channels
ADC_TEMP = 0xF0,
ADC_VREF = 0xF1,
ADC_VBAT = 0xF2,
SPI_MOSI = SPI0_MOSI,
SPI_MISO = SPI0_MISO,
SPI_SCK = SPI0_SCK,

View File

@ -164,6 +164,11 @@ typedef enum {
I2C_SDA = PF_0,
I2C_SCL = PF_1,
// ADC internal channels
ADC_TEMP = 0xF0,
ADC_VREF = 0xF1,
ADC_VBAT = 0xF2,
SPI0_MOSI = PE_14,
SPI0_MISO = PE_13,
SPI0_SCK = PE_12,

View File

@ -160,6 +160,11 @@ typedef enum {
SW0 = PF_2, // Switch-0
SW1 = PB_6, // Green / Switch-1
// ADC internal channels
ADC_TEMP = 0xF0,
ADC_VREF = 0xF1,
ADC_VBAT = 0xF2,
I2C_SCL = D15,
I2C_SDA = D14,
SPI0_MOSI = D11,