+
Zhentao Wei's CV {getFormattedDate()}
-
-
+
+
@@ -120,12 +120,6 @@
}
}
- @media print {
- .hide-on-print {
- display: none;
- }
-}
-
.cv-container-container{
width: 100%;
height: 100%;
@@ -149,11 +143,6 @@
padding: auto;
}
- .include-in-print { &, & * {
- -webkit-print-color-adjust:exact !important;
- print-color-adjust:exact !important;
- }}
-
.sections {
// Shared between sections
> div {
diff --git a/src/routes/zhen/notes/physics/1/+page.svelte b/src/routes/zhen/notes/physics/1/+page.svelte
new file mode 100644
index 0000000..58c1a8d
--- /dev/null
+++ b/src/routes/zhen/notes/physics/1/+page.svelte
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
Games
diff --git a/src/routes/tools/+page.svelte b/src/routes/tools/+page.svelte new file mode 100644 index 0000000..f4b3bb0 --- /dev/null +++ b/src/routes/tools/+page.svelte @@ -0,0 +1,53 @@ + + +
+
+
+
diff --git a/src/routes/tools/battery-life-calculator/+page.svelte b/src/routes/tools/battery-life-calculator/+page.svelte
new file mode 100644
index 0000000..7037823
--- /dev/null
+++ b/src/routes/tools/battery-life-calculator/+page.svelte
@@ -0,0 +1,183 @@
+
+
+
+
+ Tools
+ These are the tools collected from different places of the + internet + + + + +
+
+
+ MPUs/SoCs
+ Whatever acronym you want lol +
+
+
+ I if you have tool suggestions, then either create an issue, create a pull request, or send an email. I probably wont add it though, since this is free work lol.
+
+
+
+
+
+
+
diff --git a/src/routes/tools/battery-life-calculator/pageSrc/BatteryCalc.js b/src/routes/tools/battery-life-calculator/pageSrc/BatteryCalc.js
new file mode 100644
index 0000000..2913ab7
--- /dev/null
+++ b/src/routes/tools/battery-life-calculator/pageSrc/BatteryCalc.js
@@ -0,0 +1,108 @@
+export class BatteryLifeCalculator {
+ constructor(
+ timeRunSeconds,
+ timeSleepSeconds,
+ consumptionActiveMilliAmpHours,
+ consumptionSleepMilliAmpHours,
+ powerBatteryTotalMilliAmpHours,
+ powerBatteryBufferBeforeEmptyPercent = 20) {
+ this.timeRunSeconds = timeRunSeconds
+ this.timeSleepSeconds = timeSleepSeconds
+ this.consumptionActiveMilliAmpHours = consumptionActiveMilliAmpHours
+ this.consumptionSleepMilliAmpHours = consumptionSleepMilliAmpHours
+ this.powerBatteryTotalMilliAmpHours = powerBatteryTotalMilliAmpHours
+ this.powerBatteryBufferBeforeEmptyPercent = powerBatteryBufferBeforeEmptyPercent
+
+ console.log("The source of this battery calc is here: https://github.com/simonneutert/batterylife-calculator\nI was too lazy to make the math myself.");
+ }
+
+ // public API
+
+ milliAmpToMicroAmp(milliAmps) {
+ return milliAmps * 1000
+ }
+
+ microAmpToMilliAmp(milliAmps) {
+ return milliAmps * 0.001
+ }
+
+ calculate() {
+ return {
+ powerAveragePerHour: this.powerEstimatedHourly(),
+ runtimeHoursEstimated: this.runtimeHoursEstimated(),
+ runtimeDaysEstimated: this.runtimeDaysEstimated(),
+ runtimeDaysRemainingHoursEstimated: this.runtimeDaysRemainingHoursEstimated()
+ }
+ }
+
+ powerEstimatedHourly() {
+ return this.calcPowerEst(
+ this.powerRun(),
+ this.consumptionActiveMilliAmpHours,
+ this.powerSleep(),
+ this.consumptionSleepMilliAmpHours
+ )
+ }
+
+ runtimeHoursEstimated() {
+ return parseInt(this.powerLipo() / this.powerEstimatedHourly())
+ }
+
+ runtimeDaysEstimated() {
+ return parseInt(this.runtimeHoursEstimated() / 24)
+ }
+
+ runtimeDaysRemainingHoursEstimated() {
+ return parseInt(this.runtimeHoursEstimated() % 24)
+ }
+
+ // private
+
+ roundOff(x) {
+ return Math.round(x * 100.0) / 100.0
+ }
+
+ calcPowerLipo(x, y) {
+ return parseFloat((x * (100 - y)) / 100)
+ }
+
+ calcRuns(x, y) {
+ return parseFloat(60 / (x + y))
+ }
+
+ calcRunsHour(x, y) {
+ return parseFloat(3600 / (x + y))
+ }
+
+ calcPowerRun(x, y) {
+ return parseFloat((x / (x + y)) * 3600)
+ }
+
+ calcPowerSleep(x, y) {
+ return parseFloat((y / (x + y)) * 3600)
+ }
+
+ powerLipo() {
+ return this.calcPowerLipo(this.powerBatteryTotalMilliAmpHours, this.powerBatteryBufferBeforeEmptyPercent)
+ }
+
+ runs() {
+ return this.calcRuns(this.timeRunSeconds, this.timeSleepSeconds)
+ }
+
+ runsHour() {
+ return this.calcRunsHour(this.timeRunSeconds, this.timeSleepSeconds)
+ }
+
+ powerRun() {
+ return this.calcPowerRun(this.timeRunSeconds, this.timeSleepSeconds)
+ }
+
+ powerSleep() {
+ return this.calcPowerSleep(this.timeRunSeconds, this.timeSleepSeconds)
+ }
+
+ calcPowerEst(a, b, c, d) {
+ return parseFloat((a / 3600) * b + (c / 3600) * d)
+ }
+}
diff --git a/src/routes/tools/battery-life-calculator/pageSrc/MCU_defs.ts b/src/routes/tools/battery-life-calculator/pageSrc/MCU_defs.ts
new file mode 100644
index 0000000..d4372f2
--- /dev/null
+++ b/src/routes/tools/battery-life-calculator/pageSrc/MCU_defs.ts
@@ -0,0 +1,63 @@
+export interface MCU_Type {
+ name: string;
+ cpu: { [key: string]: Number }; // state: power consumption
+ sleep: { [key: string]: Number };
+ wifi?: { [key: string]: Number };
+ bluetooth?: { [key: string]: Number };
+}
+
+const MCUs: MCU_Type[] = [
+ {
+ name: "esp32-s3",
+ cpu: { // mili amps
+ single_core_40MHz: 21.8,
+ dual_core_40MHz: 24.4,
+ single_core_80MHz: 42.6,
+ dual_core_80MHz: 47.3,
+ single_core_160MHz: 54.6,
+ dual_core_160MHz: 54.1,
+ single_core_240MHz: 65.9,
+ dual_core_240MHz: 81.3,
+ },
+ sleep: {
+
+ },
+ wifi: { //
+ dBm_21: 318.2,
+ sleep: 10
+ },
+ bluetooth: {
+ active: 100,
+ sleep: 5
+ }
+ },
+
+ {
+ name: "esp32-c3",
+ cpu: {
+ single_core_80MHz: 22,
+ single_core_160MHz: 54.6,
+ },
+ sleep: {
+
+ },
+ wifi: {
+ active: 110,
+ sleep: 9
+ },
+ bluetooth: {
+ active: 90,
+ sleep: 4
+ }
+ }
+];
+
+export function getMCU(name: string): MCU_Type | undefined{
+ for (let i = 0; i < MCUs.length; i++) {
+ const element = MCUs[i];
+ if (element.name == name)
+ return element
+ }
+
+ return undefined;
+}
\ No newline at end of file
diff --git a/src/routes/tools/comps/ToolButton.svelte b/src/routes/tools/comps/ToolButton.svelte
new file mode 100644
index 0000000..967b4b2
--- /dev/null
+++ b/src/routes/tools/comps/ToolButton.svelte
@@ -0,0 +1,27 @@
+
+
+
+
+ Battery life calculator
+ + Calculates the time a battery will last. Too lazy to explain + more. + + + + + +
+
+
+ Software
+
+
+
+ Duration of code execution
+
+
+
+
+
+ sec
+
+
+ sleep time
+
+
+
+
+
+
+ sec
+
+
+
+
+ {#if !useCustom}
+ Hardware
+
+
+
+ Use custom values
+
+
+
+
+
+ {#if selectedMcu != undefined && selectedMcu?.wifi != undefined}
+
+ {:else}
+ + wifi +
+ {/if} + {#if selectedMcu != undefined && selectedMcu?.wifi != undefined} ++ ble +
+ {/if} +
+ Duration of code execution
+
+
+
+
+
+ sec
+
+
+ sleep time
+
+ {/if}
+
+
+
+
+ sec
+
+
+ Source for the calculations is at this
+ github
+ and the
+ original website.
+ I just mearly made additions.
+
+
+
+
\ No newline at end of file
diff --git a/src/routes/zhen/cv/rev2/+page.svelte b/src/routes/zhen/cv/rev2/+page.svelte
index 5b59441..55fe6c0 100644
--- a/src/routes/zhen/cv/rev2/+page.svelte
+++ b/src/routes/zhen/cv/rev2/+page.svelte
@@ -49,8 +49,8 @@
+
diff --git a/src/routes/zhen/notes/physics/sharedComps/A4.svelte b/src/routes/zhen/notes/physics/sharedComps/A4.svelte
new file mode 100644
index 0000000..f7ab836
--- /dev/null
+++ b/src/routes/zhen/notes/physics/sharedComps/A4.svelte
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+ {#each { length: 3 } as _, i}
+
+
+
+
+
+
+
+
+ | Symbol | +Description | +
|---|---|
| $v_i$ | +Initial velo | +
| $v_f$ | +Final velo | +
| $a$ | +Accel | +
| $\Delta x$ | +The amount of change. | +
| $t$ | +You're on your own on this one | +
test {i}
+ {/each}
+
+
\ No newline at end of file
diff --git a/src/routes/zhen/notes/physics/sharedComps/Math.svelte b/src/routes/zhen/notes/physics/sharedComps/Math.svelte
new file mode 100644
index 0000000..e69de29
diff --git a/static/stylesheets/global.css b/static/stylesheets/global.css
index 5cd3a51..4ac99e5 100644
--- a/static/stylesheets/global.css
+++ b/static/stylesheets/global.css
@@ -17,6 +17,17 @@
font-family: "CozetteVector";
}
+@media print {
+ .hide-on-print {
+ display: none;
+ }
+}
+
+.include-in-print { &, & * {
+ -webkit-print-color-adjust:exact !important;
+ print-color-adjust:exact !important;
+}}
+
html {
background: var(--background1);
}
+
+
+
+
+ {#if bottomBorder}
+
+ {/if}
+