rei039474 · rei039474 · Aug 24, 2021 · Aug 27, 2021 · Aug 30, 2021 · Aug 30, 2021
diff --git a/Final Project/README.md b/Final Project/README.md
diff --git a/Lab 1/demo.py b/Lab 1/demo.py
@@ -1,3 +1,2 @@
-## This line is comment
-## for demo during the class
+
 print("Hello World")
diff --git a/Lab 2/Extending the Pi.md b/Lab 2/Extending the Pi.md
@@ -1,6 +1,6 @@
 # Extending the Pi
 
-To extend the Pi, we are using breakout boards that connect to the PI using a standard communication bus (I2C)(https://learn.sparkfun.com/tutorials/i2c/all). [StemmaQT](https://learn.adafruit.com/introducing-adafruit-stemma-qt/what-is-stemma) and [Qwiic](https://www.sparkfun.com/qwiic#overview) use a standardized 4-pin connector to connect devices using the I2C protocol. 
+To extend the Pi, we are using breakout boards that connect to the PI using a standard communication bus [I2C](https://learn.sparkfun.com/tutorials/i2c/all). [StemmaQT](https://learn.adafruit.com/introducing-adafruit-stemma-qt/what-is-stemma) and [Qwiic](https://www.sparkfun.com/qwiic#overview) use a standardized 4-pin connector to connect devices using the I2C protocol. 
 
 The StemmaQT and I2C parts often have a fixed I2C address; to differentiate between similar parts, the devices often have pads that allow additional bits to be pulled high or low. The addresses are in [hexidecimal](https://learn.sparkfun.com/tutorials/hexadecimal/introduction) format, things like `0x6f`. This is the hexadecimal (or hex) representation for the decimal number `111` which is represented as `1101111` in binary. You are not expected to make any kinds of conversions but should have some conceptual grasp that a hex value is just a number shown another way. [This Python library](https://towardsdatascience.com/binary-hex-and-octal-in-python-20222488cee1) will assist you if you need help manipulating hexidecimal numbers.
 
@@ -30,16 +30,17 @@ As before, connect to your Pi and activate your virtual environment.
 ssh pi@ixe00
 pi@ixe00:~ $ source circuitpython/bin/activate
 (circuitpython) pi@ixe00:~ $ 
-
 ```
 
-Navigate to your interactive lab hub, pull changes from upstream, and install new packages. If you have [merge conflicts](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts), you need to resolve them. If you've never done this before ask people in your group for help. Otherwise ask yout TA!
+On the pi, Navigate to your interactive lab hub, pull changes from upstream, and install new packages. If you have [merge conflicts](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts), you need to resolve them. If you've never done this before ask people in your group for help.
 
 ```
 (circuitpython) pi@ixe00:~$ cd Interactive-Lab-Hub
-(circuitpython) pi@ixe00:~/Interactive-Lab-Hub $ git pull upstream Spring2021
+(circuitpython) pi@ixe00:~/Interactive-Lab-Hub $ git remote add upstream https://github.com/FAR-Lab/Interactive-Lab-Hub.git
+(circuitpython) pi@ixe00:~/Interactive-Lab-Hub $ git pull upstream Fall2021
 (circuitpython) pi@ixe00:~/Interactive-Lab-Hub $ git add .
-(circuitpython) pi@ixe00:~/Interactive-Lab-Hub $ git commit -m'merge'
+(circuitpython) pi@ixe00:~/Interactive-Lab-Hub $ git commit -m "merge"
+(circuitpython) pi@ixe00:~/Interactive-Lab-Hub $ git push
 (circuitpython) pi@ixe00:~/Interactive-Lab-Hub $ cd Lab\ 2/
 (circuitpython) pi@ixe00:~/Interactive-Lab-Hub/Lab 2 $ pip install -r requirements.txt
 ```
@@ -55,21 +56,10 @@ Try running `python library_example.py`.
 Some important things to note from the code:
 
  * We create an I2C device to handle communication with the pi.
- * We then scan for devices on the bus
+ * We then scan for devices on the bus.
  * We check if `default_addr = 0x6f` is listed in the found devices. This is the address your button comes programmed with, you can also change this and have it store the update on the button.
  * Once we initialize the I2C_Button object the rest of the code shows us some of the builtin capabilities.
 
-## Connecting a Sensor
-
-Your kit is full of sensors! Look up what they can do and feel free to ask your TAs, We love to talk sensors. We will go further in depth into sensors in the coming weeks, but we put this small sample here to demonstrate how you can get sensor data if you want to use it for your project this week.
-
-We are going to connect the [Adafruit APDS9960 Proximity, Light, RGB, and Gesture Sensor](https://www.adafruit.com/product/3595). You can leave the button plugged in and daisy-chain the sensor, this is part of the magic of I2C.
-
-<img src="https://cdn-shop.adafruit.com/1200x900/3595-03.jpg" height="200" />
-
-
-Now run `python proximity.py`.
-
 
 ## Under the I2C curtain (optional: complete only after working on your projects in groups)
 
@@ -79,7 +69,6 @@ Run the file `I2C_scan.py` and the output should look like:
 (circuitpython) pi@ixe00:~/Interactive-Lab-Hub/Lab 2 $ python I2C_scan.py 
 I2C ok!
 I2C addresses found: []
-
 ```
 
 Now plug the other end of the cable into the ports on the right of the button board. The pwr LED should turn on. Run the file again and you should see the device ID. You can also try daisy chaining multiple devices and sensors and running again.
@@ -100,3 +89,24 @@ Use a higher level device interface can make reading and writing registers for I
 ```
 56               write_register(device, STATUS, 0)
 ```
+
+#### Connecting more that one button
+
+The more buttons the merrier! ...but how do you control them individually when they are come with the same default I2C address `0x6f`?
+
+Option 1 - Software: Look into the [list of registers](https://cdn.sparkfun.com/assets/learn_tutorials/1/1/0/8/Qwiic_Button_I2C_Register_Map.pdf) of the buttons again, is it possible to change the I2C address through software progrmming? 
+
+Option 2 - Hardware: Look at the bottom right corner of the back of the button, you should be able to local a sign of ADR with A0 - A3 jumpers. By solding these I2C address jumpers, you can actually change the address directly! Check [here](https://learn.sparkfun.com/tutorials/sparkfun-qwiic-button-hookup-guide/all) to see how the I2C address change!
+
+<img src="https://cdn.sparkfun.com/assets/learn_tutorials/1/1/0/8/SparkFun_Qwiic_Button_ADR_Jumpers.jpg" height="200" />
+
+## Connecting a Sensor
+
+Your kit is full of sensors! Look up what they can do and feel free to ask your TAs, we love to talk sensors. We will go further in depth into sensors in the coming weeks, but we put this small sample here to demonstrate how you can get sensor data if you want to use it for your project this week.
+
+We are going to connect the [Adafruit APDS9960 Proximity, Light, RGB, and Gesture Sensor](https://www.adafruit.com/product/3595). You can leave the button plugged in and daisy-chain the sensor, this is part of the magic of I2C.
+
+<img src="https://cdn-shop.adafruit.com/1200x900/3595-03.jpg" height="200" />
+
+
+Now run `python proximity.py`. What did you see? Check out [here](https://learn.adafruit.com/adafruit-apds9960-breakout/circuitpython) to learn more about the sensor and think about how you might be able to apply it in the future projects!
diff --git a/Lab 2/README.md b/Lab 2/README.md
@@ -1,6 +1,6 @@
-# The Clock of Pi
+# Interactive Prototyping: The Clock of Pi
 
-Does it feel like time is moving strangely during the pandemic?
+Does it feel like time is moving strangely during this semester?
 
 For our first Pi project, we will pay homage to the [timekeeping devices of old](https://en.wikipedia.org/wiki/History_of_timekeeping_devices) by making simple clocks.
 
@@ -11,24 +11,31 @@ Be generous in acknowledging their contributions! And also recognizing any other
 
 ## Prep
 
-[Lab prep](prep.md) is extra long this week! Make sure you read it over in time to prepare for lab on Wednesday.
+[Lab prep](prep.md) is extra long this week! Make sure you read it over in time to prepare for lab on Thursday.
 
 ### Get your kit
 If you are remote but in the US, let the teaching team know you need the parts mailed.
 
-If you are in New York, you can come to the campus and pick up your parts. If you have not picked up your parts by class you should come to Tata 351.
+
+If you are in New York, you can come to the campus and pick up your parts. If you have not picked up your parts by Thursday lab you should come to Tata 351.
+
 
 ### Set up your Lab 2
 
 1. [Pull changes from the Interactive Lab Hub](https://github.com/FAR-Lab/Developing-and-Designing-Interactive-Devices/blob/2021Fall/readings/Submitting%20Labs.md#to-pull-lab-updates) so that you have your own copy of Lab 2 on your own lab hub. (This may have to be done again at the start of lab on Thursday.)
-
+  
   If you are organizing your Lab Hub through folder in local machine, go to terminal, cd into your Interactive-Lab-Hub folder and run:
 
   ```
   Interactive-Lab-Hub $ git remote add upstream https://github.com/FAR-Lab/Interactive-Lab-Hub.git
-  Interactive-Lab-Hub $ git pull upstream Spring2021
+  Interactive-Lab-Hub $ git pull upstream Fall2022
+  ```
+
+  The reason why we are adding a upstream with **course lab-hub** instead of yours is because the local Interactive-Lab-Hub folder is linked with your own git repo already. Try typing ``git remote -v`` and you should see there is the origin branch with your own git repo. We here add the upstream to get latest updates from the teaching team by pulling the **course lab-hub** to your local machine. After your local folder got the latest updates, push them to your remote git repo by running:
+
+  ```
   Interactive-Lab-Hub $ git add .
-  Interactive-Lab-Hub $ git commit -m'merge'
+  Interactive-Lab-Hub $ git commit -m "message"
   Interactive-Lab-Hub $ git push
   ```
   Your local and remote should now be up to date with the most recent files.
@@ -73,7 +80,8 @@ pi@ixe00:~ $ source circuitpython/bin/activate
 ### Setup Personal Access Tokens on GitHub
 The support for password authentication of GitHub was removed on August 13, 2021. That is, in order to link and sync your own lab-hub repo with your Pi, you will have to set up a "Personal Access Tokens" to act as the password for your GitHub account on your Pi when using git command, such as `git clone` and `git push`.
 
-Following the steps listed [here](https://docs.github.com/en/github/authenticating-to-github/keeping-your-account-and-data-secure/creating-a-personal-access-token) from GitHub to set up one for your Pi to use. Depends on your preference, you can set up and select the scopes, or permissions, you'd like to grant the token your Pi is going to use. This token will act as your GitHub password later when you use the terminal on you Pi to sync files with your lab-hub repo.
+Following the steps listed [here](https://docs.github.com/en/github/authenticating-to-github/keeping-your-account-and-data-secure/creating-a-personal-access-token) from GitHub to set up a token. Depends on your preference, you can set up and select the scopes, or permissions, you would like to grant the token. This token will act as your GitHub password later when you use the terminal on your Pi to sync files with your lab-hub repo.
+
 
 ## Part B. 
 ### Try out the Command Line Clock
@@ -149,13 +157,21 @@ You can look in `image.py` for an example of how to display an image on the scre
 Work on `screen_clock.py`, try to show the time by filling in the while loop (at the bottom of the script where we noted "TODO" for you). You can use the code in `cli_clock.py` and `stats.py` to figure this out.
 
 ### How to Edit Scripts on Pi
-One of the ways for you to edit scripts on Pi through terminal is using [`nano`](https://linuxize.com/post/how-to-use-nano-text-editor/) command. You can go into the `screen_clock.py` by typing the follow command line:
+Option 1. One of the ways for you to edit scripts on Pi through terminal is using [`nano`](https://linuxize.com/post/how-to-use-nano-text-editor/) command. You can go into the `screen_clock.py` by typing the follow command line:
 ```
 (circuitpython) pi@ixe00:~/Interactive-Lab-Hub/Lab 2 $ nano screen_clock.py
 ```
 You can make changes to the script this way, remember to save the changes by pressing `ctrl-o` and press enter again. You can press `ctrl-x` to exit the nano mode. There are more options listed down in the terminal you can use in nano.
 
-Another way for you to edit scripts is to use VNC on your laptop to remotely connect your Pi. Try to open the files directly like what you will do with your laptop and edit them.
+Option 2. Another way for you to edit scripts is to use VNC on your laptop to remotely connect your Pi. Try to open the files directly like what you will do with your laptop and edit them. Since the default OS we have for you does not come up a python programmer, you will have to install one yourself otherwise you will have to edit the codes with text editor. [Thonny IDE](https://thonny.org/) is a good option for you to install, try run the following command lines in your Pi's ternimal:
+
+  ```
+  pi@ixe00:~ $ sudo apt install thonny
+  pi@ixe00:~ $ sudo apt update && sudo apt upgrade -y
+  ```
+
+Now you should be able to edit python scripts with Thonny on your Pi.
+
 
 
 ## Part E.
@@ -165,6 +181,9 @@ Does time have to be linear?  How do you measure a year? [In daylights? In midni
 
 Can you make time interactive? You can look in `screen_test.py` for examples for how to use the buttons.
 
+**We strongly discourage and will reject the results of literal digital or analog clock display.**
+
+
 \*\*\***A copy of your code should be in your Lab 2 Github repo.**\*\*\*
 
 After you edit and work on the scripts for Lab 2, the files should be upload back to your own GitHub repo! You can push to your personal github repo by adding the files here, commiting and pushing.
@@ -189,7 +208,8 @@ After that, Git will ask you to login to your GitHub account to push the updates
 
 # Prep for Part 2
 
-1. Pick up remaining parts for kit.
+1. Pick up remaining parts for kit on Thursday lab class. Check the updated [parts list inventory](partslist.md) and let the TA know if there is any part missing.
+
 
 2. Look at and give feedback on the Part G. for at least 2 other people in the class (and get 2 people to comment on your Part G!)
 

diff --git a/Lab 2/partslist.md b/Lab 2/partslist.md
@@ -1,2 +1,48 @@
 # Parts list inventory
 
+## Parts in the kit by Thursday class Sep. 16th
+
+1 x [Raspberry Pi 4 Computer Kit](https://www.amazon.com/Raspberry-USB-C-Adapters-Vilros-Quickstart/dp/B089ZSGF8M/ref=sr_1_14?dchild=1&keywords=vilros+pi+4+heatsink&qid=1630441198&sr=8-14)
+
+1 x [32GB MicroSD Cards w/ Card Reader](https://www.digikey.com/en/products/detail/seeed-technology-co-ltd/112990066/10290294)
+
+1 x [Raspberry Pi 4 Case](https://www.adafruit.com/product/4301)
+
+1 x [Raspberry Pi 4 Power Supply with USB C](https://www.adafruit.com/product/4298)
+
+1 x [Copper Foil Tape](https://www.amazon.com/Conductive-Shielding-Repellent-Electrical-Grounding/dp/B0741ZRP4W/ref=sr_1_5?dchild=1&keywords=conductive+copper+tape&qid=1628142003&sr=8-5)
+
+1 x [Alligator Clips](https://www.amazon.com/WGGE-WG-026-Pieces-Colors-Alligator/dp/B06ZXSCLDH/ref=sr_1_3?dchild=1&keywords=alligator%2Bclips&qid=1611164254&sr=8-3&th=1)
+
+1 x [Micro Servo Motor SG51](https://www.amazon.com/Smraza-Helicopter-Airplane-Control-Arduino/dp/B07L2SF3R4/ref=sr_1_3?dchild=1&keywords=micro+servo+motor&qid=1628142137&sr=8-3)
+
+1 x [Qwiic Servo Controller](https://www.sparkfun.com/products/16773)
+
+1 x [Adafruit Mini PiTFT](https://www.adafruit.com/product/4393)
+
+1 x [Adafruit APDS9960 Proximity, Light, RBG, Gesture Sensor](https://www.adafruit.com/product/3595)
+
+1 x [Adafruit I2C QT Rotery Encoder](https://www.adafruit.com/product/4991)
+
+1 x [Adafruit MPU-6050 6 DoF Accel & Gyro Sensor](https://www.adafruit.com/product/3886)
+
+1 x [Adafruit MPR121 Capacitive Touch Sensor QT](https://www.adafruit.com/product/4830)
+
+
+## Parts in the kit by Thursday class Sep. 22th
+
+1 x [SparkFun Qwiic Cable Kit](https://www.sparkfun.com/products/15081)
+
+1 x [SparkFun Qwiic Joystick](https://www.sparkfun.com/products/15168)
+
+1 x [SparkFun Qwiic OLED Display](https://www.sparkfun.com/products/17153)
+
+1 x [SparkFun Qwiic Button - Red LED](https://www.sparkfun.com/products/15932)
+
+1 x [SparkFun Qwiic Button - Green LED](https://www.sparkfun.com/products/16842)
+
+1 x [HD Webcam](https://www.amazon.com/Webcam-Speakers-2021-Microphone-Compatible/dp/B08QRGCW6K/ref=pd_lpo_147_t_0/134-8136290-7363941?_encoding=UTF8&pd_rd_i=B08QRGCW6K&pd_rd_r=a70c666b-ee4f-43c8-ae23-0be491319204&pd_rd_w=AEVHh&pd_rd_wg=iHZYM&pf_rd_p=fb1e266d-b690-4b4f-b71c-bd35e5395976&pf_rd_r=0CZ6ZZZ0XRRVRAGSGHDK&psc=1&refRID=0CZ6ZZZ0XRRVRAGSGHDK#customerReviews)
+
+
+## Missing Parts here
+\*\*\***List down parts you did not get from the kit here**\*\*\*