arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-21 10:26:06 +03:00
Code

Merge pull request #678 from nkolban/esp8266

Browse Source 
Made changes to allow the compiler to compile without warnings.
This commit is contained in:
Ivan Grokhotkov 2015-08-10 17:36:34 +03:00
commit b59f6e3598
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cores/esp8266/Tone.cpp
View File

@ -35,10 +35,12 @@
#include "Arduino.h" #include "Arduino.h"
#include "pins_arduino.h" #include "pins_arduino.h"
/*
static int8_t toneBegin(uint8_t _pin) { static int8_t toneBegin(uint8_t _pin) {
//TODO implement tone //TODO implement tone
return 0; return 0;
} }
*/
void tone(uint8_t _pin, unsigned int frequency, unsigned long duration) { void tone(uint8_t _pin, unsigned int frequency, unsigned long duration) {
//TODO implement tone //TODO implement tone

2
cores/esp8266/Updater.h
View File

@ -108,12 +108,12 @@ class UpdaterClass {
void _reset(); void _reset();
bool _writeBuffer(); bool _writeBuffer();
uint8_t _error;
uint8_t *_buffer; uint8_t *_buffer;
size_t _bufferLen; size_t _bufferLen;
size_t _size; size_t _size;
uint32_t _startAddress; uint32_t _startAddress;
uint32_t _currentAddress; uint32_t _currentAddress;
uint8_t _error;
}; };
extern UpdaterClass Update; extern UpdaterClass Update;

4
cores/esp8266/cbuf.h
View File

@ -70,7 +70,7 @@ class cbuf {
size_t bytes_available = getSize(); size_t bytes_available = getSize();
size_t size_to_read = (size < bytes_available) ? size : bytes_available; size_t size_to_read = (size < bytes_available) ? size : bytes_available;
size_t size_read = size_to_read; size_t size_read = size_to_read;
if(_end < _begin && size_to_read > _bufend - _begin) { if(_end < _begin && size_to_read > (size_t)(_bufend - _begin)) {
size_t top_size = _bufend - _begin; size_t top_size = _bufend - _begin;
memcpy(dst, _begin, top_size); memcpy(dst, _begin, top_size);
_begin = _buf; _begin = _buf;
@ -95,7 +95,7 @@ class cbuf {
size_t bytes_available = room(); size_t bytes_available = room();
size_t size_to_write = (size < bytes_available) ? size : bytes_available; size_t size_to_write = (size < bytes_available) ? size : bytes_available;
size_t size_written = size_to_write; size_t size_written = size_to_write;
if(_end > _begin && size_to_write > _bufend - _end) { if(_end > _begin && size_to_write > (size_t)(_bufend - _end)) {
size_t top_size = _bufend - _end; size_t top_size = _bufend - _end;
memcpy(_end, src, top_size); memcpy(_end, src, top_size);
_end = _buf; _end = _buf;

4
cores/esp8266/core_esp8266_postmortem.c
View File

@ -35,7 +35,7 @@ static void uart_write_char_d(char c);
static void uart0_write_char_d(char c); static void uart0_write_char_d(char c);
static void uart1_write_char_d(char c); static void uart1_write_char_d(char c);
static void print_stack(uint32_t start, uint32_t end); static void print_stack(uint32_t start, uint32_t end);
static void print_pcs(uint32_t start, uint32_t end); //static void print_pcs(uint32_t start, uint32_t end);
void __wrap_system_restart_local() { void __wrap_system_restart_local() {
register uint32_t sp asm("a1"); register uint32_t sp asm("a1");
@ -108,6 +108,7 @@ static void print_stack(uint32_t start, uint32_t end) {
ets_printf("<<<stack<<<\n"); ets_printf("<<<stack<<<\n");
} }
/*
static void print_pcs(uint32_t start, uint32_t end) { static void print_pcs(uint32_t start, uint32_t end) {
uint32_t n = 0; uint32_t n = 0;
ets_printf("\n>>>pc>>>\n"); ets_printf("\n>>>pc>>>\n");
@ -122,6 +123,7 @@ static void print_pcs(uint32_t start, uint32_t end) {
} }
ets_printf("<<<pc<<<\n"); ets_printf("<<<pc<<<\n");
} }
*/
void uart_write_char_d(char c) { void uart_write_char_d(char c) {
uart0_write_char_d(c); uart0_write_char_d(c);

3
cores/esp8266/core_esp8266_si2c.c
View File

@ -75,8 +75,11 @@ void twi_stop(void){
static void twi_delay(unsigned char v){ static void twi_delay(unsigned char v){
unsigned int i; unsigned int i;
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
unsigned int reg; unsigned int reg;
for(i=0;i<v;i++) reg = GPI; for(i=0;i<v;i++) reg = GPI;
#pragma GCC diagnostic pop
} }
static bool twi_write_start(void) { static bool twi_write_start(void) {