Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
And more still
  • Loading branch information
earlephilhower committed May 21, 2021
commit b7811e7bae1c4693dbe1487c964d0952c6cb1094
2 changes: 1 addition & 1 deletion .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -286,4 +286,4 @@ jobs:
uses: codespell-project/actions-codespell@master
with:
skip: ./libraries/ESP8266SdFat,./libraries/LittleFS/lib,./tools/pyserial,./tools/sdk,./tools/esptool,./libraries/SoftwareSerial,./libraries/Ethernet
ignore_words_list: ESP8266,esp8266,esp,dout,DOUT
ignore_words_list: ESP8266,esp8266,esp,dout,DOUT,ser,alph,ans,nd,AlOg,Yau,TE,FLE,ths
4 changes: 2 additions & 2 deletions cores/esp8266/spiffs/spiffs.h
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ s32_t SPIFFS_tell(spiffs *fs, spiffs_file fh);
* in this callback will mess things up for sure - do not do this.
* This can be used to track where files are and move around during garbage
* collection, which in turn can be used to build location tables in ram.
* Used in conjuction with SPIFFS_open_by_page this may improve performance
* Used in conjunction with SPIFFS_open_by_page this may improve performance
* when opening a lot of files.
* Must be invoked after mount.
*
Expand All @@ -710,7 +710,7 @@ s32_t SPIFFS_set_file_callback_func(spiffs *fs, spiffs_file_callback cb_func);
* Maps the first level index lookup to a given memory map.
* This will make reading big files faster, as the memory map will be used for
* looking up data pages instead of searching for the indices on the physical
* medium. When mapping, all affected indicies are found and the information is
* medium. When mapping, all affected indices are found and the information is
* copied to the array.
* Whole file or only parts of it may be mapped. The index map will cover file
* contents from argument offset until and including arguments (offset+len).
Expand Down
2 changes: 1 addition & 1 deletion cores/esp8266/spiffs/spiffs_nucleus.h
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ extern "C" {
if ((ph).span_ix != (spix)) return SPIFFS_ERR_DATA_SPAN_MISMATCH;


// check id, only visit matching objec ids
// check id, only visit matching object ids
#define SPIFFS_VIS_CHECK_ID (1<<0)
// report argument object id to visitor - else object lookup id is reported
#define SPIFFS_VIS_CHECK_PH (1<<1)
Expand Down
2 changes: 1 addition & 1 deletion cores/esp8266/umm_malloc/umm_heap_select.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#define ALWAYS_INLINE inline __attribute__ ((always_inline))
#endif

// Use FORCE_ALWAYS_INLINE to ensure HeapSelect... construtor/deconstructor
// Use FORCE_ALWAYS_INLINE to ensure HeapSelect... constructor/deconstructor
// are placed in IRAM
#ifdef FORCE_ALWAYS_INLINE_HEAP_SELECT
#define MAYBE_ALWAYS_INLINE ALWAYS_INLINE
Expand Down
2 changes: 1 addition & 1 deletion cores/esp8266/umm_malloc/umm_info.c
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ size_t umm_max_block_size( void ) {

/*
Without build option UMM_INLINE_METRICS, calls to umm_usage_metric() or
umm_fragmentation_metric() must to be preceeded by a call to umm_info(NULL, false)
umm_fragmentation_metric() must to be preceded by a call to umm_info(NULL, false)
for updated results.
*/
int umm_usage_metric_core( umm_heap_context_t *_context ) {
Expand Down
2 changes: 1 addition & 1 deletion cores/esp8266/umm_malloc/umm_local.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#if defined(UMM_CRITICAL_METRICS)
/*
* umm_malloc performance measurments for critical sections
* umm_malloc performance measurements for critical sections
*/
UMM_TIME_STATS time_stats = {
{0xFFFFFFFF, 0U, 0U, 0U},
Expand Down
8 changes: 4 additions & 4 deletions cores/esp8266/umm_malloc/umm_malloc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ void umm_free( void *ptr ) {
return;
}

/* Free the memory withing a protected critical section */
/* Free the memory within a protected critical section */

UMM_CRITICAL_ENTRY(id_free);

Expand Down Expand Up @@ -671,7 +671,7 @@ static void *umm_malloc_core( umm_heap_context_t *_context, size_t size ) {
*/

if( blockSize == blocks ) {
/* It's an exact fit and we don't neet to split off a block. */
/* It's an exact fit and we don't need to split off a block. */
DBGLOG_DEBUG( "Allocating %6d blocks starting at %6d - exact\n", blocks, cf );

/* Disconnect this block from the FREE list */
Expand Down Expand Up @@ -755,7 +755,7 @@ void *umm_malloc( size_t size ) {
* For allocating APIs `umm_heap_cur` is used to index and select a value for
* `_context`. If an allocation is made from an ISR, this value is ignored and
* the heap context for DRAM is loaded. For APIs that require operating on an
* existing allcation such as realloc and free, the heap context selected is
* existing allocation such as realloc and free, the heap context selected is
* done by matching the allocation's address with that of one of the heap
* address ranges.
*
Expand Down Expand Up @@ -798,7 +798,7 @@ void *umm_malloc( size_t size ) {
return( ptr );
}

/* Allocate the memory withing a protected critical section */
/* Allocate the memory within a protected critical section */

UMM_CRITICAL_ENTRY(id_malloc);

Expand Down
4 changes: 2 additions & 2 deletions cores/esp8266/umm_malloc/umm_malloc_cfg.h
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ static inline void _critical_exit(UMM_TIME_STAT *p, uint32_t *saved_ps) {
* direction of the beginning of the heap when possible.
*
* Status: TODO: These are new options introduced to optionally restore the
* previous defrag propery of realloc. The issue has been raised in the upstream
* previous defrag property of realloc. The issue has been raised in the upstream
* repo. No response at this time. Based on response, may propose for upstream.
*/
/*
Expand Down Expand Up @@ -796,7 +796,7 @@ extern "C" {
// Arduino.h recall us to redefine them
#include <pgmspace.h>
// Reuse pvPort* calls, since they already support passing location information.
// Specificly the debug version (heap_...) that does not force DRAM heap.
// Specifically the debug version (heap_...) that does not force DRAM heap.
void* IRAM_ATTR heap_pvPortMalloc(size_t size, const char* file, int line);
void* IRAM_ATTR heap_pvPortCalloc(size_t count, size_t size, const char* file, int line);
void* IRAM_ATTR heap_pvPortRealloc(void *ptr, size_t size, const char* file, int line);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ void setup(void) {
DBG_OUTPUT_PORT.println(fsOK ? F("Filesystem initialized.") : F("Filesystem init failed!"));

#ifdef USE_SPIFFS
// Debug: dump on console contents of filesytem with no filter and check filenames validity
// Debug: dump on console contents of filesystem with no filter and check filenames validity
Dir dir = fileSystem->openDir("");
DBG_OUTPUT_PORT.println(F("List of files at root of filesystem:"));
while (dir.next()) {
Expand Down
4 changes: 2 additions & 2 deletions libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ extern "C" {
uint16_t suites[cipher_cnt];
memcpy_P(suites, cipher_list, cipher_cnt * sizeof(cipher_list[0]));
br_ssl_client_zero(cc);
br_ssl_engine_add_flags(&cc->eng, BR_OPT_NO_RENEGOTIATION); // forbid SSL renegociation, as we free the Private Key after handshake
br_ssl_engine_add_flags(&cc->eng, BR_OPT_NO_RENEGOTIATION); // forbid SSL renegotiation, as we free the Private Key after handshake
br_ssl_engine_set_versions(&cc->eng, BR_TLS10, BR_TLS12);
br_ssl_engine_set_suites(&cc->eng, suites, (sizeof suites) / (sizeof suites[0]));
br_ssl_client_set_default_rsapub(cc);
Expand All @@ -989,7 +989,7 @@ extern "C" {
uint16_t suites[cipher_cnt];
memcpy_P(suites, cipher_list, cipher_cnt * sizeof(cipher_list[0]));
br_ssl_server_zero(cc);
br_ssl_engine_add_flags(&cc->eng, BR_OPT_NO_RENEGOTIATION); // forbid SSL renegociation, as we free the Private Key after handshake
br_ssl_engine_add_flags(&cc->eng, BR_OPT_NO_RENEGOTIATION); // forbid SSL renegotiation, as we free the Private Key after handshake
br_ssl_engine_set_versions(&cc->eng, BR_TLS10, BR_TLS12);
br_ssl_engine_set_suites(&cc->eng, suites, (sizeof suites) / (sizeof suites[0]));
#ifndef BEARSSL_SSL_BASIC
Expand Down
2 changes: 1 addition & 1 deletion tools/boards.txt.py
Original file line number Diff line number Diff line change
Expand Up @@ -1705,7 +1705,7 @@ def package ():

newfilestr = re.sub(r'"boards":[^\]]*\],', substitution, filestr, re.MULTILINE)

# To get consistent indent/formatting read the JSON and write it out programattically
# To get consistent indent/formatting read the JSON and write it out programmatically
if packagegen:
with open(pkgfname, 'w') as package_file:
filejson = json.loads(newfilestr, object_pairs_hook=collections.OrderedDict)
Expand Down