ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1128 from jeremybrodt/max32600mbedrev2 

Maxim Integrated platform max32600 updates
pull/1132/head
Martin Kojtal 2015-05-22 08:41:13 +01:00
parent 1838c70a90 91f856b2b9
commit e55fa60b4f
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/USBDevice/USBDevice/USBEndpoints_Maxim.h
View File

@ -85,6 +85,10 @@
#define EPINT_IN (EP4IN)
#define EPINT_OUT_callback EP3_OUT_callback
#define EPINT_IN_callback EP4_IN_callback
/* Isochronous endpoints */
/* NOT SUPPORTED - use invalid endpoint number to prevent built errors */
#define EPISO_OUT (EP0OUT)
#define EPISO_IN (EP0IN)
#define MAX_PACKET_SIZE_EPBULK (64)
#define MAX_PACKET_SIZE_EPINT (64)

8
libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32600/TARGET_MAX32600MBED/PinNames.h
View File

@ -170,10 +170,10 @@ typedef enum {
AOUT_CO = (0xF << PORT_SHIFT) | 2,
AOUT_DO = (0xF << PORT_SHIFT) | 3,
LED_GREEN = P7_4,
LED_RED = P7_0,
LED_YELLOW = P6_6,
LED_BLUE = P7_6,
LED_GREEN = P6_6,
LED_RED = P7_1,
LED_YELLOW = P7_0,
LED_BLUE = P6_7,
// mbed original LED naming
LED1 = LED_RED,

2
libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32600/spi_api.c
View File

@ -115,7 +115,7 @@ void spi_format(spi_t *obj, int bits, int mode, int slave)
void spi_frequency(spi_t *obj, int hz)
{
// Maximum frequency is half the system frequency
MBED_ASSERT((unsigned int)hz < (SystemCoreClock / 2));
MBED_ASSERT((unsigned int)hz <= (SystemCoreClock / 2));
unsigned clocks = ((SystemCoreClock/2)/(hz));
// Figure out the divider ratio

2
libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/spi_api.c
View File

@ -115,7 +115,7 @@ void spi_format(spi_t *obj, int bits, int mode, int slave)
void spi_frequency(spi_t *obj, int hz)
{
// Maximum frequency is half the system frequency
MBED_ASSERT((unsigned int)hz < (SystemCoreClock / 2));
MBED_ASSERT((unsigned int)hz <= (SystemCoreClock / 2));
unsigned clocks = ((SystemCoreClock/2)/(hz));
// Figure out the divider ratio