Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/AutoCreateRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: windows-2019

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: true
- name: Build luac.cross.exe
Expand All @@ -34,7 +34,7 @@ jobs:
Create_Release:
name: Create Release
needs: build_luac_cross_win
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Set release name
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
prerelease: false
draft: true
- name: Download luac.cross
uses: actions/download-artifact@v1
uses: actions/download-artifact@v4
with:
name: luac.cross_51_float_win
path: ./
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ jobs:
numbers: 'integral'
- lua_ver: 53
numbers: '64bit'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

env:
LUA: ${{ matrix.lua_ver }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: true
- run: pip install pyserial
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
runs-on: windows-2019

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: true
- name: Build luac.cross.exe
Expand Down Expand Up @@ -96,15 +96,15 @@ jobs:
numbers: '64bit'
filter: 'cat'
needs: build
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: false
- name: Download luac.cross
uses: actions/download-artifact@v1
uses: actions/download-artifact@v4
with:
name: luac.cross_${{ matrix.lua_ver }}_${{ matrix.numbers }}
path: ./
Expand All @@ -130,11 +130,11 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: false
- name: Download luac.cross
uses: actions/download-artifact@v1
uses: actions/download-artifact@v4
with:
name: luac.cross_${{ matrix.lua_ver }}_${{ matrix.numbers }}_win
path: ./
Expand All @@ -159,15 +159,15 @@ jobs:
- lua_ver: 53
numbers: '64bit'
needs: build
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: false
- name: Download luac.cross
uses: actions/download-artifact@v1
uses: actions/download-artifact@v4
with:
name: luac.cross_${{ matrix.lua_ver }}_${{ matrix.numbers }}
path: ./
Expand Down Expand Up @@ -200,11 +200,11 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: false
- name: Download luac.cross
uses: actions/download-artifact@v1
uses: actions/download-artifact@v4
with:
name: luac.cross_${{ matrix.lua_ver }}_${{ matrix.numbers }}_win
path: ./
Expand Down Expand Up @@ -236,7 +236,7 @@ jobs:
runs-on: ${{ matrix.vm }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: false
- run: sudo apt install luarocks
Expand All @@ -260,10 +260,10 @@ jobs:

strategy:
fail-fast: false
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: false
- name: all_modules_linked
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ NodeMCU is an open source [Lua](https://www.lua.org/) based firmware for the [ES

The firmware was initially developed as is a companion project to the popular ESP8266-based [NodeMCU development modules]((https://github.com/nodemcu/nodemcu-devkit-v1.0)), but the project is now community-supported, and the firmware can now be run on _any_ ESP module.

**The NodeMCU `release` and `dev` branches target the ESP8266. The `dev-esp32` branch targets the ESP32.**

## Summary

- Easy to program wireless node and/or access point
Expand Down
14 changes: 7 additions & 7 deletions app/driver/spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ void spi_mast_blkget(uint8 spi_no, size_t bitlen, uint8 *data)
os_memcpy((void *)data, (void *)SPI_W0(spi_no), aligned_len);
}

static uint32 swap_endianess(uint32 n)
static uint32 swap_endianness(uint32 n)
{
return ((n & 0xff) << 24) |
((n & 0xff00) << 8) |
Expand Down Expand Up @@ -248,20 +248,20 @@ void spi_mast_set_mosi(uint8 spi_no, uint16 offset, uint8 bitlen, uint32 data)

// transfer Wn to buf
spi_buf.word[1] = READ_PERI_REG(SPI_W0(spi_no) + wn*4);
spi_buf.word[1] = swap_endianess(spi_buf.word[1]);
spi_buf.word[1] = swap_endianness(spi_buf.word[1]);
if (wn < 15) {
spi_buf.word[0] = READ_PERI_REG(SPI_W0(spi_no) + (wn+1)*4);
spi_buf.word[0] = swap_endianess(spi_buf.word[0]);
spi_buf.word[0] = swap_endianness(spi_buf.word[0]);
}

shift = 64 - (offset & 0x1f) - bitlen;
spi_buf.dword &= ~(((1ULL << bitlen)-1) << shift);
spi_buf.dword |= (uint64)data << shift;

if (wn < 15) {
WRITE_PERI_REG(SPI_W0(spi_no) + (wn+1)*4, swap_endianess(spi_buf.word[0]));
WRITE_PERI_REG(SPI_W0(spi_no) + (wn+1)*4, swap_endianness(spi_buf.word[0]));
}
WRITE_PERI_REG(SPI_W0(spi_no) + wn*4, swap_endianess(spi_buf.word[1]));
WRITE_PERI_REG(SPI_W0(spi_no) + wn*4, swap_endianness(spi_buf.word[1]));

return;
}
Expand Down Expand Up @@ -293,10 +293,10 @@ uint32 spi_mast_get_miso(uint8 spi_no, uint16 offset, uint8 bitlen)

// transfer Wn to buf
spi_buf.word[1] = READ_PERI_REG(SPI_W0(spi_no) + wn*4);
spi_buf.word[1] = swap_endianess(spi_buf.word[1]);
spi_buf.word[1] = swap_endianness(spi_buf.word[1]);
if (wn < 15) {
spi_buf.word[0] = READ_PERI_REG(SPI_W0(spi_no) + (wn+1)*4);
spi_buf.word[0] = swap_endianess(spi_buf.word[0]);
spi_buf.word[0] = swap_endianness(spi_buf.word[0]);
}

result = (uint32)(spi_buf.dword >> (64 - ((offset & 0x1f) + bitlen)));
Expand Down
2 changes: 1 addition & 1 deletion app/include/lwip/def.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ extern "C" {
* 'a' is expected to be 'higher' (without overflow) than 'b'. */
#define LWIP_U32_DIFF(a, b) (((a) >= (b)) ? ((a) - (b)) : (((a) + ((b) ^ 0xFFFFFFFF) + 1)))

/* Endianess-optimized shifting of two u8_t to create one u16_t */
/* Endianness-optimized shifting of two u8_t to create one u16_t */
#if BYTE_ORDER == LITTLE_ENDIAN
#define LWIP_MAKE_U16(a, b) ((a << 8) | b)
#else
Expand Down
2 changes: 1 addition & 1 deletion app/lwip/core/ipv4/inet_chksum.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
* @return host order (!) lwip checksum (non-inverted Internet sum)
*
* @note accumulator size limits summable length to 64k
* @note host endianess is irrelevant (p3 RFC1071)
* @note host endianness is irrelevant (p3 RFC1071)
*/
static u16_t ICACHE_FLASH_ATTR
lwip_standard_chksum(void *dataptr, u16_t len)
Expand Down
4 changes: 2 additions & 2 deletions app/mbedtls/library/aes.c
Original file line number Diff line number Diff line change
Expand Up @@ -1111,7 +1111,7 @@ int mbedtls_aes_crypt_cbc( mbedtls_aes_context *ctx,

#if defined(MBEDTLS_CIPHER_MODE_XTS)

/* Endianess with 64 bits values */
/* Endianness with 64 bits values */
#ifndef GET_UINT64_LE
#define GET_UINT64_LE(n,b,i) \
{ \
Expand Down Expand Up @@ -1147,7 +1147,7 @@ typedef unsigned char mbedtls_be128[16];
*
* This function multiplies a field element by x in the polynomial field
* representation. It uses 64-bit word operations to gain speed but compensates
* for machine endianess and hence works correctly on both big and little
* for machine endianness and hence works correctly on both big and little
* endian machines.
*/
static void mbedtls_gf128mul_x_ble( unsigned char r[16],
Expand Down
2 changes: 1 addition & 1 deletion app/modules/struct.c
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ static int gettoalign (size_t len, Header *h, int opt, size_t size) {


/*
** options to control endianess and alignment
** options to control endianness and alignment
*/
static void controloptions (lua_State *L, int opt, const char **fmt,
Header *h) {
Expand Down
Loading