platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-29 17:47:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename "opencm3" framework to "libopencm3" // Resolve #120

Browse Source
This commit is contained in:
Valeriy Koval
2015-03-16 17:34:52 +02:00
parent 0bfc6dfe3e
commit f3f16b56b2
8 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/stm32/stm32-opencm3-blink/platformio.ini
View File

@ -19,15 +19,15 @@
[env:disco_f407vg]
platform = ststm32
framework = opencm3
framework = libopencm3
board = disco_f407vg
[env:disco_l152rb]
platform = ststm32
framework = opencm3
framework = libopencm3
board = disco_l152rb
[env:disco_f303vc]
platform = ststm32
framework = opencm3
framework = libopencm3
board = disco_f303vc

6
examples/titiva/titiva-opencm3-blink/platformio.ini
View File

@ -19,15 +19,15 @@
[env:LaunchPad_lm4f120h5qr]
platform = titiva
framework = opencm3
framework = libopencm3
board = lplm4f120h5qr
[env:LaunchPad_tm4c1230c3pm]
platform = titiva
framework = opencm3
framework = libopencm3
board = lptm4c1230c3pm
[env:LaunchPad_tm4c1294ncpdt]
platform = titiva
framework = opencm3
framework = libopencm3
board = lptm4c1294ncpdt

6
platformio/boards/ststm32.json
View File

@ -9,7 +9,7 @@
"mcu": "stm32f407vgt6",
"variant": "stm32f4"
},
"frameworks": ["cmsis", "spl", "opencm3", "mbed"],
"frameworks": ["cmsis", "spl", "libopencm3", "mbed"],
"name": "STM32F4DISCOVERY",
"platform": "ststm32",
"upload": {
@ -29,7 +29,7 @@
"mcu": "stm32l152rbt6",
"variant": "stm32l1"
},
"frameworks": ["cmsis","spl","opencm3"],
"frameworks": ["cmsis","spl","libopencm3"],
"name": "STM32LDISCOVERY",
"platform": "ststm32",
"upload": {
@ -49,7 +49,7 @@
"mcu": "stm32f303vct6",
"variant": "stm32f3"
},
"frameworks": ["cmsis", "spl", "opencm3", "mbed"],
"frameworks": ["cmsis", "spl", "libopencm3", "mbed"],
"name": "STM32F3DISCOVERY",
"platform": "ststm32",
"upload": {

6
platformio/boards/titiva.json
View File

@ -8,7 +8,7 @@
"mcu": "lplm4f120h5qr",
"variant": "stellarpad"
},
"frameworks": ["energia", "opencm3"],
"frameworks": ["energia", "libopencm3"],
"name": "LaunchPad (Stellaris) w/ lm4f120 (80MHz)",
"platform": "titiva",
"upload": {
@ -27,7 +27,7 @@
"mcu": "lptm4c1230c3pm",
"variant": "stellarpad"
},
"frameworks": ["energia", "opencm3"],
"frameworks": ["energia", "libopencm3"],
"name": "LaunchPad (Tiva C) w/ tm4c123 (80MHz)",
"platform": "titiva",
"upload": {
@ -46,7 +46,7 @@
"mcu": "lptm4c1294ncpdt",
"variant": "launchpad_129"
},
"frameworks": ["energia", "opencm3"],
"frameworks": ["energia", "libopencm3"],
"name": "LaunchPad (Tiva C) w/ tm4c129 (120MHz)",
"platform": "titiva",
"upload": {

16
platformio/builder/scripts/frameworks/opencm3.py → platformio/builder/scripts/frameworks/libopencm3.py
View File

@ -21,7 +21,7 @@ from platformio.util import exec_command
env = DefaultEnvironment()
env.Replace(
PLATFORMFW_DIR=join("$PIOPACKAGES_DIR", "framework-opencm3")
PLATFORMFW_DIR=join("$PIOPACKAGES_DIR", "framework-libopencm3")
)
BOARD_BUILDOPTS = env.get("BOARD_OPTIONS", {}).get("build", {})
@ -101,7 +101,7 @@ def get_source_files(src_dir):
for search_path in mkdata['vpath']:
src_path = normpath(join(src_dir, search_path, src_file))
if isfile(src_path):
sources.append(join("$BUILD_DIR", "FrameworkOpenCM3",
sources.append(join("$BUILD_DIR", "FrameworkLibOpenCM3",
src_path.replace(lib_root + sep, "")))
break
return sources
@ -137,14 +137,14 @@ if BOARD_BUILDOPTS.get("core") == "lm4f":
)
env.VariantDir(
join("$BUILD_DIR", "FrameworkOpenCM3Variant"),
join("$BUILD_DIR", "FrameworkLibOpenCM3Variant"),
join("$PLATFORMFW_DIR", "include")
)
env.Append(
CPPPATH=[
join("$BUILD_DIR", "FrameworkOpenCM3"),
join("$BUILD_DIR", "FrameworkOpenCM3Variant")
join("$BUILD_DIR", "FrameworkLibOpenCM3"),
join("$BUILD_DIR", "FrameworkLibOpenCM3Variant")
]
)
@ -157,7 +157,7 @@ ldscript_path = find_ldscript(root_dir)
merge_ld_scripts(ldscript_path)
generate_nvic_files()
# override ldscript by opencm3
# override ldscript by libopencm3
assert "LDSCRIPT_PATH" in env
env.Replace(
LDSCRIPT_PATH=ldscript_path
@ -165,11 +165,11 @@ env.Replace(
libs = []
env.VariantDir(
join("$BUILD_DIR", "FrameworkOpenCM3"),
join("$BUILD_DIR", "FrameworkLibOpenCM3"),
"$PLATFORMFW_DIR"
)
libs.append(env.Library(
join("$BUILD_DIR", "FrameworkOpenCM3"),
join("$BUILD_DIR", "FrameworkLibOpenCM3"),
get_source_files(root_dir)
))

2
platformio/platforms/base.py
View File

@ -45,7 +45,7 @@ PLATFORM_PACKAGES = {
"http://www.st.com"
"/web/catalog/tools/FM147/CL1794/SC961/SS1743/PF257890")
],
"framework-opencm3": [
"framework-libopencm3": [
("libOpenCM3 Framework", "http://www.libopencm3.org/")
],
"framework-mbed": [

2
platformio/platforms/ststm32.py
View File

@ -41,7 +41,7 @@ class Ststm32Platform(BasePlatform):
"default": True
},
"framework-opencm3": {
"framework-libopencm3": {
"default": True
},

2
platformio/platforms/titiva.py
View File

@ -35,7 +35,7 @@ class TitivaPlatform(BasePlatform):
"default": True
},
"framework-opencm3": {
"framework-libopencm3": {
"default": True
}
}