archive-gh-me/Espruino
1
0
Fork 0
mirror of https://github.com/espruino/Espruino.git synced 2025-12-08 19:06:15 +00:00
Code Issues Projects Releases Wiki Activity

fix accidental build issues

Browse Source
This commit is contained in:
Gordon Williams 2024-03-14 14:28:44 +00:00
parent 3138205d09
commit 29a243226e
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boards/NUCLEOF401RE.py
View File

@ -27,11 +27,12 @@ info = {
'build' : {
'optimizeflags' : '-O3',
'libraries' : [
'NET',
'GRAPHICS',
'NEOPIXEL'
],
'makefile' : [
'DEFINES+=-DSAVE_ON_FLASH_MATH',
'DEFINES+=-DESPR_PACKED_SYMPTR', # Pack builtin symbols' offset into pointer to save 2 bytes/symbol
'WRAPPERSOURCES+=targets/nucleo/jswrap_nucleo.c',
'DEFINES+=-DUSE_USB_OTG_FS=1',
'DEFINES+=-DPIN_NAMES_DIRECT=1', # Package skips out some pins, so we can't assume each port starts from 0

3
boards/NUCLEOF411RE.py
View File

@ -27,11 +27,12 @@ info = {
'build' : {
'optimizeflags' : '-O3',
'libraries' : [
'NET',
'GRAPHICS',
'NEOPIXEL'
],
'makefile' : [
'DEFINES+=-DSAVE_ON_FLASH_MATH',
'DEFINES+=-DESPR_PACKED_SYMPTR', # Pack builtin symbols' offset into pointer to save 2 bytes/symbol
'WRAPPERSOURCES+=targets/nucleo/jswrap_nucleo.c',
'DEFINES+=-DUSE_USB_OTG_FS=1',
'DEFINES+=-DPIN_NAMES_DIRECT=1', # Package skips out some pins, so we can't assume each port starts from 0

2
src/jswrapper.h
View File

@ -72,8 +72,6 @@ typedef enum {
#define PACKED_JSW_SYM __attribute__((aligned(2)))
#endif
#define ESPR_PACKED_SYMPTR
/// This is the Structure for storing each symbol in the list of built-in symbols (in flash)
// JswSymPtr should be a multiple of 2 in length or jswBinarySearch will need READ_FLASH_UINT16
#ifndef ESPR_PACKED_SYMPTR // 'Normal' symbol storage - strOffset is *not* packed into function pointer

4
targets/nrf5x/jshardware.c
View File

@ -2273,7 +2273,9 @@ void jshI2CSetup(IOEventFlags device, JshI2CInfo *inf) {
nrf_drv_twi_config_t p_twi_config;
p_twi_config.scl = (uint32_t)pinInfo[inf->pinSCL].pin;
p_twi_config.sda = (uint32_t)pinInfo[inf->pinSDA].pin;
p_twi_config.frequency = (nrf_drv_twi_frequency_t)((inf->bitrate<175000) ? NRF_TWI_FREQ_100K : ((inf->bitrate<325000) ? NRF_TWI_FREQ_250K : NRF_TWI_FREQ_400K));
// (nrf_drv_twi_frequency_t) cast can be used here on SDK15
p_twi_config.frequency =
((inf->bitrate<175000) ? NRF_TWI_FREQ_100K : ((inf->bitrate<325000) ? NRF_TWI_FREQ_250K : NRF_TWI_FREQ_400K));
p_twi_config.interrupt_priority = APP_IRQ_PRIORITY_LOW;
if (twi1Initialised) nrf_drv_twi_uninit(twi);
twi1Initialised = true;