diff --git a/entries/catapult-2/test.typ b/entries/catapult-2/test.typ index 5a1e436..be54d9d 100644 --- a/entries/catapult-2/test.typ +++ b/entries/catapult-2/test.typ @@ -9,7 +9,7 @@ witnessed: "Makhi", ) -Today we redid the catapult test from our #past_nb_entry_reference(date: datetime(year: 2023, month: 10, day: 7), type: "test", title: "Catapult #1") #h(0.5em) to test the effectiveness of the improvements we recently made to the catapult. This test focuses on two aspects of the catapult that we identified in our #past_nb_entry_reference(date: datetime(year: 2023, month: 9, day: 16), type: "identify", title: "Outtake"), being _Scoring_ and _Multihandling_. +Today we redid the catapult test from our #nb_entry_reference(date: datetime(year: 2023, month: 10, day: 7), type: "test", title: "Catapult #1") #h(0.5em) to test the effectiveness of the improvements we recently made to the catapult. This test focuses on two aspects of the catapult that we identified in our #nb_entry_reference(date: datetime(year: 2023, month: 9, day: 16), type: "identify", title: "Outtake"), being _Scoring_ and _Multihandling_. = Triball Distance from Robot (Scoring) == Materials diff --git a/entries/drivetrain-2/brainstorm.typ b/entries/drivetrain-2/brainstorm.typ index 3219a12..fede846 100644 --- a/entries/drivetrain-2/brainstorm.typ +++ b/entries/drivetrain-2/brainstorm.typ @@ -19,7 +19,7 @@ ) ) -After the Capital Beltway Challenge tournament, we realized that it would be best if we started rebuilding our robot ASAP to get ready for the competition heavy January and February months. We will begin this process with the rebuilding of the drivetrain. The aspects, design goals, and design constraints of the drivetrain remain the same from when we identified them in our #past_nb_entry_reference(date: datetime(year: 2023, month: 7, day: 15), type: "identify"). However, for our second robot iteration, we decided to keep the tank drive configuration and hybrid wheel configuration, and instead debate what RPM to use and how to adjust the gear ratios based on that. +After the Capital Beltway Challenge tournament, we realized that it would be best if we started rebuilding our robot ASAP to get ready for the competition heavy January and February months. We will begin this process with the rebuilding of the drivetrain. The aspects, design goals, and design constraints of the drivetrain remain the same from when we identified them in our #nb_entry_reference(date: datetime(year: 2023, month: 7, day: 15), type: "identify"). However, for our second robot iteration, we decided to keep the tank drive configuration and hybrid wheel configuration, and instead debate what RPM to use and how to adjust the gear ratios based on that. #nb_pro_con( name: "600 RPM", diff --git a/entries/drivetrain-2/select.typ b/entries/drivetrain-2/select.typ index 8a10457..723c038 100644 --- a/entries/drivetrain-2/select.typ +++ b/entries/drivetrain-2/select.typ @@ -9,7 +9,7 @@ witnessed: "Makhi", ) -After brainstorming the different RPM drivetrains, we needed to select one to build. We collectively determined that the criteria used to select this drivetrain should be the same as the criteria we used to evaluate the wheel configurations in our #past_nb_entry_reference(date: datetime(year: 2023, month: 7, day: 22), type: "select", title: "Drivetrain #1"), minus the "Omni-Directionality" criteria. +After brainstorming the different RPM drivetrains, we needed to select one to build. We collectively determined that the criteria used to select this drivetrain should be the same as the criteria we used to evaluate the wheel configurations in our #nb_entry_reference(date: datetime(year: 2023, month: 7, day: 22), type: "select", title: "Drivetrain #1"), minus the "Omni-Directionality" criteria. #nb_matrix_criteria[ - Speed - The maximum speed of the drivetrain configuration. diff --git a/entries/entries.typ b/entries/entries.typ index 236e112..4e9aca9 100644 --- a/entries/entries.typ +++ b/entries/entries.typ @@ -1,4 +1,3 @@ -/* // April #include "./pre-season/identify-pre-reveal-reflection.typ" #include "./pre-season/identify-reveal-video-thoughts.typ" @@ -58,7 +57,6 @@ #include "./intake-1/program.typ" #include "./intake-1/test.typ" #include "./competition/dulaney-royal-rumble.typ" -*/ #include "./catapult-2/build-1.typ" #include "./wedges-1/build.typ" #include "./catapult-2/build-2.typ" diff --git a/entries/flywheel-1/identify.typ b/entries/flywheel-1/identify.typ index ca38bc4..2c68138 100644 --- a/entries/flywheel-1/identify.typ +++ b/entries/flywheel-1/identify.typ @@ -29,7 +29,7 @@ The flywheel is an different outtake from the catapult. Instead of needing to wind the catapult arm, the flywheel doesn't need to reload and instead is constantly spin. This allow us to simply drop triballs on the flywheel instead of waiting for the catapult to go down when match loading. - The purposes, design goals, and design constraints remain the same as those that we identified in our #past_nb_entry_reference( title: "Outtake", type: "identify", date: datetime(year: 2023, month: 9, day: 16)). + The purposes, design goals, and design constraints remain the same as those that we identified in our #nb_entry_reference( title: "Outtake", type: "identify", date: datetime(year: 2023, month: 9, day: 16)). ], box(height: 35%)[#image("/assets/identify/identify-flywheel.excalidraw.svg")] ) diff --git a/entries/flywheel-1/test.typ b/entries/flywheel-1/test.typ index d674953..2ad1333 100644 --- a/entries/flywheel-1/test.typ +++ b/entries/flywheel-1/test.typ @@ -19,7 +19,7 @@ ) ) -To ensure that our flywheel was ready for the Capital Beltway Challenge tournament tomorrow, we tested the flywheel on the _Game Element Acquisition_ and _Handling_ "Purposes of an Outtake" that we identified in our #past_nb_entry_reference(date: datetime(year: 2023, month: 9, day: 16), type: "identify"), along with testing the speed of the flywheel. +To ensure that our flywheel was ready for the Capital Beltway Challenge tournament tomorrow, we tested the flywheel on the _Game Element Acquisition_ and _Handling_ "Purposes of an Outtake" that we identified in our #nb_entry_reference(date: datetime(year: 2023, month: 9, day: 16), type: "identify"), along with testing the speed of the flywheel. = Speed and Acceleration Test == Objective diff --git a/entries/intake-1/test.typ b/entries/intake-1/test.typ index 8ac1bb1..b5b701d 100644 --- a/entries/intake-1/test.typ +++ b/entries/intake-1/test.typ @@ -9,7 +9,7 @@ witnessed: "Ajibola", ) -To ensure that our intake was functioning that the level that we wanted, we tested the catapult on two of the "Purposes of an Outtake" that we identified in our #past_nb_entry_reference(date: datetime(year: 2023, month: 9, day: 16), type: "identify"). The two that we chose to test are "Game Element Acquisition" and "Handling." +To ensure that our intake was functioning that the level that we wanted, we tested the catapult on two of the "Purposes of an Outtake" that we identified in our #nb_entry_reference(date: datetime(year: 2023, month: 9, day: 16), type: "identify"). The two that we chose to test are "Game Element Acquisition" and "Handling." = Intake Reliability Test (Game Element Acquisition) diff --git a/entries/wings-1/build-2.typ b/entries/wings-1/build-2.typ index cb4ac52..9b4cb6e 100644 --- a/entries/wings-1/build-2.typ +++ b/entries/wings-1/build-2.typ @@ -33,7 +33,7 @@ ) ], [ - Today we attempted to tackle the problem with the wings not fully extending when deployed. This seems to be linked with the result that we obtained from our test of the wings in our #past_nb_entry_reference(date: datetime(year: 2023, month: 10, day: 13),type: "test", title: "Wings #1"). In the air loss test, we found that the wings lost about 18 PSI per deployment. This, combined with the wings not fully extended, creates a major concern regarding the functionality and air efficiency of the wings. It became apparent that the piston was not delivering the required torque to properly extend the wings as intended. + Today we attempted to tackle the problem with the wings not fully extending when deployed. This seems to be linked with the result that we obtained from our test of the wings in our #nb_entry_reference(date: datetime(year: 2023, month: 10, day: 13),type: "test", title: "Wings #1"). In the air loss test, we found that the wings lost about 18 PSI per deployment. This, combined with the wings not fully extended, creates a major concern regarding the functionality and air efficiency of the wings. It became apparent that the piston was not delivering the required torque to properly extend the wings as intended. == Build Steps - #text(red)[Problem:] The mechanical advantage of the robot is small. We noticed that because the piston is attached right next to the pivot, more force is required to fully extend the wings compared if the piston was further. diff --git a/entries/wings-1/test-2.typ b/entries/wings-1/test-2.typ index c02d2fb..921874d 100644 --- a/entries/wings-1/test-2.typ +++ b/entries/wings-1/test-2.typ @@ -9,7 +9,7 @@ witnessed: "Ishika", ) -Today we redid the wings test from our #past_nb_entry_reference(date: datetime(year: 2023, month: 10, day: 13), type: "test", title: "Wings #1") #h(0.5em) to test the effectiveness of the improvements we made in our #nb_entry_reference(date: datetime(year: 2023, month: 11, day: 18), type: "build", title: "Wings #1"). +Today we redid the wings test from our #nb_entry_reference(date: datetime(year: 2023, month: 10, day: 13), type: "test", title: "Wings #1") #h(0.5em) to test the effectiveness of the improvements we made in our #nb_entry_reference(date: datetime(year: 2023, month: 11, day: 18), type: "build", title: "Wings #1"). We tested the air loss of the wings as they are continuously deployed to ensure that our wings are usable throughout the round. = Air Loss diff --git a/main.typ b/main.typ index 16de057..75c26cb 100644 --- a/main.typ +++ b/main.typ @@ -7,7 +7,7 @@ #show: notebook.with( team: "53D", organization: "Area 53", - count: (current: 2, total: 2), + count: (current: 1, total: 1), cover: circle(align(center + horizon)[#image("/assets/logos/logo.svg", width: 110%)], fill: black), year: "2023 - 2024", season: "Over Under", diff --git a/template/globals.typ b/template/globals.typ index fc4b548..8ab336a 100644 --- a/template/globals.typ +++ b/template/globals.typ @@ -15,7 +15,7 @@ #let appendix_entry_counter = counter("appendix_entry_counter") -#let page-number-offset = 133 +#let page-number-offset = 0 //133 /* 0 = Metadata diff --git a/template/toc.typ b/template/toc.typ index 288df25..8286ff4 100644 --- a/template/toc.typ +++ b/template/toc.typ @@ -71,7 +71,54 @@ #let headings = query(selector(), loc) - #for (index, entry) in entries.final(loc).enumerate().slice(36) { + #for (index, entry) in entries.final(loc).enumerate().slice(36, 36 * 2) { + let page_number = counter(page).at(headings.at(index).location()).at(0) + // let page_number = entry_page_counter.at(headings.at(index).location()).at(0) + 1 + let start_date = entry.start_date.display("[year]/[month]/[day]") + let end_date = if (not entry.start_date == entry.end_date) { entry.end_date.display("[year]/[month]/[day]") } else { none } + + let info = type_metadata.at(entry.type) + + let frontmatter_count = frontmatter_page_counter.final(loc).at(0) + + [ + #box(baseline: 15%, nb_icon(label: entry.type, size: 1em)) + #h(5pt) + #box(fill: info.color.lighten(30%), radius: 1pt, height: 1em, baseline: 15%)[ + #align(center + horizon)[ + #link((page: {frontmatter_count + page_number + 2}, x: 0pt, y: 0pt))[ + #text(fill: black)[ + _#h(2pt) #start_date #sym.dash.em #info.name: #entry.title #h(2pt)_ + ] + ] + ] + ]#h(5pt) + #box(width: 1fr, line(length: 100%, stroke: (dash: "dotted"))) + #page_number \ + ] + } + ] + parbreak() + } + } + ) + ] + + page( + margin: (left: 5em, right: 5em, /*bottom: 4em*/), + background: nb_side_margin_color(color: gray), + header: nb_title[Table of Contents], + footer: nb_frontmatter_footer(), + )[ + + #locate( + loc => { + if entries.final(loc).len() > 36 { + box[ + + #let headings = query(selector(), loc) + + #for (index, entry) in entries.final(loc).enumerate().slice(36 * 2) { let page_number = counter(page).at(headings.at(index).location()).at(0) // let page_number = entry_page_counter.at(headings.at(index).location()).at(0) + 1 let start_date = entry.start_date.display("[year]/[month]/[day]")