Skip to content

Commit 5862712

Browse files
committed
Merge branch 'main' into dev
2 parents 84072f6 + 07ee432 commit 5862712

5 files changed

+10
-4
lines changed

docs/courses/hello-world/1.4-hardware-software-communication.ipynb

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
"Recently, HiveMQ Cloud changed such that `hivemq-com-chain.der` (a Certificate Authority (CA) file) is not transferrable across different broker instances. The [latest `hivemq-com-chain.der` file](https://raw.githubusercontent.com/sparks-baird/self-driving-lab-demo/main/src/public_mqtt_sdl_demo/hivemq-com-chain.der) from [`self-driving-lab-demo`](https://github.com/sparks-baird/self-driving-lab-demo) will be hard-coded to the `self-driving-lab-demo` public test credentials (i.e., what is used in Module 1 - Running the Demo), so the tutorials should run without issue as long as you are using that file. However, the assignment requires you to create your own HiveMQ Cloud broker instance, so you will need to follow the instructions there to [generate a `hivemq-com-chain.der` file specific to your instance](https://colab.research.google.com/github/sparks-baird/self-driving-lab-demo/blob/main/notebooks/7.2.1-hivemq-openssl-certificate.ipynb) and upload it to your microcontroller.\n",
2020
"```\n",
2121
"\n",
22+
"```{warning}\n",
23+
"Recently, HiveMQ Cloud changed such that the Certificate Authority (CA) file, `hivemq-com-chain.der`, is not transferrable across different broker instances. The [latest `hivemq-com-chain.der` file](https://raw.githubusercontent.com/sparks-baird/self-driving-lab-demo/main/src/public_mqtt_sdl_demo/hivemq-com-chain.der) from [`self-driving-lab-demo`](https://github.com/sparks-baird/self-driving-lab-demo) will be hard-coded to the `self-driving-lab-demo` public test credentials (i.e., what is used in Module 1 - Running the Demo), so the tutorials should run without issue as long as you are using that file. However, the assignment requires you to create your own HiveMQ Cloud broker instance, so you will need to follow the instructions there to generate your a `hivemq-com-chain.der` file specific to your instance.\n",
24+
"```\n",
25+
"\n",
2226
"In this tutorial, you will learn how to send commands to and receive sensor data from a microcontroller using the MQTT protocol.\n",
2327
"\n",
2428
"<img src=\"../../_static/mqtt-workflow.png\" width=80%>\n",

docs/courses/hello-world/1.5-data-logging.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"## 🔰 Tutorial\n",
1717
"\n",
1818
"```{warning}\n",
19-
"As a temporary workaround to the issue described in https://github.com/orgs/micropython/discussions/15112, add [`urequests_2.py`](https://github.com/AccelerationConsortium/ac-microcourses/blob/main/docs/courses/hello-world/urequests_2.py) [[permalink](https://github.com/AccelerationConsortium/ac-microcourses/blob/7d332e633f86aa6bf20e362dfab0a45457d79840/docs/courses/hello-world/urequests_2.py)] to your microcontroller, and change `import urequests` to `import urequests_2 as urequests` in the code below. See https://github.com/orgs/micropython/discussions/15112 and https://github.com/micropython/micropython-lib/pull/861 for ongoing updates. The corresponding assignment will also be affected, but this can be addressed using the same workaround.\n",
19+
"As a temporary workaround to the issue described in https://github.com/orgs/micropython/discussions/15112, add [`urequests_2.py`](https://github.com/AccelerationConsortium/ac-microcourses/blob/main/docs/courses/hello-world/urequests_2.py) [[permalink](https://github.com/AccelerationConsortium/ac-microcourses/blob/e5541ce3ec307a8e5e0f2b20f000c03f040e1f56/docs/courses/hello-world/urequests_2.py)] to your microcontroller, and change `import urequests` to `import urequests_2 as urequests` in the code below. See https://github.com/orgs/micropython/discussions/15112 and https://github.com/micropython/micropython-lib/pull/861 for ongoing updates. The corresponding assignment will also be affected, but this can be addressed using the same workaround.\n",
2020
"```\n",
2121
"\n",
2222
"In this tutorial, you will learn how to upload data to a MongoDB database directly from a microcontroller and read data from a database using Python.\n",

