Skip to content

Commit 4faca02

Browse files
gfwilliamsgfwilliams
committed
Merge branch 'master' into NRF_capacitance
2 parents e79c913 + 2ce3dd0 commit 4faca02

39 files changed

+2452
-1159
lines changed

‎ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
Fix jsvStringIteratorGetCharOrMinusOne for zero-length strings
66
Allow tab-completion straight after '.'
77
Make sure execution stops for native functions if there's an error when parsing arguments
8+
NRF5x: remove setName and add functionality to setAdvertising, along with advertising interval
9+
NRF5x: allow raw advertising data in setAdvertising
10+
Add E.setPassword - allows Espruino console to be locked
11+
Fix pin header numbering for BBC micro:bit (it changed for the production version) (fix #896)
812

913
1v86 : Compile Telnet server into linux by default, Add '--telnet' command-line option to enable it
1014
Fix lock 'leak' in Telnet when Telnet is turned off

‎Makefile

Lines changed: 98 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
# # BLACKLIST=/home/mydir/myBlackList
7676
# VARIABLES=1700 # Sets number of variables for project defined firmware. This parameter can be dangerous, be careful before changing.
7777
# # used in build_platform_config.py
78+
# NO_COMPILE=1 # skips compiling and linking part, used to echo WRAPPERSOURCES only
7879

7980
ifndef GENDIR
8081
GENDIR=$(shell pwd)/gen
@@ -481,10 +482,11 @@ EMBEDDED=1
481482
BOARD=NRF52832DK
482483
OPTIMIZEFLAGS+=-O3
483484
USE_BLUETOOTH=1
484-
DEFINES += -DBOARD_PCA10040
485+
USE_NET=1
486+
USE_GRAPHICS=1
487+
DEFINES += -DBOARD_PCA10040 -DPCA10040
485488

486-
# Uncomment to build Espruino to be transferred over DFU instead of flashed to the device.
487-
#DFU_UPDATE_BUILD=1
489+
# DFU_UPDATE_BUILD=1 # Uncomment this to build Espruino for a device firmware update over the air.
488490

489491
else ifdef PUCKJS
490492
EMBEDDED=1
@@ -497,6 +499,7 @@ USE_GRAPHICS=1
497499
USE_FILESYSTEM=1
498500
USE_CRYPTO=1
499501
#USE_TLS=1
502+
USE_NFC=1
500503

501504
else ifdef LPC1768
502505
EMBEDDED=1
@@ -637,10 +640,10 @@ ifneq ("$(wildcard /usr/local/include/wiringPi.h)","")
637640
USE_WIRINGPI=1
638641
else
639642
DEFINES+=-DSYSFS_GPIO_DIR="\"/sys/class/gpio\""
640-
#$(info *************************************************************)
641-
#$(info * WIRINGPI NOT FOUND, and you probably want it *)
642-
#$(info * see http://wiringpi.com/download-and-install/ *)
643-
#$(info *************************************************************)
643+
$(info *************************************************************)
644+
$(info * WIRINGPI NOT FOUND, and you probably want it *)
645+
$(info * see http://wiringpi.com/download-and-install/ *)
646+
$(info *************************************************************)
644647
endif
645648

646649
else ifdef BEAGLEBONE
@@ -1047,6 +1050,11 @@ ifeq ($(BOARD),MICROBIT)
10471050
WRAPPERSOURCES += libs/microbit/jswrap_microbit.c
10481051
endif
10491052

1053+
ifeq ($(BOARD),PUCKJS)
1054+
INCLUDE += -I$(ROOT)/libs/puckjs
1055+
WRAPPERSOURCES += libs/puckjs/jswrap_puck.c
1056+
endif
1057+
10501058
ifdef USE_CRYPTO
10511059
DEFINES += -DUSE_CRYPTO
10521060
INCLUDE += -I$(ROOT)/libs/crypto
@@ -1306,13 +1314,13 @@ ifeq ($(FAMILY), NRF51)
13061314

13071315
SOFTDEVICE = $(NRF5X_SDK_PATH)/components/softdevice/s130/hex/s130_nrf51_2.0.0_softdevice.hex
13081316

1309-
LINKER_FILE = $(NRF5X_SDK_PATH)/../nrf5x_linkers/linker_nrf51_ble_espruino_$(LINKER_RAM).ld
1310-
13111317
ifdef USE_BOOTLOADER
1318+
LINKER_FILE = $(NRF5X_SDK_PATH)/../nrf5x_linkers/linker_nrf51_ble_espruino_$(LINKER_RAM).ld
13121319
NRF_BOOTLOADER = $(ROOT)/targetlibs/nrf5x/nrf5_singlebank_bl_hex/nrf51_s130_singlebank_bl.hex
1313-
NFR_BL_START_ADDR = 0x3C000
1320+
NFR_BL_START_ADDR = 0x3C000# see dfu_gcc_nrf51.ld
13141321
NRF_BOOTLOADER_SETTINGS = $(ROOT)/targetlibs/nrf5x/nrf5_singlebank_bl_hex/bootloader_settings_nrf51.hex # This file writes 0x3FC00 with 0x01 so we can flash the application with the bootloader.
1315-
1322+
else
1323+
LINKER_FILE = $(NRF5X_SDK_PATH)/../nrf5x_linkers/linker_nrf51_ble_espruino_$(LINKER_RAM).ld
13161324
endif
13171325

13181326
endif # FAMILY == NRF51
@@ -1337,24 +1345,31 @@ ifeq ($(FAMILY), NRF52)
13371345

13381346
SOFTDEVICE = $(NRF5X_SDK_PATH)/components/softdevice/s132/hex/s132_nrf52_2.0.0_softdevice.hex
13391347

1340-
LINKER_FILE = $(NRF5X_SDK_PATH)/../nrf5x_linkers/linker_nrf52_ble_espruino.ld # TODO: Should have separate linkers like is done in nrf_bootloader branch.
1341-
13421348
ifdef USE_BOOTLOADER
13431349
NRF_BOOTLOADER = $(ROOT)/targetlibs/nrf5x/nrf5_singlebank_bl_hex/nrf52_s132_singlebank_bl.hex
1344-
NFR_BL_START_ADDR = 0x7A000
1350+
NFR_BL_START_ADDR = 0x7A000 # see Makefile, dfu_gcc_nrf52.ld, linker_nrf52_ble_espruino_bootloader.ld and dfu_types.h
13451351
NRF_BOOTLOADER_SETTINGS = $(ROOT)/targetlibs/nrf5x/nrf5_singlebank_bl_hex/bootloader_settings_nrf52.hex # Writes address 0x7F000 with 0x01.
1352+
ifdef BOOTLOADER
1353+
# we're trying to compile the bootloader itself
1354+
LINKER_FILE = $(NRF5X_SDK_PATH)/../nrf5x_linkers/dfu_gcc_nrf52.ld
1355+
OPTIMIZEFLAGS=-Os # try to reduce bootloader size
1356+
else
1357+
LINKER_FILE = $(NRF5X_SDK_PATH)/../nrf5x_linkers/linker_nrf52_ble_espruino_bootloader.ld
1358+
endif
1359+
else
1360+
LINKER_FILE = $(NRF5X_SDK_PATH)/../nrf5x_linkers/linker_nrf52_ble_espruino.ld
13461361
endif
13471362
endif #FAMILY == NRF52
13481363

13491364

1350-
ifdef NFC
1365+
ifdef USE_NFC
13511366
DEFINES += -DUSE_NFC
1352-
INCLUDE += -I$(NRF5X_SDK_PATH)/components/drivers_nrf/clock
13531367
INCLUDE += -I$(NRF5X_SDK_PATH)/components/nfc/t2t_lib
13541368
INCLUDE += -I$(NRF5X_SDK_PATH)/components/nfc/ndef/uri
13551369
INCLUDE += -I$(NRF5X_SDK_PATH)/components/nfc/ndef/generic/message
13561370
INCLUDE += -I$(NRF5X_SDK_PATH)/components/nfc/ndef/generic/record
13571371
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/drivers_nrf/clock/nrf_drv_clock.c
1372+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/libraries/util/app_util_platform.c
13581373
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/nfc/ndef/uri/nfc_uri_msg.c
13591374
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/nfc/ndef/uri/nfc_uri_rec.c
13601375
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/nfc/ndef/generic/message/nfc_ndef_msg.c
@@ -1440,7 +1455,6 @@ ifeq ($(FAMILY), EFM32GG)
14401455
endif #FAMILY == EFM32
14411456

14421457
ifdef NRF5X
1443-
14441458
# Just try and get rid of the compile warnings.
14451459
CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-parameter -fomit-frame-pointer #this is for device manager in nordic sdk
14461460
DEFINES += -DBLUETOOTH -D$(BOARD)
@@ -1454,10 +1468,19 @@ ifdef NRF5X
14541468

14551469
# These files are the Espruino HAL implementation.
14561470
INCLUDE += -I$(ROOT)/targets/nrf5x
1457-
SOURCES += \
1458-
targets/nrf5x/main.c \
1459-
targets/nrf5x/jshardware.c \
1460-
targets/nrf5x/nrf5x_utils.c
1471+
ifdef BOOTLOADER
1472+
BUILD_LINKER_FLAGS+=--bootloader
1473+
PROJ_NAME=$(BOOTLOADER_PROJ_NAME)
1474+
WRAPPERSOURCES =
1475+
SOURCES = \
1476+
targets/nrf5x_dfu/main.c \
1477+
targets/nrf5x_dfu/dfu_ble_svc.c
1478+
else
1479+
SOURCES += \
1480+
targets/nrf5x/main.c \
1481+
targets/nrf5x/jshardware.c \
1482+
targets/nrf5x/nrf5x_utils.c
1483+
endif
14611484

14621485
# Careful here.. All these includes and sources assume a SoftDevice. Not efficeint/clean if softdevice (ble) is not enabled...
14631486
INCLUDE += -I$(NRF5X_SDK_PATH)/components
@@ -1487,6 +1510,7 @@ ifdef NRF5X
14871510
INCLUDE += -I$(NRF5X_SDK_PATH)/components/drivers_nrf/twi_master
14881511
INCLUDE += -I$(NRF5X_SDK_PATH)/components/drivers_nrf/ppi
14891512
INCLUDE += -I$(NRF5X_SDK_PATH)/components/drivers_nrf/hal/nrf_pwm
1513+
INCLUDE += -I$(NRF5X_SDK_PATH)/components/drivers_nrf/clock
14901514

14911515
TARGETSOURCES += \
14921516
$(NRF5X_SDK_PATH)/components/libraries/util/app_error.c \
@@ -1509,7 +1533,8 @@ ifdef NRF5X
15091533
$(NRF5X_SDK_PATH)/components/drivers_nrf/hal/nrf_nvmc.c \
15101534
$(NRF5X_SDK_PATH)/components/drivers_nrf/twi_master/nrf_drv_twi.c \
15111535
$(NRF5X_SDK_PATH)/components/drivers_nrf/ppi/nrf_drv_ppi.c \
1512-
$(NRF5X_SDK_PATH)/components/drivers_nrf/hal/nrf_adc.c
1536+
$(NRF5X_SDK_PATH)/components/drivers_nrf/hal/nrf_adc.c \
1537+
$(NRF5X_SDK_PATH)/components/drivers_nrf/clock/nrf_drv_clock.c
15131538

15141539
# $(NRF5X_SDK_PATH)/components/libraries/util/nrf_log.c
15151540

@@ -1524,6 +1549,40 @@ ifdef NRF5X
15241549
$(NRF5X_SDK_PATH)/components/ble/ble_services/ble_dfu/ble_dfu.c \
15251550
$(NRF5X_SDK_PATH)/components/libraries/bootloader_dfu/bootloader_util.c \
15261551
$(NRF5X_SDK_PATH)/components/libraries/bootloader_dfu/dfu_app_handler.c
1552+
ifdef BOOTLOADER
1553+
DEFINES += -DBOOTLOADER
1554+
INCLUDE += -I$(NRF5X_SDK_PATH)/components/libraries/crc16
1555+
INCLUDE += -I$(NRF5X_SDK_PATH)/components/libraries/scheduler
1556+
INCLUDE += -I$(NRF5X_SDK_PATH)/components/libraries/hci
1557+
INCLUDE += -I$(NRF5X_SDK_PATH)/components/libraries/bootloader_dfu/ble_transport
1558+
1559+
TARGETSOURCES = # Make sure we don't include existing files (thanks to pstorage)
1560+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/libraries/util/app_error.c
1561+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/libraries/scheduler/app_scheduler.c
1562+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/libraries/timer/app_timer.c
1563+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/libraries/timer/app_timer_appsh.c
1564+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/libraries/util/app_util_platform.c
1565+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/libraries/bootloader_dfu/bootloader.c
1566+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/libraries/bootloader_dfu/bootloader_settings.c
1567+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/libraries/bootloader_dfu/bootloader_util.c
1568+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/libraries/crc16/crc16.c
1569+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/libraries/bootloader_dfu/dfu_single_bank.c
1570+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/libraries/bootloader_dfu/dfu_init_template.c
1571+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/libraries/bootloader_dfu/dfu_transport_ble.c
1572+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/libraries/hci/hci_mem_pool.c
1573+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/libraries/util/nrf_assert.c
1574+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/drivers_nrf/delay/nrf_delay.c
1575+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/drivers_nrf/common/nrf_drv_common.c
1576+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/drivers_nrf/pstorage/pstorage_raw.c
1577+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/ble/common/ble_advdata.c
1578+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/ble/common/ble_conn_params.c
1579+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/ble/ble_services/ble_dfu/ble_dfu.c
1580+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/ble/common/ble_srv_common.c
1581+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/toolchain/system_nrf52.c
1582+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/softdevice/common/softdevice_handler/softdevice_handler.c
1583+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/softdevice/common/softdevice_handler/softdevice_handler_appsh.c
1584+
TARGETSOURCES += $(NRF5X_SDK_PATH)/components/drivers_nrf/clock/nrf_drv_clock.c
1585+
endif
15271586
endif
15281587

15291588
endif #NRF5X
@@ -2009,11 +2068,18 @@ ifdef SOFTDEVICE # Shouldn't do this when we want to be able to perform DFU OTA!
20092068
ifdef USE_BOOTLOADER
20102069
ifdef DFU_UPDATE_BUILD
20112070
echo Not merging softdevice or bootloader with application
2071+
scripts/nrfutil.exe dfu genpkg $(PROJ_NAME).zip --application $(PROJ_NAME).hex --application-version 0xff --dev-revision 1 --dev-type 1 --sd-req 0x81
2072+
else
2073+
ifdef BOOTLOADER
2074+
echo Not merging anything with bootloader
2075+
echo Copy $(PROJ_NAME).hex to $(NRF_BOOTLOADER) to update
20122076
else
20132077
echo Merging SoftDevice and Bootloader
2014-
scripts/hexmerge.py $(SOFTDEVICE) $(NRF_BOOTLOADER):$(NFR_BL_START_ADDR): $(PROJ_NAME).hex $(NRF_BOOTLOADER_SETTINGS) -o tmp.hex
2078+
echo FIXME - had to set --overlap=replace
2079+
scripts/hexmerge.py --overlap=replace $(SOFTDEVICE) $(NRF_BOOTLOADER) $(PROJ_NAME).hex $(NRF_BOOTLOADER_SETTINGS) -o tmp.hex
20152080
mv tmp.hex $(PROJ_NAME).hex
20162081
endif
2082+
endif
20172083
else
20182084
echo Merging SoftDevice
20192085
scripts/hexmerge.py $(SOFTDEVICE) $(PROJ_NAME).hex -o tmp.hex
@@ -2032,7 +2098,11 @@ ifndef TRAVIS
20322098
bash scripts/check_size.sh $(PROJ_NAME).bin
20332099
endif
20342100

2101+
ifdef NRF5X
2102+
proj: $(PROJ_NAME).lst $(PROJ_NAME).hex
2103+
else
20352104
proj: $(PROJ_NAME).lst $(PROJ_NAME).bin $(PROJ_NAME).hex
2105+
endif
20362106

20372107
#proj: $(PROJ_NAME).lst $(PROJ_NAME).hex $(PROJ_NAME).srec $(PROJ_NAME).bin
20382108

@@ -2086,3 +2156,8 @@ clean:
20862156
$(Q)rm -f $(PROJ_NAME).bin
20872157
$(Q)rm -f $(PROJ_NAME).srec
20882158
$(Q)rm -f $(PROJ_NAME).lst
2159+
2160+
# start make like this "make varsonly" to get all variables created and used during make process without compiling
2161+
# this helps to better understand linking, or to find oddities
2162+
varsonly:
2163+
$(foreach v, $(.VARIABLES), $(info $(v) = $($(v))))

‎boards/MICROBIT.py

Lines changed: 18 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,8 @@
5555
};
5656

5757
devices = {
58-
'BTN1' : { 'pin' : 'D4' }, # 'P0_17'
58+
'BTN1' : { 'pin' : 'D5' }, # 'P0_17'
5959
'BTN2' : { 'pin' : 'D11' }, # 'P0_26'
60-
'LED_COL1' : { 'pin': 'D4' },
61-
'LED_COL2' : { 'pin': 'D5' },
62-
'LED_COL3' : { 'pin': 'D6' },
63-
'LED_COL4' : { 'pin': 'D7' },
64-
'LED_COL5' : { 'pin': 'D8' },
65-
'LED_COL6' : { 'pin': 'D9' },
66-
'LED_COL7' : { 'pin': 'D10' },
67-
'LED_COL8' : { 'pin': 'D11' },
68-
'LED_COL9' : { 'pin': 'D12' },
69-
'LED_ROW1' : { 'pin': 'D13' },
70-
'LED_ROW2' : { 'pin': 'D14' },
71-
'LED_ROW3' : { 'pin': 'D15' },
7260
};
7361

7462
# left-right, or top-bottom order
@@ -77,18 +65,12 @@
7765
'D13','D14','D15','D16','3.3','','3.3','','3.3','D19','D20','GND','','GND','','GND' ],
7866
'_hide_not_on_connectors' : True,
7967
'_notes' : {
80-
'D4' : "LED Matrix Column 1",
81-
'D5' : "LED Matrix Column 2",
82-
'D6' : "LED Matrix Column 3",
83-
'D7' : "LED Matrix Column 4",
84-
'D8' : "LED Matrix Column 5",
85-
'D9' : "LED Matrix Column 6",
86-
'D10' : "LED Matrix Column 7",
87-
'D11' : "LED Matrix Column 8",
88-
'D12' : "LED Matrix Column 9",
89-
'D13' : "LED Matrix Row 1",
90-
'D14' : "LED Matrix Row 2",
91-
'D15' : "LED Matrix Row 3"
68+
'D3' : "LED Col 1",
69+
'D4' : "LED Col 2",
70+
'D6' : "LED Col 9",
71+
'D7' : "LED Col 8",
72+
'D9' : "LED Col 7",
73+
'D10' : "LED Col 3"
9274
}
9375
};
9476
board["_css"] = """
@@ -117,25 +99,25 @@
11799

118100
def get_pins():
119101
pins = [
120-
{ "name":"PD0", "sortingname":"D00", "port":"D", "num":"3", "functions":{ "ADC1_IN4":0 }, "csv":{} },
102+
{ "name":"PD0", "sortingname":"D00", "port":"D", "num":"1", "functions":{ "ADC1_IN4":0 }, "csv":{} },
121103
{ "name":"PD1", "sortingname":"D01", "port":"D", "num":"2", "functions":{ "ADC1_IN3":0 }, "csv":{} },
122-
{ "name":"PD2", "sortingname":"D02", "port":"D", "num":"1", "functions":{ "ADC1_IN2":0 }, "csv":{} },
123-
{ "name":"PD3", "sortingname":"D03", "port":"D", "num":"4", "functions":{ "ADC1_IN5":0 }, "csv":{} }, # LED col 1
124-
{ "name":"PD4", "sortingname":"D04", "port":"D", "num":"17", "functions":{}, "csv":{} }, # BTNA
125-
{ "name":"PD5", "sortingname":"D05", "port":"D", "num":"5", "functions":{ "ADC1_IN6":0 }, "csv":{} }, # LED col 2
126-
{ "name":"PD6", "sortingname":"D06", "port":"D", "num":"14", "functions":{}, "csv":{} }, # LED row 2
127-
{ "name":"PD7", "sortingname":"D07", "port":"D", "num":"13", "functions":{}, "csv":{} }, # LED row 1
128-
{ "name":"PD8", "sortingname":"D08", "port":"D", "num":"18", "functions":{}, "csv":{} },
129-
{ "name":"PD9", "sortingname":"D09", "port":"D", "num":"15", "functions":{}, "csv":{} }, # LED row 3
104+
{ "name":"PD2", "sortingname":"D02", "port":"D", "num":"3", "functions":{ "ADC1_IN2":0 }, "csv":{} },
105+
{ "name":"PD3", "sortingname":"D03", "port":"D", "num":"4", "functions":{ "ADC1_IN5":0 }, "csv":{} }, # LED col 1
106+
{ "name":"PD4", "sortingname":"D04", "port":"D", "num":"5", "functions":{}, "csv":{} }, # BTNA
107+
{ "name":"PD5", "sortingname":"D05", "port":"D", "num":"17", "functions":{ "ADC1_IN6":0 }, "csv":{} }, # LED col 2
108+
{ "name":"PD6", "sortingname":"D06", "port":"D", "num":"12", "functions":{}, "csv":{} }, # LED row 2
109+
{ "name":"PD7", "sortingname":"D07", "port":"D", "num":"11", "functions":{}, "csv":{} }, # LED row 1
110+
{ "name":"PD8", "sortingname":"D08", "port":"D", "num":"18", "functions":{}, "csv":{} },
111+
{ "name":"PD9", "sortingname":"D09", "port":"D", "num":"10", "functions":{}, "csv":{} }, # LED row 3
130112
{ "name":"PD10", "sortingname":"D10", "port":"D", "num":"6", "functions":{ "ADC1_IN7":0 }, "csv":{} }, # LED col 3
131113
{ "name":"PD11", "sortingname":"D11", "port":"D", "num":"26", "functions":{}, "csv":{} }, # BTNB
132114
{ "name":"PD12", "sortingname":"D12", "port":"D", "num":"20", "functions":{}, "csv":{} },
133115
{ "name":"PD13", "sortingname":"D13", "port":"D", "num":"23", "functions":{ "SPI1_SCK":0 }, "csv":{} },
134116
{ "name":"PD14", "sortingname":"D14", "port":"D", "num":"22", "functions":{ "SPI1_MISO":0 }, "csv":{} },
135117
{ "name":"PD15", "sortingname":"D15", "port":"D", "num":"21", "functions":{ "SPI1_MOSI":0 }, "csv":{} },
136118
{ "name":"PD16", "sortingname":"D16", "port":"D", "num":"16", "functions":{}, "csv":{} },
137-
{ "name":"PD17", "sortingname":"D17", "port":"D", "num":"31", "functions":{}, "csv":{} }, # FIXME 3.3v
138-
{ "name":"PD18", "sortingname":"D18", "port":"D", "num":"31", "functions":{}, "csv":{} }, # FIXME 3.3v
119+
{ "name":"PD17", "sortingname":"D17", "port":"D", "num":"31", "functions":{}, "csv":{} }, # FIXME 3.3v
120+
{ "name":"PD18", "sortingname":"D18", "port":"D", "num":"31", "functions":{}, "csv":{} }, # FIXME 3.3v
139121
{ "name":"PD19", "sortingname":"D19", "port":"D", "num":"0", "functions":{ "I2C1_SCL":0, "ADC1_IN0":0 }, "csv":{} },
140122
{ "name":"PD20", "sortingname":"D20", "port":"D", "num":"30", "functions":{ "I2C1_SDA":0 }, "csv":{} },
141123
{ "name":"PH0", "sortingname":"H0", "port":"D", "num":"24", "functions":{}, "csv":{} },

‎boards/NRF52832DK.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
'default_console_baudrate' : "9600",
2626
# Number of variables can be WAY higher on this board
2727
'variables' : 2040, # How many variables are allocated for Espruino to use. RAM will be overflowed if this number is too high and code won't compile.
28-
'bootloader' : 1,
28+
# 'bootloader' : 1,
2929
'binary_name' : 'espruino_%v_nrf52832.bin',
3030
'build' : {
3131
'defines' : [

‎boards/NUCLEOF401RE.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
'ram' : 96, # 0x0001 8000 long, from 0x2000 0000 to 0x2001 7FFF
3939
'flash' : 512, # 0x0008 0000 long, from 0x0800 0000 to 0x0807 FFFF
4040
'speed' : 84,
41-
'usart' : 3,
41+
'usart' : 6,
4242
'spi' : 4,
4343
'i2c' : 3,
4444
'adc' : 1,

‎boards/NUCLEOF411RE.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
'ram' : 128, # 0x0001 8000 long, from 0x2000 0000 to 0x2001 7FFF
3939
'flash' : 512, # 0x0008 0000 long, from 0x0800 0000 to 0x0807 FFFF
4040
'speed' : 100,
41-
'usart' : 3,
41+
'usart' : 6,
4242
'spi' : 4,
4343
'i2c' : 3,
4444
'adc' : 1,

0 commit comments

Comments
 (0)