return index of textbox #53
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…nal and don't check for CHANGE ME
makermelissa
requested changes
Dec 2, 2020
adafruit_matrixportal/network.py
Outdated
| @@ -46,7 +46,7 @@ | |||
| ) | |||
| raise | |||
|
|
|||
| __version__ = "0.0.0-auto.0" | |||
| __version__ = "1.9.4" | |||
There was a problem hiding this comment.
Please leave the version at "0.0.0-auto.0" or the automatic versioning won't work.
adafruit_matrixportal/network.py
Outdated
Comment on lines
298
to
315
| print("Connecting to AP", secrets["ssid"]) | ||
| if secrets["ssid"] == "CHANGE ME" or secrets["password"] == "CHANGE ME": | ||
| change_me = "\n" + "*" * 45 | ||
| change_me += "\nPlease update the 'secrets.py' file on your\n" | ||
| change_me += "CIRCUITPY drive to include your local WiFi\n" | ||
| change_me += "access point SSID name in 'ssid' and SSID\n" | ||
| change_me += "password in 'password'. Then save to reload!\n" | ||
| change_me += "*" * 45 | ||
| raise OSError(change_me) | ||
| if "ssid" in secrets: | ||
| if isinstance(secrets["ssid"], (list, tuple)): | ||
| print( | ||
| 'secrets["ssid"] is a list or a tuple. I assume you know what you\'re doing' | ||
| ) | ||
| else: | ||
| print("Connecting to AP", secrets["ssid"]) | ||
| if ( | ||
| secrets["ssid"] == "CHANGE ME" | ||
| or secrets["password"] == "CHANGE ME" | ||
| ): | ||
| change_me = "\n" + "*" * 45 | ||
| change_me += "\nPlease update the 'secrets.py' file on your\n" | ||
| change_me += "CIRCUITPY drive to include your local WiFi\n" | ||
| change_me += "access point SSID name in 'ssid' and SSID\n" | ||
| change_me += "password in 'password'. Then save to reload!\n" | ||
| change_me += "*" * 45 | ||
| raise OSError(change_me) |
There was a problem hiding this comment.
What is the purpose of the change for the code to check if a user has set their SSID/password yet?
There was a problem hiding this comment.
yes, accidental inclusion. Sorry, I'll fix that.
There was a problem hiding this comment.
[this is part of another change I have on my side to allow a list of SSID and a list of passwords, allowing the device to connect to a different wifi, depending on which is available]
makermelissa
approved these changes
Dec 3, 2020
adafruit-adabot
added a commit
to adafruit/Adafruit_CircuitPython_Bundle
that referenced
this pull request
Dec 3, 2020
Updating https://github.com/adafruit/Adafruit_CircuitPython_MagTag to 1.1.2 from 1.1.1: > Merge pull request adafruit/Adafruit_CircuitPython_MagTag#29 from slootsky/feature/return_index_of_textbox Updating https://github.com/adafruit/Adafruit_CircuitPython_MatrixPortal to 1.9.6 from 1.9.5: > Merge pull request adafruit/Adafruit_CircuitPython_MatrixPortal#53 from slootsky/feature/return_id_of_textbox
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows developer to receive the index of the textbox which was just created.
Usage:
`dateBox=matrixportal.add_text(blahblahblah)
timeBox=matrixportal.add_text(blahblahblah)
...various code...
matrixportal.set_text('the date',dateBox)
matrixportal.set_text('the time',timeBox)
`