Skip to content

Commit cf69ea0

Browse files
committedAug 10, 2015
Merge pull request #678 from nkolban/esp8266
Made changes to allow the compiler to compile without warnings.
2 parents bfd7ea3 + 9239e9d commit cf69ea0

File tree

5 files changed

+11
-4
lines changed

5 files changed

+11
-4
lines changed
 

‎hardware/esp8266com/esp8266/cores/esp8266/Tone.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@
3535
#include "Arduino.h"
3636
#include "pins_arduino.h"
3737

38+
/*
3839
static int8_t toneBegin(uint8_t _pin) {
3940
//TODO implement tone
4041
return 0;
4142
}
43+
*/
4244

4345
void tone(uint8_t _pin, unsigned int frequency, unsigned long duration) {
4446
//TODO implement tone

‎hardware/esp8266com/esp8266/cores/esp8266/Updater.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,12 @@ class UpdaterClass {
108108
void _reset();
109109
bool _writeBuffer();
110110

111+
uint8_t _error;
111112
uint8_t *_buffer;
112113
size_t _bufferLen;
113114
size_t _size;
114115
uint32_t _startAddress;
115116
uint32_t _currentAddress;
116-
uint8_t _error;
117117
};
118118

119119
extern UpdaterClass Update;

‎hardware/esp8266com/esp8266/cores/esp8266/cbuf.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class cbuf {
7070
size_t bytes_available = getSize();
7171
size_t size_to_read = (size < bytes_available) ? size : bytes_available;
7272
size_t size_read = size_to_read;
73-
if(_end < _begin && size_to_read > _bufend - _begin) {
73+
if(_end < _begin && size_to_read > (size_t)(_bufend - _begin)) {
7474
size_t top_size = _bufend - _begin;
7575
memcpy(dst, _begin, top_size);
7676
_begin = _buf;
@@ -95,7 +95,7 @@ class cbuf {
9595
size_t bytes_available = room();
9696
size_t size_to_write = (size < bytes_available) ? size : bytes_available;
9797
size_t size_written = size_to_write;
98-
if(_end > _begin && size_to_write > _bufend - _end) {
98+
if(_end > _begin && size_to_write > (size_t)(_bufend - _end)) {
9999
size_t top_size = _bufend - _end;
100100
memcpy(_end, src, top_size);
101101
_end = _buf;

‎hardware/esp8266com/esp8266/cores/esp8266/core_esp8266_postmortem.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ static void uart_write_char_d(char c);
3535
static void uart0_write_char_d(char c);
3636
static void uart1_write_char_d(char c);
3737
static void print_stack(uint32_t start, uint32_t end);
38-
static void print_pcs(uint32_t start, uint32_t end);
38+
//static void print_pcs(uint32_t start, uint32_t end);
3939

4040
void __wrap_system_restart_local() {
4141
register uint32_t sp asm("a1");
@@ -108,6 +108,7 @@ static void print_stack(uint32_t start, uint32_t end) {
108108
ets_printf("<<<stack<<<\n");
109109
}
110110

111+
/*
111112
static void print_pcs(uint32_t start, uint32_t end) {
112113
uint32_t n = 0;
113114
ets_printf("\n>>>pc>>>\n");
@@ -122,6 +123,7 @@ static void print_pcs(uint32_t start, uint32_t end) {
122123
}
123124
ets_printf("<<<pc<<<\n");
124125
}
126+
*/
125127

126128
void uart_write_char_d(char c) {
127129
uart0_write_char_d(c);

‎hardware/esp8266com/esp8266/cores/esp8266/core_esp8266_si2c.c

+3
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,11 @@ void twi_stop(void){
7575

7676
static void twi_delay(unsigned char v){
7777
unsigned int i;
78+
#pragma GCC diagnostic push
79+
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
7880
unsigned int reg;
7981
for(i=0;i<v;i++) reg = GPI;
82+
#pragma GCC diagnostic pop
8083
}
8184

8285
static bool twi_write_start(void) {

0 commit comments

Comments
 (0)