docs/courses/hello-world/1.6-connecting-the-pieces.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"## 🔰 Tutorial\n",
1717
"\n",
1818
"```{warning}\n",
19-
"As a temporary workaround to the issue described in https://github.com/orgs/micropython/discussions/15112, add [`urequests_2.py`](https://github.com/AccelerationConsortium/ac-microcourses/blob/main/docs/courses/hello-world/urequests_2.py) [[permalink](https://github.com/AccelerationConsortium/ac-microcourses/blob/7d332e633f86aa6bf20e362dfab0a45457d79840/docs/courses/hello-world/urequests_2.py)] to your microcontroller, and change `import urequests` to `import urequests_2 as urequests` in the code below. See https://github.com/orgs/micropython/discussions/15112 and https://github.com/micropython/micropython-lib/pull/861 for ongoing updates. The corresponding assignment will also be affected, but this can be addressed using the same workaround.\n",
19+
"As a temporary workaround to the issue described in https://github.com/orgs/micropython/discussions/15112, add [`urequests_2.py`](https://github.com/AccelerationConsortium/ac-microcourses/blob/main/docs/courses/hello-world/urequests_2.py) [[permalink](https://github.com/AccelerationConsortium/ac-microcourses/blob/e5541ce3ec307a8e5e0f2b20f000c03f040e1f56/docs/courses/hello-world/urequests_2.py)] to your microcontroller, and change `import urequests` to `import urequests_2 as urequests` in the code below. See https://github.com/orgs/micropython/discussions/15112 and https://github.com/micropython/micropython-lib/pull/861 for ongoing updates. The corresponding assignment will also be affected, but this can be addressed using the same workaround.\n",
2020
"```\n",
2121
"\n",
2222
"You've made it to the final module of this microcourse! Well done 🥳. In this module, you will connect the pieces from previous modules into the \"Hello World\" of self-driving labs, from microcontroller programming and Bayesian optimization to hardware-software communication and data logging.\n",

docs/courses/hello-world/urequests_2.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def request(
7070
if proto == "http:":
7171
port = 80
7272
elif proto == "https:":
73-
import ussl
73+
import ssl
7474

7575
port = 443
7676
else:
@@ -97,7 +97,7 @@ def request(
9797
try:
9898
s.connect(ai[-1])
9999
if proto == "https:":
100-
s = ussl.wrap_socket(s, server_hostname=host)
100+
s = ssl.wrap_socket(s, server_hostname=host)
101101
s.write(b"%s /%s HTTP/1.1\r\n" % (method, path))
102102
if "Host" not in headers:
103103
s.write(b"Host: %s\r\n" % host)

docs/index.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# 📜 Autonomous Systems for Discovery
22

3+
Advanced materials hold the potential to improve our lives and our world, but traditional methods of discovery are slow and expensive. "Self-driving" laboratories (SDLs) have the power to fast-track materials discovery by using AI and robotics to run lab experiments autonomously. State-of-the-art SDLs require interdisciplinary teams and skillsets that traditional degree-based programs do not provide. To address this gap, the [Acceleration Consortium @ University of Toronto](https://acceleration.utoronto.ca/) presents the *Autonomous Systems for Discovery* certificate containing short, hands-on courses that will provide familiarity with the terminology, principles, and tools of SDLs.
4+
35
<a class="github-button" href="https://github.com/AccelerationConsortium/ac-microcourses"
46
data-icon="octicon-star" data-size="large" data-show-count="true" aria-label="Star
57
AccelerationConsortium/ac-microcourses on GitHub">Star</a>

0 commit comments

Comments
 (0)