Tweaks to build scripts
This commit is contained in:
		| @@ -8,9 +8,7 @@ from __future__ import print_function | ||||
| target_filename = "FIRMWARE.CUR" | ||||
| target_drive = "REARM" | ||||
|  | ||||
| import os | ||||
| import getpass | ||||
| import platform | ||||
| import os,getpass,platform | ||||
|  | ||||
| current_OS = platform.system() | ||||
| Import("env") | ||||
| @@ -33,9 +31,8 @@ try: | ||||
| 		# | ||||
| 		# platformio.ini will accept this for a Windows upload port designation: 'upload_port = L:' | ||||
| 		#   Windows - doesn't care about the disk's name, only cares about the drive letter | ||||
| 		import subprocess | ||||
| 		import subprocess,string | ||||
| 		from ctypes import windll | ||||
| 		import string | ||||
|  | ||||
| 		# getting list of drives | ||||
| 		# https://stackoverflow.com/questions/827371/is-there-a-way-to-list-all-the-available-drive-letters-in-python | ||||
|   | ||||
| @@ -16,7 +16,7 @@ | ||||
| # location: <https://www.gnu.org/licenses/>. | ||||
|  | ||||
| from __future__ import print_function | ||||
| import argparse, re, sys | ||||
| import argparse,re,sys | ||||
|  | ||||
| usage = ''' | ||||
| This program extracts line segments from a SVG file and writes | ||||
|   | ||||
| @@ -1,3 +1,6 @@ | ||||
| # | ||||
| # STM32F103RC_MEEB_3DP.py | ||||
| # | ||||
| try: | ||||
|     import configparser | ||||
| except ImportError: | ||||
|   | ||||
| @@ -1,3 +1,6 @@ | ||||
| # | ||||
| # STM32F103RC_SKR_MINI.py | ||||
| # | ||||
| import os | ||||
| Import("env") | ||||
|  | ||||
|   | ||||
| @@ -1,3 +1,6 @@ | ||||
| # | ||||
| # STM32F103RC_fysetc.py | ||||
| # | ||||
| import os | ||||
| from os.path import join | ||||
| from os.path import expandvars | ||||
|   | ||||
| @@ -1,3 +1,6 @@ | ||||
| # | ||||
| # STM32F103RET6_creality.py | ||||
| # | ||||
| import os | ||||
| Import("env") | ||||
| 
 | ||||
| @@ -1,3 +1,6 @@ | ||||
| # | ||||
| # STM32F103RE_SKR_E3_DIP.py | ||||
| # | ||||
| import os | ||||
| Import("env") | ||||
|  | ||||
|   | ||||
| @@ -1,3 +1,7 @@ | ||||
| # | ||||
| # STM32F103VE_longer.py | ||||
| # Customizations for env:STM32F103VE_longer | ||||
| # | ||||
| import os | ||||
| Import("env") | ||||
|  | ||||
|   | ||||
| @@ -1,3 +1,6 @@ | ||||
| # | ||||
| # STM32F1_create_variant.py | ||||
| # | ||||
| import os,shutil | ||||
| from SCons.Script import DefaultEnvironment | ||||
| from platformio import util | ||||
|   | ||||
| @@ -1,3 +1,7 @@ | ||||
| # | ||||
| # STM32F401VE_STEVAL.py | ||||
| # Customizations for env:STM32F401VE_STEVAL | ||||
| # | ||||
| import os | ||||
| Import("env") | ||||
| 
 | ||||
| @@ -1,2 +1,5 @@ | ||||
| # | ||||
| # add_nanolib.py | ||||
| # | ||||
| Import("env") | ||||
| env.Append(LINKFLAGS=["--specs=nano.specs"]) | ||||
|   | ||||
| @@ -1,8 +1,9 @@ | ||||
| # | ||||
| # chitu_crypt.py | ||||
| # Customizations for Chitu boards | ||||
| # | ||||
| Import("env") | ||||
| import os | ||||
| import random | ||||
| import struct | ||||
| import uuid | ||||
| import os,random,struct,uuid | ||||
|  | ||||
| # Relocate firmware from 0x08000000 to 0x08008800 | ||||
| env['CPPDEFINES'].remove(("VECT_TAB_ADDR", "0x8000000")) | ||||
|   | ||||
| @@ -28,8 +28,8 @@ def add_cpu_freq(): | ||||
| if env.GetBuildType() == "debug": | ||||
| 	env['BUILD_DIR'] = '$PROJECT_BUILD_DIR/$PIOENV/debug' | ||||
|  | ||||
| # On some platform, F_CPU is a runtime variable. Since it's used to convert from ns | ||||
| # to CPU cycles, this adds overhead preventing small delay (in the order of less than | ||||
| # On some platform, F_CPU is a runtime variable. Since it's used to convert from ns  | ||||
| # to CPU cycles, this adds overhead preventing small delay (in the order of less than  | ||||
| # 30 cycles) to be generated correctly. By using a compile time constant instead | ||||
| # the compiler will perform the computation and this overhead will be avoided | ||||
| add_cpu_freq() | ||||
|   | ||||
| @@ -2,9 +2,7 @@ | ||||
| # common-dependencies.py | ||||
| # Convenience script to check dependencies and add libs and sources for Marlin Enabled Features | ||||
| # | ||||
| import subprocess | ||||
| import os | ||||
| import re | ||||
| import subprocess,os,re | ||||
| try: | ||||
| 	import configparser | ||||
| except ImportError: | ||||
|   | ||||
| @@ -1,3 +1,6 @@ | ||||
| # | ||||
| # copy_marlin_variant_to_framework.py | ||||
| # | ||||
| import os,shutil | ||||
| from SCons.Script import DefaultEnvironment | ||||
| from platformio import util | ||||
|   | ||||
| @@ -1,9 +1,8 @@ | ||||
| # | ||||
| # download_mks_assets.py | ||||
| # | ||||
| Import("env") | ||||
| import os | ||||
| import requests | ||||
| import zipfile | ||||
| import tempfile | ||||
| import shutil | ||||
| import os,requests,zipfile,tempfile,shutil | ||||
|  | ||||
| url = "https://github.com/makerbase-mks/Mks-Robin-Nano-Marlin2.0-Firmware/archive/master.zip" | ||||
| zip_path = os.path.join(env.Dictionary("PROJECT_LIBDEPS_DIR"), "mks-assets.zip") | ||||
|   | ||||
| @@ -1,3 +1,6 @@ | ||||
| # | ||||
| # fix_framework_weakness.py | ||||
| # | ||||
| from os.path import join, isfile | ||||
| import shutil | ||||
| from pprint import pprint | ||||
|   | ||||
| @@ -1,3 +1,7 @@ | ||||
| # | ||||
| # fly_mini.py | ||||
| # Customizations for env:FLY_MINI | ||||
| # | ||||
| import os | ||||
| Import("env") | ||||
|  | ||||
|   | ||||
| @@ -1,3 +1,7 @@ | ||||
| # | ||||
| # lerdge.py | ||||
| # Customizations for Lerdge build environments | ||||
| # | ||||
| import os,sys | ||||
| Import("env") | ||||
|  | ||||
|   | ||||
| @@ -2,8 +2,7 @@ | ||||
| # preflight-checks.py | ||||
| # Check for common issues prior to compiling | ||||
| # | ||||
| import os | ||||
| import re | ||||
| import os,re | ||||
| Import("env") | ||||
|  | ||||
| def get_envs_for_board(board): | ||||
|   | ||||
| @@ -1,3 +1,7 @@ | ||||
| # | ||||
| # random-bin.py | ||||
| # Set a unique firmware name based on current date and time | ||||
| # | ||||
| Import("env") | ||||
|  | ||||
| from datetime import datetime | ||||
|   | ||||
| @@ -1,3 +1,6 @@ | ||||
| # | ||||
| # stm32_bootloader.py | ||||
| # | ||||
| import os,sys,shutil | ||||
| Import("env") | ||||
|  | ||||
|   | ||||
| @@ -22,8 +22,7 @@ | ||||
| # 2020-06-05 SRL style tweaks | ||||
| #----------------------------------- | ||||
| # | ||||
| import sys | ||||
| import os | ||||
| import sys,os | ||||
| from pathlib import Path | ||||
| from distutils.dir_util import copy_tree  # for copy_tree, because shutil.copytree can't handle existing files, dirs | ||||
|  | ||||
|   | ||||
| @@ -22,8 +22,7 @@ from __future__ import print_function | ||||
| from __future__ import division | ||||
|  | ||||
| from math import * | ||||
| import sys | ||||
| import getopt | ||||
| import sys,getopt | ||||
|  | ||||
| "Constants" | ||||
| ZERO   = 273.15                             # zero point of Kelvin scale | ||||
|   | ||||
| @@ -72,8 +72,7 @@ | ||||
| from __future__ import print_function | ||||
| from __future__ import division | ||||
|  | ||||
| import sys | ||||
| import os | ||||
| import sys,os | ||||
|  | ||||
| pwd = os.getcwd()  # make sure we're executing from the correct directory level | ||||
| pwd = pwd.replace('\\', '/') | ||||
|   | ||||
| @@ -13,11 +13,9 @@ | ||||
| from __future__ import print_function | ||||
| from __future__ import division | ||||
|  | ||||
| import subprocess | ||||
| import os | ||||
| import sys | ||||
| import subprocess,os,sys,platform | ||||
| from SCons.Script import DefaultEnvironment | ||||
| import platform | ||||
|  | ||||
| current_OS = platform.system() | ||||
|  | ||||
| env = DefaultEnvironment() | ||||
|   | ||||
| @@ -9,8 +9,7 @@ | ||||
| #  Will continue on if a COM port isn't found so that the compilation can be done. | ||||
| # | ||||
|  | ||||
| import os | ||||
| import sys | ||||
| import os,sys | ||||
| from SCons.Script import DefaultEnvironment | ||||
| import platform | ||||
| current_OS = platform.system() | ||||
|   | ||||
| @@ -1155,7 +1155,7 @@ extends         = env:STM32F103RE | ||||
| build_flags     = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4 | ||||
| extra_scripts   = ${env:STM32F103RE.extra_scripts} | ||||
|   pre:buildroot/share/PlatformIO/scripts/random-bin.py | ||||
|   buildroot/share/PlatformIO/scripts/creality.py | ||||
|   buildroot/share/PlatformIO/scripts/STM32F103RET6_creality.py | ||||
| debug_tool      = jlink | ||||
| upload_protocol = jlink | ||||
|  | ||||
| @@ -1194,7 +1194,7 @@ build_flags       = ${common_stm32.build_flags} | ||||
|   -DDISABLE_GENERIC_SERIALUSB -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS | ||||
| extra_scripts     = ${common.extra_scripts} | ||||
|   pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py | ||||
|   buildroot/share/PlatformIO/scripts/STEVAL__F401XX.py | ||||
|   buildroot/share/PlatformIO/scripts/STM32F401VE_STEVAL.py | ||||
|  | ||||
| # | ||||
| # STM32F401RC | ||||
| @@ -1569,7 +1569,9 @@ board_build.ldscript = ldscript.ld | ||||
| board_build.offset   = 0x10000 | ||||
| build_flags          = ${common_stm32.build_flags} -DENABLE_HWSERIAL3 -DTIMER_SERIAL=TIM5 | ||||
| build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC | ||||
| extra_scripts        = ${common.extra_scripts} pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py buildroot/share/PlatformIO/scripts/stm32_bootloader.py | ||||
| extra_scripts        = ${common.extra_scripts} | ||||
|   pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py | ||||
|   buildroot/share/PlatformIO/scripts/stm32_bootloader.py | ||||
|  | ||||
| ################################# | ||||
| #                               # | ||||
|   | ||||
		Reference in New Issue
	
	Block a user