Skip to content

Merged with bbcmicro/PythonEditor and UI Tweaks #25

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.

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

Merged
merged 63 commits into from
Apr 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
c4ef9c2
Replace firmware with version from microbit.co.uk
jaustin Feb 15, 2017
a1cb715
Foundation config for deployment
jaustin Feb 14, 2017
33c4f98
Update script box styling
microbit-matt-smith Aug 29, 2017
22464da
Remove arbitrary height on script name box at small widths
microbit-matt-smith Aug 29, 2017
2a1b711
Fix positioning / wrapping of script name box
microbit-matt-smith Aug 29, 2017
6289b57
Fix annoying 1px button background gap on first button
microbit-matt-smith Aug 30, 2017
60024cd
Add right padding to script name box
microbit-matt-smith Aug 30, 2017
99b8250
Move show script to bin directory
microbit-matt-smith Aug 29, 2017
c629ea1
Revert "Initial export script"
microbit-matt-smith Aug 31, 2017
f42c29d
Add VERSION
microbit-matt-smith Aug 31, 2017
fb8d43b
non micro:bit related changes
microbit-sam Jan 30, 2019
5a0e321
Add VERSION
microbit-matt-smith Aug 31, 2017
dc57330
Consistent MicroPython Firmware from 1.0.0
microbit-sam Jan 31, 2019
d5b3d22
Update VERSION number to 1.0.0
microbit-sam Jan 31, 2019
03438dd
Updated CHANGELOG and README
microbit-sam Jan 31, 2019
7617562
Merge pull request #84 from microbit-sam/1.0.0-clean
microbit-carlos Feb 1, 2019
2ab478b
Add Help box
microbit-sam Sep 6, 2018
71d2531
Added Help JS
microbit-sam Sep 6, 2018
dd32287
Added style
microbit-sam Sep 6, 2018
f67ab04
Added versions
microbit-sam Sep 6, 2018
c92b692
Version 1.1
microbit-sam Sep 6, 2018
aea1902
Added RC3
microbit-sam Sep 7, 2018
a53c3ae
Correct editor number
microbit-sam Sep 7, 2018
a4551a8
Updated to RC4
microbit-sam Sep 12, 2018
a6550ce
Update to RC5
microbit-sam Sep 14, 2018
6cfd8a2
Update MicroPython to 1.0.0
microbit-sam Sep 21, 2018
0e7c3a6
Updated CHANGELOG
microbit-sam Feb 1, 2019
b89528e
Fix Editor Version in title
microbit-sam Feb 1, 2019
da26cb4
Merge pull request #85 from microbit-sam/1.1.0-clean
microbit-carlos Feb 1, 2019
c387994
Merge 1.1 to master (#22)
microbit-sam Oct 8, 2018
1d1969f
Bump version to 1.1.1
microbit-sam Oct 8, 2018
7aa3ada
UPDATED CHANGELOG
microbit-sam Feb 1, 2019
073731a
Fix Editor Version in title
microbit-sam Feb 1, 2019
4f44256
Merge pull request #86 from microbit-sam/1.1.1-clean
microbit-carlos Feb 1, 2019
d72be84
Merge 1.1 to master (#22)
microbit-sam Oct 8, 2018
742991c
Added initial import docs (#24)
microbit-sam Nov 12, 2018
2c58e80
Updated upy (#26)
microbit-sam Dec 17, 2018
75f1244
UPDATED CHANGELOG
microbit-sam Feb 1, 2019
61f2f1e
Fix Editor Version in title
microbit-sam Feb 1, 2019
45fcb59
Merge pull request #87 from microbit-sam/1.1.2-clean
microbit-carlos Feb 1, 2019
57d6321
Remove excess data when importing hex (#89)
microbit-sam Feb 1, 2019
aa9852d
Refactor hex code into individual module
microbit-carlos Oct 26, 2017
9e6047c
Replace Intel Hex manipulation code with nrf-intel-hex library.
microbit-carlos Jan 8, 2019
e63207f
Fix hex generation test
microbit-carlos Feb 1, 2019
d24fc7d
Merge pull request #77 from microbit-carlos/hex_refactor
microbit-carlos Feb 1, 2019
25a42a4
Add OS generated files to gitignore.
microbit-carlos Feb 8, 2019
d2b620b
help: Add feature flags and update wording (#92)
microbit-mark Feb 19, 2019
8f6be99
Minor refactor to decouple hex generation from button actions (#94)
microbit-carlos Feb 26, 2019
af16543
Show an alert when a hex file cannot be imported.
microbit-carlos Feb 27, 2019
9e1bb74
Merge pull request #102 from bbcmicrobit/unrecognised_hex
microbit-sam Feb 27, 2019
0a53256
Check for < IE 11 (#112)
microbit-sam Mar 6, 2019
b94b798
Fix function for IE10 (#100)
microbit-sam Mar 6, 2019
464ecfe
Add @babel/[email protected] for the intel-hex library.
microbit-carlos Mar 6, 2019
7026d45
Reduce the minimun allowed IE version to 10.
microbit-carlos Mar 6, 2019
7bbae7d
tests: Add manual tests procedure. (#120)
microbit-carlos Mar 11, 2019
e60fc58
Remove .sh extension from README instructions for bin/show (#122)
microbit-rosslowe Mar 11, 2019
4514815
Merge pull request #117 from bbcmicrobit/polyfill
microbit-sam Mar 11, 2019
07a8403
python-main: Make the EDITOR instance available globally. (#125)
microbit-carlos Mar 12, 2019
8b3577a
Bump version to 1.2.3 and update changelog.
microbit-carlos Mar 14, 2019
6859edf
Merged CodeGuild-co/PythonEditor and bbcmicrobit/PythonEditor
truejasonliu Apr 10, 2019
dbaa87c
Added toggle to simulator
truejasonliu Apr 10, 2019
c8aa158
Fixed chevrons
truejasonliu Apr 10, 2019
7f39f71
Removed animated buttons
truejasonliu Apr 10, 2019
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
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,13 @@
# OS files
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db
Thumbs.db
Desktop.ini
$RECYCLE.BIN/
*.swp
.vagrant
31 changes: 31 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,34 @@
1.1.3
-----
* Fixes issue loading hex files into the Editor (https://github.com/bbcmicrobit/PythonEditor/pull/89)
* Delegates Intel Hex manipulation to a library (https://github.com/NordicSemiconductor/nrf-intel-hex)
* Help file can read URL parameters to indicate what features to show
* When an invalid hex file is loaded it will now display an error message (before it didn't do anything)

1.1.2
-----

* Updated MicroPython to 1.0.1 release
* Updated README with migration documentation

1.1.1
-----

* Added migration capability

1.1.0
-----

* Updated MicroPython to 1.0.0 release
* Added help overlay with version information

1.0.0
-----

* Updated styling
* Moved show script to bin/show
* Flags disabled by default: blocks, experimental, and share

0.1.0
-----

Expand Down
25 changes: 24 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ submodules::

Assuming you have Python 3 installed you can serve the editor like this::

$ ./show.sh
$ ./bin/show
http://localhost:8000/editor.html
Serving HTTP on 0.0.0.0 port 8000 ...

Expand Down Expand Up @@ -136,6 +136,29 @@ relatively small when you consider:
* The web has caching built in (we should trust it)
* We actually want kids to view source and find the .hex file in as raw a form as possible.

Importing Projects
++++++++++++++++++
Python projects from external sources can be imported into the editor using a special URL e.g.
``https://python.microbit.org/v/1.1#project:{{ encoded project }}``

To encode a project, it must be structured as follows:

::

{
meta: {
cloudId: "microbit.co.uk", # optional
comment: "A MicroPython script", # required - may be blank
editor: "python", # required - editor name
lastUse: 1538407830, # optional - UNIX time the script was last used
name: "unearthly script 2" # required - may be blank
},
source: "# Add your Python code here. E.g.\r\n from microbit import *\r\n while True:\r\n display.scroll('Hello, World!')\r\nsleep(2000)"
}

This JSON structure is compressed using `LZMA
<https://github.com/LZMA-JS/LZMA-JS>`_, and then encoded as Base64 to include in the import URL.

Configuration
-------------

Expand Down
1 change: 1 addition & 0 deletions base64-js/base64.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions bin/show
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash
echo "http://localhost:8000/editor.html"

pushd `dirname $0` > /dev/null
SCRIPTPATH=`pwd`
popd > /dev/null

cd ${SCRIPTPATH}/../ && python3 -m http.server
Loading