arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Code Activity

Merge remote-tracking branch 'origin/ide-1.5.x' into ide-1.5.x

Browse Source
This commit is contained in:
Fede85
2013-10-10 20:59:01 +02:00
parent a31857688b be58b435fb
commit 02550de1e9
324 changed files with 79374 additions and 30612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
hardware/arduino/avr/boards.txt
View File

@ -23,7 +23,7 @@ yun.upload.wait_for_upload_port=true
yun.bootloader.tool=avrdude
yun.bootloader.low_fuses=0xff
yun.bootloader.high_fuses=0xd8
yun.bootloader.extended_fuses=0xcb
yun.bootloader.extended_fuses=0xfb
yun.bootloader.file=caterina/Caterina-Yun.hex
yun.bootloader.unlock_bits=0x3F
yun.bootloader.lock_bits=0x2F
@ -35,7 +35,7 @@ yun.build.pid=0x8041
yun.build.usb_product="Arduino Yun"
yun.build.board=AVR_YUN
yun.build.core=arduino
yun.build.variant=leonardo
yun.build.variant=yun
yun.build.extra_flags={build.usb_flags}
##############################################################
@ -156,57 +156,85 @@ nano.menu.cpu.atmega168.build.mcu=atmega168
##############################################################
mega2560.name=Arduino Mega 2560 or Mega ADK
mega2560.vid.0=0x2341
mega2560.pid.0=0x0044
mega2560.vid.1=0x2341
mega2560.pid.1=0x003f
mega2560.cpu=2560 or ADK
mega.name=Arduino Mega or Mega 2560
mega2560.upload.tool=avrdude
mega2560.upload.protocol=wiring
mega2560.upload.maximum_size=258048
mega2560.upload.maximum_data_size=8192
mega2560.upload.speed=115200
mega2560.bootloader.tool=avrdude
mega2560.bootloader.low_fuses=0xFF
mega2560.bootloader.high_fuses=0xD8
mega2560.bootloader.extended_fuses=0xFD
mega2560.bootloader.file=stk500v2/stk500boot_v2_mega2560.hex
mega2560.bootloader.unlock_bits=0x3F
mega2560.bootloader.lock_bits=0x0F
mega2560.build.mcu=atmega2560
mega2560.build.f_cpu=16000000L
mega2560.build.board=AVR_MEGA2560
mega2560.build.core=arduino
mega2560.build.variant=mega
##############################################################
mega.name=Arduino Mega (ATmega1280)
mega.cpu=ATmega1280
mega.vid.0=0x2341
mega.pid.0=0x0010
mega.vid.1=0x2341
mega.pid.1=0x0042
mega.upload.tool=avrdude
mega.upload.protocol=arduino
mega.upload.maximum_size=126976
mega.upload.maximum_data_size=8192
mega.upload.speed=57600
mega.bootloader.tool=avrdude
mega.bootloader.low_fuses=0xFF
mega.bootloader.high_fuses=0xDA
mega.bootloader.extended_fuses=0xF5
mega.bootloader.file=atmega/ATmegaBOOT_168_atmega1280.hex
mega.bootloader.unlock_bits=0x3F
mega.bootloader.lock_bits=0x0F
mega.build.mcu=atmega1280
mega.build.f_cpu=16000000L
mega.build.board=AVR_MEGA
mega.build.core=arduino
mega.build.variant=mega
# default board may be overridden by the cpu menu
mega.build.board=AVR_MEGA2560
## Arduino Mega w/ ATmega2560
## -------------------------
mega.menu.cpu.atmega2560=ATmega2560 (Mega 2560)
mega.menu.cpu.atmega2560.upload.protocol=wiring
mega.menu.cpu.atmega2560.upload.maximum_size=258048
mega.menu.cpu.atmega2560.upload.speed=115200
mega.menu.cpu.atmega2560.bootloader.high_fuses=0xD8
mega.menu.cpu.atmega2560.bootloader.extended_fuses=0xFD
mega.menu.cpu.atmega2560.bootloader.file=stk500v2/stk500boot_v2_mega2560.hex
mega.menu.cpu.atmega2560.build.mcu=atmega2560
mega.menu.cpu.atmega2560.build.board=AVR_MEGA2560
## Arduino Mega w/ ATmega1280
## -------------------------
mega.menu.cpu.atmega1280=ATmega1280
mega.menu.cpu.atmega1280.upload.protocol=arduino
mega.menu.cpu.atmega1280.upload.maximum_size=126976
mega.menu.cpu.atmega1280.upload.speed=57600
mega.menu.cpu.atmega1280.bootloader.high_fuses=0xDA
mega.menu.cpu.atmega1280.bootloader.extended_fuses=0xF5
mega.menu.cpu.atmega1280.bootloader.file=atmega/ATmegaBOOT_168_atmega1280.hex
mega.menu.cpu.atmega1280.build.mcu=atmega1280
mega.menu.cpu.atmega1280.build.board=AVR_MEGA
##############################################################
megaADK.name=Arduino Mega ADK
megaADK.vid.0=0x2341
megaADK.pid.0=0x003f
megaADK.vid.1=0x2341
megaADK.pid.1=0x0044
megaADK.upload.tool=avrdude
megaADK.upload.protocol=wiring
megaADK.upload.maximum_size=258048
megaADK.upload.maximum_data_size=8192
megaADK.upload.speed=115200
megaADK.bootloader.tool=avrdude
megaADK.bootloader.low_fuses=0xFF
megaADK.bootloader.high_fuses=0xD8
megaADK.bootloader.extended_fuses=0xFD
megaADK.bootloader.file=stk500v2/stk500boot_v2_mega2560.hex
megaADK.bootloader.unlock_bits=0x3F
megaADK.bootloader.lock_bits=0x0F
megaADK.build.mcu=atmega2560
megaADK.build.f_cpu=16000000L
megaADK.build.board=AVR_ADK
megaADK.build.core=arduino
megaADK.build.variant=mega
##############################################################
@ -649,7 +677,7 @@ robotControl.name=Arduino Robot Control
robotControl.upload.tool=avrdude
robotControl.upload.protocol=avr109
robotControl.upload.maximum_size=28672
robotControl.upload.data_size=2560
robotControl.upload.maximum_data_size=2560
robotControl.upload.speed=57600
robotControl.upload.disable_flushing=true
robotControl.upload.use_1200bps_touch=true
@ -679,7 +707,7 @@ robotMotor.name=Arduino Robot Motor
robotMotor.upload.tool=avrdude
robotMotor.upload.protocol=avr109
robotMotor.upload.maximum_size=28672
robotMotor.upload.data_size=2560
robotMotor.upload.maximum_data_size=2560
robotMotor.upload.speed=57600
robotMotor.upload.disable_flushing=true
robotMotor.upload.use_1200bps_touch=true

