Merge branch 'develop' into develop_FW-876

# Conflicts: # bsp/boards/openmote-b-24ghz/sensors.c
lanyangyang · Aug 4, 2020 · bf9cd20 · bf9cd20
2 parents abeb43e + 4e58c93
commit bf9cd20
Show file tree

Hide file tree

Showing 171 changed files with 16,241 additions and 15,423 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,9 @@
 language: c
 
 before_script:
+- python --version
+- pip install --user pip
+- pip install --user colorama
 - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6D1D8367A3421AFB
 - sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa
 - sudo apt-get update

diff --git a/SConscript b/SConscript
diff --git a/SConstruct b/SConstruct
diff --git a/bsp/boards/SConscript b/bsp/boards/SConscript
@@ -15,13 +15,9 @@ sources_h = [
     'uart.h',
     'sctimer.h',
     'sensors.h',
-    os.path.join('common', 'openccms.h'),
-    os.path.join('common', 'openaes.h'),
 ]
 
 sources_c = [
-    os.path.join('common', 'openccms.c'),
-    os.path.join('common', 'openaes.c'),
 ]
 
 target = 'libbsp'

diff --git a/bsp/boards/common/README.md b/bsp/boards/common/README.md
diff --git a/bsp/boards/common/openccms.c b/bsp/boards/common/openccms.c
diff --git a/bsp/boards/common/openccms.h b/bsp/boards/common/openccms.h