Skip to content

Commit

Permalink
Merge branch 'main' into modsAuth
Browse files Browse the repository at this point in the history
  • Loading branch information
lbondaryk authored Sep 11, 2024
2 parents 5595f1b + cdd6e82 commit 3ccf01e
Show file tree
Hide file tree
Showing 1,126 changed files with 57,513 additions and 21,153 deletions.
55 changes: 52 additions & 3 deletions curriculum/brain/content.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
"n": "Learning Journals"
}
},
"annotations": "all",
"toolbar": [
{
"id": "select",
Expand Down Expand Up @@ -284,7 +285,48 @@
}
]
},
"stamps": []
"stamps": [
{
"url": "brain/stamps/cell_schematic.png",
"width": 22,
"height": 20
},
{
"url": "brain/stamps/switch_schematic.png",
"width": 36,
"height": 15
},
{
"url": "brain/stamps/resistor_schematic.png",
"width": 33,
"height": 17
},
{
"url": "brain/stamps/varresistor_schematic.png",
"width": 31,
"height": 21
},
{
"url": "brain/stamps/varresistor_wiper.png",
"width": 50,
"height": 31
},
{
"url": "brain/stamps/lamp_schematic.png",
"width": 39,
"height": 24
},
{
"url": "brain/stamps/bulb_art_on.png",
"width": 23,
"height": 35
},
{
"url": "brain/stamps/bulb_art.png",
"width": 26,
"height": 35
}
]
},
"sections": {
"intro": {
Expand Down Expand Up @@ -479,6 +521,13 @@
"description": "Investigation 3",
"ordinal": 3,
"title": "Module 3: Microcontrollers",
"config": {
"settings": {
"simulator": {
"defaultSimulation": "potentiometer_chip_servo"
}
}
},
"problems": [
{
"description": "Lesson 3.1",
Expand Down Expand Up @@ -507,7 +556,7 @@
{
"description": "Lesson 3.3",
"ordinal": 3,
"title": "Lesson 3.3 - From Electricity to Data",
"title": "Lesson 3.3 - Turn Analog Changes into Program State",
"subtitle": "",
"disabled": [],
"sections": [
Expand All @@ -519,7 +568,7 @@
{
"description": "Lesson 3.4",
"ordinal": 4,
"title": "Lesson 3.4 - From Data to Motion",
"title": "Lesson 3.4 - Create Mechanical Output",
"subtitle": "",
"disabled": [],
"sections": [
Expand Down
Binary file added curriculum/brain/images/5v_to_both_diagram.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added curriculum/brain/images/adc_concept.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added curriculum/brain/images/adc_concept_2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added curriculum/brain/images/arduino_powers_led.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added curriculum/brain/images/assembly_photo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added curriculum/brain/images/breadboard 2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added curriculum/brain/images/breadboard_viz.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added curriculum/brain/images/gnd_5v_viz.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added curriculum/brain/images/jump_valley.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added curriculum/brain/images/jumpers.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added curriculum/brain/images/potentiometer_diagram.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added curriculum/brain/images/resistor.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added curriculum/brain/images/voltage_to_a1.jpg
Loading

0 comments on commit 3ccf01e

Please sign in to comment.