Commit 6d370532 authored by thorbjoern.joerger's avatar thorbjoern.joerger

Finish 2.4.0-alpha1

parents c5437910 7ca8395b
0.4.0
\ No newline at end of file
0.4.0
\ No newline at end of file
0.4.1
\ No newline at end of file
0.4.0
\ No newline at end of file
0.4.0
\ No newline at end of file
0.4.1
\ No newline at end of file
......@@ -54,7 +54,7 @@ No official release created yet. However, this section shall later on give the r
| 0.4.0-alpha1 | 27.07.2016 | Alpha release\ |
| | | - First version compatible with betCOM 2.3.1-alpha1 |
| 0.4.0 | 27.07.2016 | Release\ |
| | | - First version compatible with betCOM 2.3.1 und GS 0.2.0-alpha1 |
| | | - First version compatible with betCOM 2.3.1 and GS 0.2.0-alpha1 |
# Documentation {#docu}
......@@ -67,6 +67,10 @@ extra work than benefit.
[Doxygen]: http://www.stack.nl/~dimitri/doxygen/index.html "Doxygen"
## DMA channel assignement
![DMA channel assignment](http://wiki.syscop.de/images/b/b6/Flight_Controller_DMA_channel_assignment.svg)
<img source="http://wiki.syscop.de/images/b/b6/Flight_Controller_DMA_channel_assignment.svg">
# Statistics {#stats}
The tool [cloc] can be used to generate some statics about the current status of the source code. E.g. the following output is produced including all own files and is based on the Git commit: `b98b86d04aad0fd7d98547983532ba95d70d3546`
......
......@@ -5,160 +5,10 @@
#ifndef MFW_CONFIG_H_
#define MFW_CONFIG_H_
/*! Defines which fields are written in the BetCall message. */
/*! Defines which controller is used. */
#define FC 0
#define ARM 1
#if (FC && ARM)
#error The board cannot simultaneously be on the ARM and on the plane. \
Please choose only one.
#endif
/*! If enabled, the communication to groundstation is done through UART (RS232)
* interface. */
#define MFW_GROUNDST_COMMUNICATION_VIA_UART_EN 1
/*! If enabled, the communication to groundstation is done through ethernet
* interface. */
#define MFW_GROUNDST_COMMUNICATION_VIA_ETH_EN 0
#if MFW_GROUNDST_COMMUNICATION_VIA_ETH_EN
#error Communication to GS via Ethernet not supported yet.
#endif
#if (MFW_GROUNDST_COMMUNICATION_VIA_UART && MFW_GROUNDST_COMMUNICATION_VIA_ETH)
#error Define the communication port to groundstation. Communication via\
UART and Ethernet at the same time is not possible. Check macros\
MFW_GROUNDST_COMMUNICATION_VIA_UART_EN and MFW_GROUNDST_COMMUNICATION_VIA_ETH_EN.
#endif
/* ============================================================================
* Configuration for UART communication to groundstation.
*/
#if MFW_GROUNDST_COMMUNICATION_VIA_UART_EN
/*! Defines the UART port the GS is connected to. Must be of type
* \ref E_HAL_UART_PORT_t. */
#define MFW_UART_PORT_TO_GS E_HAL_UART_PORT_0
/*! Defines the UART baudrate to be used between GS and FC. */
#define MFW_UART_BAUD_RATE_TO_GS 921600
/*! Defines the port of the enable pin of TXS0108 Level Shifter. */
#define MFW_LSHIFT_EN_PORT E_HAL_GPIO_PORT_K
/*! Defines the the enable pin of TXS0108 Level Shifter. */
#define MFW_LSHIFT_EN_PIN HAL_GPIO_PIN_2
/*! As mfw provides the buffer to the serial protocol module (for communication
* with groundstation), this number defines the buffer length of the serial
* protocol RX buffer. Make sure this value fits to the maximum legth of a
* protobuf message transmitted from GS to FC! */
#define MFW_GROUNDST_RX_BUF_LEN 8192
/*! \brief Defines the intervall (in ms) of BetCALL messages sent down to GS.
*
* \details This value can be set to '0' to send out messages as fast as
* possible. But respect the warning stated below!
*
* \warning We need to limit the amount of data (we sent down to GS) to not
* generate more data than the UART can send out. Therfore, this
* value has a strong relation to \ref MFW_UART_BAUD_RATE_TO_GS.
*/
#define MFW_INTERVALL_BETCALL_MSG_TO_GS 4
#endif /* MFW_GROUNDST_COMMUNICATION_VIA_UART_EN */
/*! In case of FC we need the pb forwarder to forwarder TAS messages to GS. */
#define MFW_PB_FORWARDER_EN 0
/*! Use software CRC instead of hardware CRC. */
#define MFW_SOFTWARE_CRC_EN 0
/* ============================================================================
* Configuration for ethernet communication to groundstation.
*/
#if MFW_GROUNDST_COMMUNICATION_VIA_ETH_EN
/* Add configs/settings for ETH communciation here like IP address and port. */
#endif /* MFW_GROUNDST_COMMUNICATION_VIA_ETH_EN */
/* ============================================================================
* Configuration for protocol buffers.
*/
/*! Size of the output stream buffer, i.e. the buffer where nanopb writes the
* encoded protocol buffer message to. */
#define MFW_PB_OSTREAM_BUF_LEN 8192
/* ============================================================================
* Configuration for actuator modules.
*/
/*! Enables/disables the servo dude elevator. */
#define MFW_ACT_SERVO_DUDE_ELEVATOR_EN 0
/*! Enables/disables the servo dude rudder. */
#define MFW_ACT_SERVO_DUDE_RUDDER_EN 0
/*! Enables/disables the servo dude flap-left. */
#define MFW_ACT_SERVO_DUDE_FLAP_LEFT_EN 0
/*! Enables/disables the servo dude flap-right. */
#define MFW_ACT_SERVO_DUDE_FLAP_RIGHT_EN 0
/*! Enables/disables the servo dude aileron-left. */
#define MFW_ACT_SERVO_DUDE_AILERON_LEFT_EN 0
/*! Enables/disables the servo dude aileron-right. */
#define MFW_ACT_SERVO_DUDE_AILERON_RIGHT_EN 0
/*! Checks if any of the servo dudes (MFW_ACT_SERVO_DUDE_xxx) is enabled. */
#define MFW_ACT_IS_ANY_SERVO_DUDE_ENABLED \
(MFW_ACT_SERVO_DUDE_ELEVATOR_EN || MFW_ACT_SERVO_DUDE_RUDDER_EN || \
MFW_ACT_SERVO_DUDE_FLAP_LEFT_EN || MFW_ACT_SERVO_DUDE_FLAP_RIGHT_EN || \
MFW_ACT_SERVO_DUDE_AILERON_LEFT_EN || MFW_ACT_SERVO_DUDE_AILERON_RIGHT_EN)
/*! Checks if any actuator at all is enabled. */
#define MFW_ACT_IS_ANY_ACTUATOR_ENABLED (MFW_ACT_IS_ANY_SERVO_DUDE_ENABLED)
/* ============================================================================
* Configuration for sensor modules.
*/
/*! Enables/disables the tube angle module. */
#define MFW_SENS_TUBE_ANGLE_EN 1
#if MFW_SENS_TUBE_ANGLE_EN
/*! Defines the SPI port speed (Hz) for communication with tube angle sensor. */
#define MFW_SENS_TUBE_ANGLE_SPI_SPEED 2000000
#endif /* MFW_SENS_TUBE_ANGLE_EN */
/*! Enables/disables the MPU9250 module. */
#define MFW_SENS_MPU9250_EN 1
#if MFW_SENS_MPU9250_EN
/*! Defines the SPI port the MPU9250 is connected to. */
#define MFW_SENS_MPU9250_SPI_PORT E_HAL_SPI_PORT_0
/*! Defines the SPI port speed (Hz) for communication with MPU9250. */
#define MFW_SENS_MPU9250_SPI_SPEED 3000000
#endif /* MFW_SENS_MPU9250_EN */
/*! Enables/disables the BNO055 module. */
#define MFW_SENS_BNO055_EN 0
/*! Enables/disables the PPS module. */
#define MFW_SENS_PPS_EN 1
/*! Enables/disables the Loop Counter. */
#define MFW_LOOP_COUNTER_EN 1
/* ============================================================================
* I²C based devices need an activated busmanager, so if one of these sensors
* is active, you also need to enable the busmanager.
*/
#define MFW_I2C_BUSMANAGER_EN 1
#if MFW_I2C_BUSMANAGER_EN
/*! Enables/disables the SHT25 module. */
#define MFW_SENS_SHT25_EN 1
/*! Enabales disables the NCP5623 module */
#define MFW_ACT_NCP5623_EN 1
#endif
/* ============================================================================
* Debug options
*/
#define MFW_DEBUG_REPEAT_FIRST_MESSAGE 0
#define MFW_DEBUG_ENCODE_PB_ONLY_ONCE 0
#define FC_GPS 0
#define ARM_GPS 0
#endif /* MFW_CONFIG_H_ */
......@@ -209,7 +209,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="nanopb/tests|nanopb/examples|sensors/imu_xsens|sensors/bno055|ti/driverlib/gcc|ti/driverlib/ccs" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry excluding="nanopb/tests|nanopb/examples|sensors/imu_xsens|ti/driverlib/gcc|ti/driverlib/ccs" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
......
......@@ -5,159 +5,10 @@
#ifndef MFW_CONFIG_H_
#define MFW_CONFIG_H_
/*! Defines which fields are written in the BetCall message. */
/*! Defines which controller is used. */
#define FC 1
#define ARM 0
#if (FC && ARM)
#error The board cannot simultaneously be on the ARM and on the plane. \
Please choose only one.
#endif
/*! If enabled, the communication to groundstation is done through UART (RS232)
* interface. */
#define MFW_GROUNDST_COMMUNICATION_VIA_UART_EN 1
/*! If enabled, the communication to groundstation is done through ethernet
* interface. */
#define MFW_GROUNDST_COMMUNICATION_VIA_ETH_EN 0
#if MFW_GROUNDST_COMMUNICATION_VIA_ETH_EN
#error Communication to GS via Ethernet not supported yet.
#endif
#if (MFW_GROUNDST_COMMUNICATION_VIA_UART && MFW_GROUNDST_COMMUNICATION_VIA_ETH)
#error Define the communication port to groundstation. Communication via\
UART and Ethernet at the same time is not possible. Check macros\
MFW_GROUNDST_COMMUNICATION_VIA_UART_EN and MFW_GROUNDST_COMMUNICATION_VIA_ETH_EN.
#endif
/* ============================================================================
* Configuration for UART communication to groundstation.
*/
#if MFW_GROUNDST_COMMUNICATION_VIA_UART_EN
/*! Defines the UART port the GS is connected to. Must be of type
* \ref E_HAL_UART_PORT_t. */
#define MFW_UART_PORT_TO_GS E_HAL_UART_PORT_0
/*! Defines the UART baudrate to be used between GS and FC. */
#define MFW_UART_BAUD_RATE_TO_GS 921600
/*! Defines the port of the enable pin of TXS0108 Level Shifter. */
#define MFW_LSHIFT_EN_PORT E_HAL_GPIO_PORT_K
/*! Defines the the enable pin of TXS0108 Level Shifter. */
#define MFW_LSHIFT_EN_PIN HAL_GPIO_PIN_2
/*! As mfw provides the buffer to the serial protocol module (for communication
* with groundstation), this number defines the buffer length of the serial
* protocol RX buffer. Make sure this value fits to the maximum legth of a
* protobuf message transmitted from GS to FC! */
#define MFW_GROUNDST_RX_BUF_LEN 8192
/*! \brief Defines the intervall (in ms) of BetCALL messages sent down to GS.
*
* \details This value can be set to '0' to send out messages as fast as
* possible. But respect the warning stated below!
*
* \warning We need to limit the amount of data (we sent down to GS) to not
* generate more data than the UART can send out. Therfore, this
* value has a strong relation to \ref MFW_UART_BAUD_RATE_TO_GS.
*/
#define MFW_INTERVALL_BETCALL_MSG_TO_GS 4
#endif /* MFW_GROUNDST_COMMUNICATION_VIA_UART_EN */
/*! In case of FC we need the pb forwarder to forwarder TAS messages to GS. */
#define MFW_PB_FORWARDER_EN 1
/*! Use software CRC instead of hardware CRC. */
#define MFW_SOFTWARE_CRC_EN 0
/* ============================================================================
* Configuration for ethernet communication to groundstation.
*/
#if MFW_GROUNDST_COMMUNICATION_VIA_ETH_EN
/* Add configs/settings for ETH communciation here like IP address and port. */
#endif /* MFW_GROUNDST_COMMUNICATION_VIA_ETH_EN */
/* ============================================================================
* Configuration for protocol buffers.
*/
/*! Size of the output stream buffer, i.e. the buffer where nanopb writes the
* encoded protocol buffer message to. */
#define MFW_PB_OSTREAM_BUF_LEN 8192
/* ============================================================================
* Configuration for actuator modules.
*/
/*! Enables/disables the servo dude elevator. */
#define MFW_ACT_SERVO_DUDE_ELEVATOR_EN 1
/*! Enables/disables the servo dude rudder. */
#define MFW_ACT_SERVO_DUDE_RUDDER_EN 1
/*! Enables/disables the servo dude flap-left. */
#define MFW_ACT_SERVO_DUDE_FLAP_LEFT_EN 0
/*! Enables/disables the servo dude flap-right. */
#define MFW_ACT_SERVO_DUDE_FLAP_RIGHT_EN 1
/*! Enables/disables the servo dude aileron-left. */
#define MFW_ACT_SERVO_DUDE_AILERON_LEFT_EN 0
/*! Enables/disables the servo dude aileron-right. */
#define MFW_ACT_SERVO_DUDE_AILERON_RIGHT_EN 1
/*! Checks if any of the servo dudes (MFW_ACT_SERVO_DUDE_xxx) is enabled. */
#define MFW_ACT_IS_ANY_SERVO_DUDE_ENABLED \
(MFW_ACT_SERVO_DUDE_ELEVATOR_EN || MFW_ACT_SERVO_DUDE_RUDDER_EN || \
MFW_ACT_SERVO_DUDE_FLAP_LEFT_EN || MFW_ACT_SERVO_DUDE_FLAP_RIGHT_EN || \
MFW_ACT_SERVO_DUDE_AILERON_LEFT_EN || MFW_ACT_SERVO_DUDE_AILERON_RIGHT_EN)
/*! Checks if any actuator at all is enabled. */
#define MFW_ACT_IS_ANY_ACTUATOR_ENABLED (MFW_ACT_IS_ANY_SERVO_DUDE_ENABLED)
/* ============================================================================
* Configuration for sensor modules.
*/
/*! Enables/disables the tube angle module. */
#define MFW_SENS_TUBE_ANGLE_EN 0
#if MFW_SENS_TUBE_ANGLE_EN
/*! Defines the SPI port speed (Hz) for communication with tube angle sensor. */
#define MFW_SENS_TUBE_ANGLE_SPI_SPEED 2000000
#endif /* MFW_SENS_TUBE_ANGLE_EN */
/*! Enables/disables the MPU9250 module. */
#define MFW_SENS_MPU9250_EN 1
#if MFW_SENS_MPU9250_EN
/*! Defines the SPI port the MPU9250 is connected to. */
#define MFW_SENS_MPU9250_SPI_PORT E_HAL_SPI_PORT_0
/*! Defines the SPI port speed (Hz) for communication with MPU9250. */
#define MFW_SENS_MPU9250_SPI_SPEED 3000000
#endif /* MFW_SENS_MPU9250_EN */
/*! Enables/disables the BNO055 module. */
#define MFW_SENS_BNO055_EN 0
/*! Enables/disables the PPS module. */
#define MFW_SENS_PPS_EN 1
/*! Enables/disables the Loop Counter. */
#define MFW_LOOP_COUNTER_EN 1
/* ============================================================================
* I²C based devices need an activated busmanager, so if one of these sensors
* is active, you also need to enable the busmanager.
*/
#define MFW_I2C_BUSMANAGER_EN 1
#if MFW_I2C_BUSMANAGER_EN
/*! Enables/disables the SHT25 module. */
#define MFW_SENS_SHT25_EN 1
/*! Enabales disables the NCP5623 module */
#define MFW_ACT_NCP5623_EN 1
#endif
/* ============================================================================
* Debug options
*/
#define MFW_DEBUG_REPEAT_FIRST_MESSAGE 0
#define MFW_DEBUG_ENCODE_PB_ONLY_ONCE 0
#define FC_GPS 0
#define ARM_GPS 0
#endif /* MFW_CONFIG_H_ */
<?xml version="1.0" encoding="UTF-8" ?>
<?ccsproject version="1.0"?>
<projectOptions>
<deviceVariant value="Cortex M.TM4C123FH6PM"/>
<deviceFamily value="TMS470"/>
<deviceEndianness value="little"/>
<codegenToolVersion value="15.12.1.LTS"/>
<isElfFormat value="true"/>
<connection value="common/targetdb/connections/Stellaris_ICDI_Connection.xml"/>
<linkerCommandFile value="tm4c123fh6pm.cmd"/>
<rts value="libc.a"/>
<createSlaveProjects value=""/>
<templateProperties value="id=com.ti.common.project.core.emptyProjectWithMainTemplate,"/>
<filesToOpen value="main.c,"/>
<isTargetManual value="false"/>
</projectOptions>
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>main-app-gps-arm</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.ti.ccstudio.core.ccsNature</nature>
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.core.ccnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
</natures>
<linkedResources>
<link>
<name>actuators</name>
<type>2</type>
<locationURI>PARENT-2-PROJECT_LOC/src/actuators</locationURI>
</link>
<link>
<name>c-nanopb</name>
<type>2</type>
<locationURI>PARENT-2-PROJECT_LOC/submodules/betCOM/c-nanopb</locationURI>
</link>
<link>
<name>hal</name>
<type>2</type>
<locationURI>PARENT-2-PROJECT_LOC/src/hal</locationURI>
</link>
<link>
<name>mfw</name>
<type>2</type>
<locationURI>PARENT-2-PROJECT_LOC/src/mfw</locationURI>
</link>
<link>
<name>nanopb</name>
<type>2</type>
<locationURI>PARENT-2-PROJECT_LOC/submodules/nanopb</locationURI>
</link>
<link>
<name>sensors</name>
<type>2</type>
<locationURI>PARENT-2-PROJECT_LOC/src/sensors</locationURI>
</link>
<link>
<name>sproto</name>
<type>2</type>
<locationURI>PARENT-2-PROJECT_LOC/submodules/sproto</locationURI>
</link>
<link>
<name>ti</name>
<type>2</type>
<locationURI>PARENT-2-PROJECT_LOC/src/ti</locationURI>
</link>
<link>
<name>utils</name>
<type>2</type>
<locationURI>PARENT-2-PROJECT_LOC/src/utils</locationURI>
</link>
</linkedResources>
</projectDescription>
eclipse.preferences.version=1
inEditor=false
onBuild=false
eclipse.preferences.version=1
org.eclipse.cdt.debug.core.toggleBreakpointModel=com.ti.ccstudio.debug.CCSBreakpointMarker
This diff is collapsed.
/*
* main-mfw.c
*/
#include "mfw.h"
/* ===========================================================================*/
/* main() */
/* ===========================================================================*/
int main(void)
{
if( hal_init() )
{
if( mfw_init() )
{
while(1)
{
mfw_run();
}
}
}
return 0;
}
/*
* mfw-config.h
*/
#ifndef MFW_CONFIG_H_
#define MFW_CONFIG_H_
/*! Defines which controller is used. */
#define FC 0
#define ARM 0
#define FC_GPS 0
#define ARM_GPS 1
#endif /* MFW_CONFIG_H_ */
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<configurations XML_version="1.2" id="configurations_0">
<configuration XML_version="1.2" id="configuration_0">
<instance XML_version="1.2" desc="Stellaris In-Circuit Debug Interface" href="connections/Stellaris_ICDI_Connection.xml" id="Stellaris In-Circuit Debug Interface" xml="Stellaris_ICDI_Connection.xml" xmlpath="connections"/>
<connection XML_version="1.2" id="Stellaris In-Circuit Debug Interface">
<instance XML_version="1.2" href="drivers/stellaris_cs_dap.xml" id="drivers" xml="stellaris_cs_dap.xml" xmlpath="drivers"/>
<instance XML_version="1.2" href="drivers/stellaris_cortex_m4.xml" id="drivers" xml="stellaris_cortex_m4.xml" xmlpath="drivers"/>
<platform XML_version="1.2" id="platform_0">
<instance XML_version="1.2" desc="Tiva TM4C123FH6PM" href="devices/tm4c123fh6pm.xml" id="Tiva TM4C123FH6PM" xml="tm4c123fh6pm.xml" xmlpath="devices"/>
</platform>
</connection>
</configuration>
</configurations>
The 'targetConfigs' folder contains target-configuration (.ccxml) files, automatically generated based
on the device and connection settings specified in your project on the Properties > General page.
Please note that in automatic target-configuration management, changes to the project's device and/or
connection settings will either modify an existing or generate a new target-configuration file. Thus,
if you manually edit these auto-generated files, you may need to re-apply your changes. Alternatively,
you may create your own target-configuration file for this project and manage it manually. You can
always switch back to automatic target-configuration management by checking the "Manage the project's
target-configuration automatically" checkbox on the project's Properties > General page.
\ No newline at end of file
/******************************************************************************
*
* Default Linker Command file for the Texas Instruments TM4C123FH6PM
*
* This is derived from revision 15071 of the TivaWare Library.
*
*****************************************************************************/
--retain=g_pfnVectors
MEMORY
{
FLASH (RX) : origin = 0x00000000, length = 0x00040000
SRAM (RWX) : origin = 0x20000000, length = 0x00008000
}
/* The following command line options are set as part of the CCS project. */
/* If you are building using the command line, or for some reason want to */
/* define them here, you can uncomment and modify these lines as needed. */
/* If you are using CCS for building, it is probably better to make any such */
/* modifications in your CCS project and leave this file alone. */
/* */
/* --heap_size=0 */
/* --stack_size=256 */
/* --library=rtsv7M4_T_le_eabi.lib */
/* Section allocation in memory */
SECTIONS
{
.intvecs: > 0x00000000
.text : > FLASH
.const : > FLASH
.cinit : > FLASH
.pinit : > FLASH
.init_array : > FLASH
.vtable : > 0x20000000
.data : > SRAM
.bss : > SRAM
.sysmem : > SRAM
.stack : > SRAM
}
__STACK_TOP = __stack + 512;
This diff is collapsed.
......@@ -42,25 +42,25 @@ bool hal_dma_init(void)
//
// Enable the uDMA controller at the system level.
//
ROM_SysCtlPeripheralEnable(SYSCTL_PERIPH_UDMA);
MAP_SysCtlPeripheralEnable(SYSCTL_PERIPH_UDMA);
//
// Enable the uDMA controller error interrupt. This interrupt will occur
// if there is a bus error during a transfer.
//
uDMAIntRegister(UDMA_INT_ERR, uDMAErrorHandler); /* No ROM_() available! */
ROM_IntEnable(INT_UDMAERR);
MAP_IntEnable(INT_UDMAERR);
//
// Enable the uDMA controller.
//
ROM_uDMAEnable();
MAP_uDMAEnable();
//
// Point at the control table to use for channel control structures.
//
ROM_uDMAControlBaseSet(pui8ControlTable);
MAP_uDMAControlBaseSet(pui8ControlTable);
ui32_dmaErrorCount = 0;
......@@ -83,7 +83,7 @@ uDMAErrorHandler(void)
//
// Check for uDMA error bit
//
ui32Status = ROM_uDMAErrorStatusGet();
ui32Status = MAP_uDMAErrorStatusGet();
//
// If there is a uDMA error, then clear the error and increment
......@@ -91,7 +91,7 @@ uDMAErrorHandler(void)
//
if(ui32Status)
{
ROM_uDMAErrorStatusClear();
MAP_uDMAErrorStatusClear();
ui32_dmaErrorCount++;
}
}
......
......@@ -389,21 +389,21 @@ bool hal_gpio_setDir(E_HAL_GPIO_PORT_t e_port, uint8_t ui8_pins, E_HAL_GPIO_DIR_
//
// Enable the GPIO port.
//
ROM_SysCtlPeripheralEnable(ui32_sysClt);
MAP_SysCtlPeripheralEnable(ui32_sysClt);
//
// Enable the GPIO pins.
//
if (e_dir == E_HAL_GPIO_DIR_IN)
{
ROM_GPIOPinTypeGPIOInput(ui32_port, ui8_pins);
MAP_GPIOPinTypeGPIOInput(ui32_port, ui8_pins);
// Enable weak pullup resistor. Throws error when using ROM_* API.
/* GPIOPadConfigSet(ui32_port, ui8_pins, GPIO_STRENGTH_2MA,
* GPIO_PIN_TYPE_STD_WPU); */
}
else if (e_dir == E_HAL_GPIO_DIR_OUT)
{
ROM_GPIOPinTypeGPIOOutput(ui32_port, ui8_pins);