Skip to content

Commit 2c66062

Browse files
committed
[xxxx]: doc/configure fixed
1 parent 09c78ff commit 2c66062

File tree

5 files changed

+21
-10
lines changed

5 files changed

+21
-10
lines changed

README.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ I cannot understand, how and why driving LED strip became a 'get-started' level
3333

3434
* Install required tools (see Requirements below).
3535

36-
* Set your environment variables (`$PATH` for `xtensa-esp32-elf` and `$IDF_TOOLS_PATH`(?) for `esptool.py`)
36+
* Set your environment variables (`$PATH` for `xtensa-esp-elf` and `$IDF_TOOLS_PATH`(?) for `esptool.py`)
3737

3838
* Follow [installation instruction](INSTALL) until `make` (`make install` is not reuqired).
3939
Personally, I always do multiple `VPATH` builds with different configuration settings.
40-
In order to use the `xtensa-esp32-elf` toolchain, you have to call the configure script with option
40+
In order to use the `xtensa-esp-elf` toolchain, you have to call the configure script with option
4141
`--host=xtensa-esp32-elf`.
4242

4343
* Hopefully, the build runs without any error, and
@@ -83,7 +83,7 @@ THis list is supposed to grow longer and longer.
8383
* Low level peripheral access (via registers).
8484
* Peripheral controller drivers
8585
* I2C
86-
* _TODO_ RMT
86+
* RMT (TODO: example on RX)
8787
* _TODO_ SPI
8888
* _TODO_ etc.
8989
* Device drivers
@@ -97,13 +97,18 @@ THis list is supposed to grow longer and longer.
9797
* No HAL.
9898
* Most of the peripheral drivers are not implemented yet.
9999
* I know it is a big gap, but currently interrupts are not masked in during critical system routines.
100-
* As far as I know, the list of of ROM functions in the [linker file](esp32.ld) is incomplete.
100+
* Memory layout and sections defined in the [linker file](ld/esp32.ld) are very simple.
101101
102102
### Requirements
103103
104-
* [Autotools](https://www.gnu.org/software/automake/), since Bilis ESP32 Basic is an automake project.
105-
* [xtensa-esp32-elf](https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-guides/tools/idf-tools.html) toolchain (compiler, linker, etc.).
104+
* [Autotools](https://www.gnu.org/software/automake/), since Bilis ESP32 Basic is an automake project
105+
(suggested versions: automake:1.16.1, autoconf:2.69).
106+
107+
* [xtensa-esp-elf](https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-guides/tools/idf-tools.html) toolchain (compiler, linker, etc.)
108+
(suggested versions: 13.2.0).
109+
106110
* [esptool](https://github.com/espressif/esptool) Currently, the flash tools (see scripts) rely on `esptool.py`
111+
(suggested versions: v4.7.0).
107112
108113
## Contribution
109114

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
AC_PREREQ([2.69])
22
AC_INIT([esp32basic],[1.0.0])
33
AM_INIT_AUTOMAKE
4-
: ${CFLAGS="-g -Os -Wall -nostdlib -mlongcalls" LDFLAGS="-specs=nano.specs"}
4+
: ${CFLAGS="-g -Os -Wall -nostdlib -mlongcalls"} ${LDFLAGS="-specs=nano.specs"}
55
AC_PROG_CC
66
AC_PROG_CC_STDC
77
AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])

examples/1rmtmorse/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ This entries are derived from input entries of ms resolution using the *stretch
4646
* But the *MorsePhase To Entry* generator relies on the *MorsePhase Generator*,
4747
which produces sequence of Morse-phases out of a text character [mphgen.c](mphgen.c).
4848

49-
* The text charactes are provided by the *Character generator*,
50-
and this generator is the beginning of the chain [chargen.c](chargen.c).
49+
* The text charactes are provided by the *Byte generator*,
50+
and this generator is the beginning of the chain [generators.c](../../src/utils/generators.c).
5151
It takes a text message as parameter to iterate on.
5252

5353
#### Hardware components

examples/3prog1/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ A simple pattern is being written to the OLED display from left to right.
1313
* I2C_SLAVE#1: BME280 temperature/pressure/humidity sensor
1414
* I2C_SLAVE#2: BH1750FVI light sensor
1515
* I2C_SLAVE#3: 32x128 OLED display
16+
* [NODE0 .. NODE4]: 5 nodes (maybe on breadboard) as connection nodes of multiple wires.
1617

1718
#### Connections
1819

src/utils/uartutils.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
#include <stdio.h>
1010
#ifdef __XTENSA__
1111
#include <sys/reent.h>
12+
#if __GNUC__ >= 13
13+
#define IMPURE_PTR _impure_ptr
14+
#else
15+
#define IMPURE_PTR _global_impure_ptr
16+
#endif
1217
#else
1318
#define _impure_ptr NULL
1419
#define _vsnprintf_r(X,Y1,Y2,Y3,Y4) vsnprintf(Y1,Y2,Y3,Y4)
@@ -21,7 +26,7 @@ int uart_printf(UART_Type *psUART, const char *pcFormat, ...) {
2126
char acBuf[100];
2227
va_list va;
2328
va_start(va, pcFormat);
24-
int iLen = _vsnprintf_r(_impure_ptr, acBuf, ARRAY_SIZE(acBuf), pcFormat, va);
29+
int iLen = _vsnprintf_r(IMPURE_PTR, acBuf, ARRAY_SIZE(acBuf), pcFormat, va);
2530
va_end(va);
2631
for (int i = 0; i < iLen; ++i) {
2732
psUART->FIFO = acBuf[i];

0 commit comments

Comments
 (0)