Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Undo merge weirdness

Browse source
This commit is contained in:
Jeroen Domburg 2017-03-28 14:21:27 +08:00
parent e0ed59d83f
commit 7153003aaf
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
components/esp32/include/soc/soc.h
View file

@ -65,8 +65,9 @@
#define BIT(nr) (1UL << (nr)) #define BIT(nr) (1UL << (nr))
#else #else
#define BIT(nr) (1 << (nr)) #define BIT(nr) (1 << (nr))
#endif //__ASSEMBLER__ #endif
#ifndef __ASSEMBLER__
//write value to register //write value to register
#define REG_WRITE(_r, _v) (*(volatile uint32_t *)(_r)) = (_v) #define REG_WRITE(_r, _v) (*(volatile uint32_t *)(_r)) = (_v)