0
hardware/arduino/avr/bootloaders/caterina-LilyPadUSB/Caterina-LilyPadUSB.hex Executable file → Normal file
View File

6
hardware/arduino/avr/cores/arduino/CDC.cpp
View File

@ -115,7 +115,11 @@ bool WEAK CDC_Setup(Setup& setup)
int _serialPeek = -1;
void Serial_::begin(uint16_t baud_count)
void Serial_::begin(unsigned long baud_count)
{
}
void Serial_::begin(unsigned long baud_count, byte config)
{
}

3
hardware/arduino/avr/cores/arduino/USBAPI.h
View File

@ -36,7 +36,8 @@ struct ring_buffer;
class Serial_ : public Stream
{
public:
void begin(uint16_t baud_count);
void begin(unsigned long);
void begin(unsigned long, uint8_t);
void end(void);
virtual int available(void);

27
hardware/arduino/avr/variants/yun/pins_arduino.h Normal file
View File

@ -0,0 +1,27 @@
/*
pins_arduino.h - Pin definition functions for Arduino
Part of Arduino - http://www.arduino.cc/
Copyright (c) 2013 Arduino LLC
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
$Id: wiring.h 249 2007-02-03 16:52:51Z mellis $
*/
#include "../leonardo/pins_arduino.h"
#define LED_BUILTIN 13

4
hardware/arduino/sam/cores/arduino/USB/CDC.cpp
View File

@ -149,6 +149,10 @@ void Serial_::begin(uint32_t baud_count)
{
}
void Serial_::begin(uint32_t baud_count, uint8_t config)
{
}
void Serial_::end(void)
{
}

1
hardware/arduino/sam/cores/arduino/USB/USBAPI.h
View File

@ -49,6 +49,7 @@ private:
RingBuffer *_cdc_rx_buffer;
public:
void begin(uint32_t baud_count);
void begin(uint32_t baud_count, uint8_t config);
void end(void);
virtual int available(void);

51
hardware/arduino/sam/system/libsam/source/adc.c
View File

@ -46,7 +46,7 @@ extern "C" {
* @{
*/
#if SAM3S_SERIES || SAM4S_SERIES || SAM3N_SERIES || SAM3XA_SERIES
#if SAM3S_SERIES || SAM4S_SERIES || SAM3N_SERIES
/**
* \brief Initialize the given ADC with the specified ADC clock and startup time.
*
@ -80,6 +80,55 @@ uint32_t adc_init(Adc *p_adc, const uint32_t ul_mck,
ADC_MR_STARTUP_Msk);
return 0;
}
#elif SAM3XA_SERIES
/**
* \brief Initialize the given ADC with the specified ADC clock and startup time.
*
* \param p_adc Pointer to an ADC instance.
* \param ul_mck Main clock of the device (value in Hz).
* \param ul_adc_clock Analog-to-Digital conversion clock (value in Hz).
* \param uc_startup ADC start up time. Please refer to the product datasheet
* for details.
*
* \return 0 on success.
*/
uint32_t adc_init(Adc *p_adc, const uint32_t ul_mck,
const uint32_t ul_adc_clock, const uint8_t uc_startuptime)
{
uint32_t startup_table[] = { 0, 8, 16, 24, 64, 80, 96, 112, 512, 576, 640, 704, 768, 832, 896, 960 };
uint32_t ul_prescal, ul_startup, ul_mr_startup, ul_real_adc_clock;
p_adc->ADC_CR = ADC_CR_SWRST;
/* Reset Mode Register. */
p_adc->ADC_MR = 0;
/* Reset PDC transfer. */
p_adc->ADC_PTCR = (ADC_PTCR_RXTDIS | ADC_PTCR_TXTDIS);
p_adc->ADC_RCR = 0;
p_adc->ADC_RNCR = 0;
if (ul_mck % (2 * ul_adc_clock)) {
// Division with reminder
ul_prescal = ul_mck / (2 * ul_adc_clock);
} else {
// Whole division
ul_prescal = ul_mck / (2 * ul_adc_clock) - 1;
}
ul_real_adc_clock = ul_mck / (2 * (ul_prescal + 1));
// ADC clocks needed to get ul_startuptime uS
ul_startup = (ul_real_adc_clock / 1000000) * uc_startuptime;
// Find correct MR_STARTUP value from conversion table
for (ul_mr_startup=0; ul_mr_startup<16; ul_mr_startup++) {
if (startup_table[ul_mr_startup] >= ul_startup)
break;
}
if (ul_mr_startup==16)
return -1;
p_adc->ADC_MR |= ADC_MR_PRESCAL(ul_prescal) |
((ul_mr_startup << ADC_MR_STARTUP_Pos) & ADC_MR_STARTUP_Msk);
return 0;
}
#elif SAM3U_SERIES
/**
* \brief Initialize the given ADC with the specified ADC clock and startup time.

BIN
hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a
View File

Binary file not shown.

69
hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a.txt
View File

@ -72,7 +72,7 @@ pmc.o:
00000000 T pmc_switch_udpck_to_upllck
pwmc.o:
00000000 r C.18.4409
00000000 r C.9.8049
00000000 t FindClockConfiguration
00000000 T PWMC_ConfigureChannel
00000000 T PWMC_ConfigureChannelExt
@ -100,14 +100,14 @@ pwmc.o:
00000000 T PWMC_SetSyncChannelUpdateUnlock
00000000 T PWMC_WriteBuffer
U __assert_func
00000000 r __func__.4405
00000000 r __func__.4429
00000000 r __func__.4463
00000000 r __func__.4509
00000000 r __func__.4542
00000000 r __func__.4563
00000000 r __func__.4712
00000000 r __func__.4726
00000000 r __func__.6631
00000000 r __func__.6642
00000000 r __func__.6657
00000000 r __func__.6668
00000000 r __func__.6679
00000000 r __func__.6686
00000000 r __func__.6770
00000000 r __func__.6776
rtc.o:
00000000 T RTC_ClearSCCR
@ -123,9 +123,9 @@ rtc.o:
00000000 T RTC_SetTime
00000000 T RTC_SetTimeAlarm
U __assert_func
00000000 r __func__.4402
00000000 r __func__.4415
00000000 r __func__.4423
00000000 r __func__.6628
00000000 r __func__.6637
00000000 r __func__.6642
rtt.o:
00000000 T RTT_EnableIT
@ -134,8 +134,8 @@ rtt.o:
00000000 T RTT_SetAlarm
00000000 T RTT_SetPrescaler
U __assert_func
00000000 r __func__.4412
00000000 r __func__.4426
00000000 r __func__.6635
00000000 r __func__.6643
spi.o:
00000000 T SPI_Configure
@ -161,9 +161,9 @@ tc.o:
00000000 T TC_Start
00000000 T TC_Stop
U __assert_func
00000000 r __func__.4404
00000000 r __func__.4415
00000000 r __func__.4425
00000000 r __func__.6630
00000000 r __func__.6636
00000000 r __func__.6642
timetick.o:
00000000 T GetTickCount
@ -190,18 +190,18 @@ twi.o:
00000000 T TWI_TransferComplete
00000000 T TWI_WriteByte
U __assert_func
00000000 r __func__.4770
00000000 r __func__.4801
00000000 r __func__.4814
00000000 r __func__.4823
00000000 r __func__.4845
00000000 r __func__.4854
00000000 r __func__.4865
00000000 r __func__.4904
00000000 r __func__.4914
00000000 r __func__.4923
00000000 r __func__.4931
00000000 r __func__.4939
00000000 r __func__.7003
00000000 r __func__.7018
00000000 r __func__.7022
00000000 r __func__.7029
00000000 r __func__.7033
00000000 r __func__.7038
00000000 r __func__.7046
00000000 r __func__.7060
00000000 r __func__.7065
00000000 r __func__.7069
00000000 r __func__.7074
00000000 r __func__.7078
usart.o:
00000000 T USART_Configure
@ -220,7 +220,7 @@ usart.o:
00000000 T USART_Write
00000000 T USART_WriteBuffer
U __assert_func
00000000 r __func__.4778
00000000 r __func__.6924
wdt.o:
00000000 T WDT_Disable
@ -298,6 +298,7 @@ startup_sam3xa.o:
U main
adc.o:
00000000 r C.0.8141
00000000 T adc_configure_power_save
00000000 T adc_configure_sequence
00000000 T adc_configure_timing
@ -482,12 +483,12 @@ efc.o:
00000000 T efc_get_wait_state
00000000 T efc_init
00000000 T efc_perform_command
00000074 T efc_perform_fcr
00000070 T efc_perform_fcr
00000000 T efc_perform_read_sequence
00000000 T efc_set_flash_access_mode
00000000 T efc_set_wait_state
00000070 T efc_write_fmr
00000000 b iap_perform_command.4696
0000006c T efc_write_fmr
00000000 b iap_perform_command.6905
gpbr.o:
00000000 T gpbr_read
@ -552,7 +553,6 @@ rstc.o:
00000000 T rstc_start_software_reset
emac.o:
00000000 t T.43
00000000 t circ_inc
00000000 T emac_dev_get_tx_load
00000000 T emac_dev_init
@ -566,6 +566,7 @@ emac.o:
00000000 T emac_phy_write
00000000 t emac_reset_rx_mem
00000000 t emac_reset_tx_mem
00000000 t emac_wait_phy.clone.1
00000000 b gs_rx_desc
00000000 b gs_tx_callback
00000000 b gs_tx_desc