From 28a807306915d68aa584300c91f431a6af22c037 Mon Sep 17 00:00:00 2001 From: M Hotchin <35244463+MHotchin@users.noreply.github.com> Date: Sat, 7 Nov 2020 18:55:59 -0800 Subject: [PATCH 1/2] Fix issue 4095 (#4503) pgmspace.h missing 'pgm_get_far_address' --- cores/esp32/pgmspace.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cores/esp32/pgmspace.h b/cores/esp32/pgmspace.h index aa58775f..75f7e801 100644 --- a/cores/esp32/pgmspace.h +++ b/cores/esp32/pgmspace.h @@ -53,6 +53,8 @@ typedef unsigned long prog_uint32_t; *(void * const *)(_addr); \ }) +#define pgm_get_far_address(x) ((uint32_t)(&(x))) + #define pgm_read_byte_near(addr) pgm_read_byte(addr) #define pgm_read_word_near(addr) pgm_read_word(addr) #define pgm_read_dword_near(addr) pgm_read_dword(addr) From 534f0810a6e267333fd219cb07015e957a859935 Mon Sep 17 00:00:00 2001 From: Pavel Melnikov Date: Mon, 9 Nov 2020 22:08:13 +0700 Subject: [PATCH 2/2] fix bitWrite macro (#4507) Fixes https://github.com/espressif/arduino-esp32/issues/4466 --- cores/esp32/Arduino.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cores/esp32/Arduino.h b/cores/esp32/Arduino.h index bc028e11..addcb206 100644 --- a/cores/esp32/Arduino.h +++ b/cores/esp32/Arduino.h @@ -88,7 +88,7 @@ #define bitRead(value, bit) (((value) >> (bit)) & 0x01) #define bitSet(value, bit) ((value) |= (1UL << (bit))) #define bitClear(value, bit) ((value) &= ~(1UL << (bit))) -#define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit)) +#define bitWrite(value, bit, bitvalue) ((bitvalue) ? bitSet(value, bit) : bitClear(value, bit)) // avr-libc defines _NOP() since 1.6.2 #ifndef _NOP