Skip to content

Code Cleanup (Functional changes only) #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Cabalist wants to merge 3 commits into from
Closed

Code Cleanup (Functional changes only) #33

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e000b23
Use contextmanagers for writing to files
Cabalist Mar 12, 2021
564f48b
remove unused imports
Cabalist Mar 12, 2021
5e29ba3
Move stdlib import to top of file
Cabalist Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
244 changes: 118 additions & 126 deletions pico_project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@
#

import argparse
import csv
import os
import shutil
from pathlib import Path
import sys
import subprocess
from time import sleep
import platform
import shlex
import csv
import shutil
import subprocess
import sys
import threading
from pathlib import Path

import tkinter as tk
from tkinter import messagebox as mb
from tkinter import filedialog as fd
from tkinter import messagebox as mb
from tkinter import simpledialog as sd
from tkinter import ttk

Expand Down Expand Up @@ -289,7 +289,6 @@ def getCheckedItems(self):
return values


import threading

def thread_function(text, command, ok):
l = shlex.split(command)
Expand Down Expand Up @@ -828,59 +827,58 @@ def GenerateMain(folder, projectName, features, cpp):
else:
filename = Path(folder) / (projectName + '.c')

file = open(filename, 'w')

main = ('#include <stdio.h>\n'
'#include "pico/stdlib.h"\n'
)
file.write(main)
with open(filename, 'w') as file:

if (features):

# Add any includes
for feat in features:
if (feat in features_list):
o = '#include "' + features_list[feat][H_FILE] + '"\n'
file.write(o)
if (feat in stdlib_examples_list):
o = '#include "' + stdlib_examples_list[feat][H_FILE] + '"\n'
file.write(o)

file.write('\n')

# Add any defines
for feat in features:
if (feat in code_fragments_per_feature):
for s in code_fragments_per_feature[feat][DEFINES]:
file.write(s)
main = ('#include <stdio.h>\n'
'#include "pico/stdlib.h"\n'
)
file.write(main)

if (features):

# Add any includes
for feat in features:
if (feat in features_list):
o = '#include "' + features_list[feat][H_FILE] + '"\n'
file.write(o)
if (feat in stdlib_examples_list):
o = '#include "' + stdlib_examples_list[feat][H_FILE] + '"\n'
file.write(o)

file.write('\n')

# Add any defines
for feat in features:
if (feat in code_fragments_per_feature):
for s in code_fragments_per_feature[feat][DEFINES]:
file.write(s)
file.write('\n')
file.write('\n')
file.write('\n')

main = ('\n\n'
'int main()\n'
'{\n'
' stdio_init_all();\n\n'
)

if (features):
# Add any initialisers
indent = 4
for feat in features:
if (feat in code_fragments_per_feature):
for s in code_fragments_per_feature[feat][INITIALISERS]:
main += (" " * indent)
main += s
main += '\n'
main += '\n'
main = ('\n\n'
'int main()\n'
'{\n'
' stdio_init_all();\n\n'
)

main += (' puts("Hello, world!");\n\n'
' return 0;\n'
'}\n'
)
if (features):
# Add any initialisers
indent = 4
for feat in features:
if (feat in code_fragments_per_feature):
for s in code_fragments_per_feature[feat][INITIALISERS]:
main += (" " * indent)
main += s
main += '\n'
main += '\n'

main += (' puts("Hello, world!");\n\n'
' return 0;\n'
'}\n'
)

file.write(main)
file.write(main)

file.close()


def GenerateCMake(folder, params):
Expand All @@ -906,82 +904,80 @@ def GenerateCMake(folder, params):

filename = Path(folder) / CMAKELIST_FILENAME

file = open(filename, 'w')
with open(filename, 'w') as file:

file.write(cmake_header1)
file.write(cmake_header1)

# OK, for the path, CMake will accept forward slashes on Windows, and thats
# seemingly a bit easier to handle than the backslashes
# OK, for the path, CMake will accept forward slashes on Windows, and thats
# seemingly a bit easier to handle than the backslashes

p = str(params.sdkPath).replace('\\','/')
p = '\"' + p + '\"'
p = str(params.sdkPath).replace('\\','/')
p = '\"' + p + '\"'

file.write('set(PICO_SDK_PATH ' + p + ')\n\n')
file.write(cmake_header2)
file.write('project(' + params.projectName + ' C CXX ASM)\n')
file.write('set(PICO_SDK_PATH ' + p + ')\n\n')
file.write(cmake_header2)
file.write('project(' + params.projectName + ' C CXX ASM)\n')

if params.exceptions:
file.write("\nset(PICO_CXX_ENABLE_EXCEPTIONS 1)\n")
if params.exceptions:
file.write("\nset(PICO_CXX_ENABLE_EXCEPTIONS 1)\n")

if params.rtti:
file.write("\nset(PICO_CXX_ENABLE_RTTI 1)\n")
if params.rtti:
file.write("\nset(PICO_CXX_ENABLE_RTTI 1)\n")

file.write(cmake_header3)
file.write(cmake_header3)

