Skip to content

Commit

Permalink
code synchronization at 2018-03-23@23:22
Browse files Browse the repository at this point in the history
  • Loading branch information
Cheng-SG committed Mar 23, 2018
1 parent 599ec0a commit 4279bd5
Show file tree
Hide file tree
Showing 1,287 changed files with 275,304 additions and 18,422 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ build/cmd/win32/Python27/Lib/encodings/*.pyc
*.d
build/scripts/config_mk.py
build/scripts/*.pyc
platform/mcu/esp32/esptool_py
tmp
$Recycle.Bin
.sconsign.dblite
16 changes: 11 additions & 5 deletions .vscode/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
{
"aliosStudio.inner.yosBin": "aos",
"aliosStudio.hardware.board": "mk3060",
"aliosStudio.name": "alinkapp",
"aliosStudio.hardware.board": "starterkit",
"aliosStudio.name": "helloworld",
"aliosStudio.buildList": [
{"name": "clean"},
{"name": "alinkapp@mk3060"},
{"name": "alinkapp@mk3060 JTAG=jlink download"}
{
"name": "clean"
},
{
"name": "helloworld@starterkit"
},
{
"name": "mqttapp@starterkit"
}
],
"aliosStudio.build.multiBin": false,
"aliosStudio.build.multiBinTarget": "app",
Expand Down
8 changes: 3 additions & 5 deletions board/b_l475e/b_l475e.mk
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ $(NAME)_SOURCES := board.c osa_flash.c
GLOBAL_INCLUDES += .
GLOBAL_DEFINES += STDIO_UART=0
GLOBAL_DEFINES += RHINO_CONFIG_TICK_TASK=0
GLOBAL_DEFINES += RHINO_CONFIG_WORKQUEUE=1

sal ?= 1
ifeq (1,$(sal))
Expand Down Expand Up @@ -49,9 +50,6 @@ EXTRA_TARGET_MAKEFILES += $(MAKEFILES_PATH)/aos_standard_targets.mk
#EXTRA_TARGET_MAKEFILES += $(SOURCE_ROOT)/platform/mcu/$(HOST_MCU_FAMILY)/gen_crc_bin.mk

# Define default component testcase set
ifeq (, $(findstring yts, $(BUILD_STRING)))
GLOBAL_DEFINES += RHINO_CONFIG_WORKQUEUE=1
TEST_COMPONENTS += basic api wifi_hal rhino vcall kv yloop alicrypto cjson digest_algorithm hashtable
else
GLOBAL_DEFINES += RHINO_CONFIG_WORKQUEUE=0
ifneq (, $(findstring yts, $(BUILD_STRING)))
TEST_COMPONENTS += basic api wifi_hal rhino kv yloop alicrypto cjson digest_algorithm hashtable
endif
26 changes: 26 additions & 0 deletions board/b_l475e/ucube.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
src = Split('''
board.c
osa_flash.c
''')

component = aos_component('board_b_l475e', src)
component.add_component_dependencis('platform/mcu/stm32l475')
component.add_component_dependencis('device/sal')

aos_global_config.set_aos_global_config('module','wifi.mk3060')

component.add_global_includes('.')

component.add_global_macro('STDIO_UART=0')
component.add_global_macro('RHINO_CONFIG_TICK_TASK=0')
component.add_global_macro('STM32L475xx')

CONFIG_SYSINFO_PRODUCT_MODEL = 'ALI_AOS_B-L475E'
CONFIG_SYSINFO_DEVICE_NAME = 'B-L475E'
aos_global_config.set_aos_global_config('CONFIG_SYSINFO_PRODUCT_MODEL',CONFIG_SYSINFO_PRODUCT_MODEL)
aos_global_config.set_aos_global_config('CONFIG_SYSINFO_DEVICE_NAME',CONFIG_SYSINFO_DEVICE_NAME)

component.add_global_macro('SYSINFO_PRODUCT_MODEL=\\"'+CONFIG_SYSINFO_PRODUCT_MODEL+'\\"')
component.add_global_macro('SYSINFO_DEVICE_NAME=\\"'+CONFIG_SYSINFO_DEVICE_NAME+'\\"')
component.add_global_macro('RHINO_CONFIG_WORKQUEUE=0')

Loading

0 comments on commit 4279bd5

Please sign in to comment.