jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some fixes found by gcc 8

Browse Source
This commit is contained in:
me-no-dev 2018-11-28 00:35:43 +01:00
parent aa030e044c
commit fcd734a13c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cores/esp32/esp32-hal-i2c.c
View File

@ -1142,7 +1142,7 @@ i2c_err_t i2cProcQueue(i2c_t * i2c, uint32_t *readCount, uint16_t timeOutMillis)
if(tdq->ctrl.addrReq ==2) { // 10bit address if(tdq->ctrl.addrReq ==2) { // 10bit address
taddr =((tdq->ctrl.addr >> 7) & 0xFE) taddr =((tdq->ctrl.addr >> 7) & 0xFE)
|tdq->ctrl.mode; |tdq->ctrl.mode;
taddr = (taddr <<8) || (tdq->ctrl.addr&0xFF); taddr = (taddr <<8) | (tdq->ctrl.addr&0xFF);
} else { // 7bit address } else { // 7bit address
taddr = ((tdq->ctrl.addr<<1)&0xFE) taddr = ((tdq->ctrl.addr<<1)&0xFE)
|tdq->ctrl.mode; |tdq->ctrl.mode;

6
cores/esp32/esp32-hal-time.c
View File

@ -17,9 +17,9 @@
static void setTimeZone(long offset, int daylight) static void setTimeZone(long offset, int daylight)
{ {
char cst[16] = {0}; char cst[17] = {0};
char cdt[16] = "DST"; char cdt[17] = "DST";
char tz[32] = {0}; char tz[33] = {0};
if(offset % 3600){ if(offset % 3600){
sprintf(cst, "UTC%ld:%02u:%02u", offset / 3600, abs((offset % 3600) / 60), abs(offset % 60)); sprintf(cst, "UTC%ld:%02u:%02u", offset / 3600, abs((offset % 3600) / 60), abs(offset % 60));