# add the preprocessor defines for overall configuration
if params.configs:
file.write('# Add any PICO_CONFIG entries specified in the Advanced settings\n')
for c, v in params.configs.items():
if v == "True":
v = "1"
elif v == "False":
v = "0"
file.write('add_compile_definitions(' + c + '=' + v + ')\n')
file.write('\n')
# add the preprocessor defines for overall configuration
if params.configs:
file.write('# Add any PICO_CONFIG entries specified in the Advanced settings\n')
for c, v in params.configs.items():
if v == "True":
v = "1"
elif v == "False":
v = "0"
file.write('add_compile_definitions(' + c + '=' + v + ')\n')
file.write('\n')

# No GUI/command line to set a different executable name at this stage
executableName = params.projectName
# No GUI/command line to set a different executable name at this stage
executableName = params.projectName

if params.wantCPP:
file.write('add_executable(' + params.projectName + ' ' + params.projectName + '.cpp )\n\n')
else:
file.write('add_executable(' + params.projectName + ' ' + params.projectName + '.c )\n\n')

file.write('pico_set_program_name(' + params.projectName + ' "' + executableName + '")\n')
file.write('pico_set_program_version(' + params.projectName + ' "0.1")\n\n')
if params.wantCPP:
file.write('add_executable(' + params.projectName + ' ' + params.projectName + '.cpp )\n\n')
else:
file.write('add_executable(' + params.projectName + ' ' + params.projectName + '.c )\n\n')

if params.wantRunFromRAM:
file.write('# no_flash means the target is to run from RAM\n')
file.write('pico_set_binary_type(' + params.projectName + ' no_flash)\n\n')
file.write('pico_set_program_name(' + params.projectName + ' "' + executableName + '")\n')
file.write('pico_set_program_version(' + params.projectName + ' "0.1")\n\n')

# Console output destinations
if params.wantUART:
file.write('pico_enable_stdio_uart(' + params.projectName + ' 1)\n')
else:
file.write('pico_enable_stdio_uart(' + params.projectName + ' 0)\n')
if params.wantRunFromRAM:
file.write('# no_flash means the target is to run from RAM\n')
file.write('pico_set_binary_type(' + params.projectName + ' no_flash)\n\n')

if params.wantUSB:
file.write('pico_enable_stdio_usb(' + params.projectName + ' 1)\n\n')
else:
file.write('pico_enable_stdio_usb(' + params.projectName + ' 0)\n\n')
# Console output destinations
if params.wantUART:
file.write('pico_enable_stdio_uart(' + params.projectName + ' 1)\n')
else:
file.write('pico_enable_stdio_uart(' + params.projectName + ' 0)\n')

# Standard libraries
file.write('# Add the standard library to the build\n')
file.write('target_link_libraries(' + params.projectName + ' ' + STANDARD_LIBRARIES + ')\n\n')
if params.wantUSB:
file.write('pico_enable_stdio_usb(' + params.projectName + ' 1)\n\n')
else:
file.write('pico_enable_stdio_usb(' + params.projectName + ' 0)\n\n')

# Standard libraries
file.write('# Add the standard library to the build\n')
file.write('target_link_libraries(' + params.projectName + ' ' + STANDARD_LIBRARIES + ')\n\n')

# Selected libraries/features
if (params.features):
file.write('# Add any user requested libraries\n')
file.write('target_link_libraries(' + params.projectName + '\n')
for feat in params.features:
if (feat in features_list):
file.write(" " + features_list[feat][LIB_NAME] + '\n')
file.write(' )\n\n')

file.write('pico_add_extra_outputs(' + params.projectName + ')\n\n')
# Selected libraries/features
if (params.features):
file.write('# Add any user requested libraries\n')
file.write('target_link_libraries(' + params.projectName + '\n')
for feat in params.features:
if (feat in features_list):
file.write(" " + features_list[feat][LIB_NAME] + '\n')
file.write(' )\n\n')

file.close()
file.write('pico_add_extra_outputs(' + params.projectName + ')\n\n')


# Generates the requested project files, if any
Expand Down Expand Up @@ -1078,21 +1074,17 @@ def generateProjectFiles(projectPath, projectName, sdkPath, projects, debugger):
os.chdir(VSCODE_FOLDER)

filename = VSCODE_LAUNCH_FILENAME
file = open(filename, 'w')
file.write(v1)
file.close()
with open(filename, 'w') as file:
file.write(v1)

file = open(VSCODE_C_PROPERTIES_FILENAME, 'w')
file.write(c1)
file.close()
with open(VSCODE_C_PROPERTIES_FILENAME, 'w') as file:
file.write(c1)

file = open(VSCODE_SETTINGS_FILENAME, 'w')
file.write(s1)
file.close()
with open(VSCODE_SETTINGS_FILENAME, 'w') as file:
file.write(s1)

file = open(VSCODE_EXTENSIONS_FILENAME, 'w')
file.write(e1)
file.close()
with open(VSCODE_EXTENSIONS_FILENAME, 'w') as file:
file.write(e1)

else :
print('Unknown project type requested')
Expand Down Expand Up @@ -1214,7 +1206,7 @@ def DoEverything(parent, params):
# Check we have everything we need to compile etc
c = CheckPrerequisites()

## TODO Do both warnings in the same error message so user does have to keep coming back to find still more to do
# TODO Do both warnings in the same error message so user does have to keep coming back to find still more to do

if c == None:
m = 'Unable to find the `' + COMPILER_NAME + '` compiler\n'
Expand Down