Merge branch 'devel' of github.com:MikaylaFischler/cc-mek-scada into …

…devel
MikaylaFischler · Sep 12, 2024 · fb56634 · fb56634
2 parents 48fa715 + 753f062
commit fb56634
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pocket/startup.lua b/pocket/startup.lua
@@ -20,7 +20,7 @@ local pocket    = require("pocket.pocket")
 local renderer  = require("pocket.renderer")
 local threads   = require("pocket.threads")
 
-local POCKET_VERSION = "v0.12.0-alpha"
+local POCKET_VERSION = "v0.12.1-alpha"
 
 local println = util.println
 local println_ts = util.println_ts

diff --git a/pocket/ui/docs.lua b/pocket/ui/docs.lua
@@ -254,7 +254,7 @@ doc("G_DBG", "DBG", "Debug. Abbreviation for the debugging sessions from pocket
 doc("G_FP", "FP", "Front Panel. See Terminology.")
 doc("G_Hi", "Hi", "High.")
 doc("G_Lo", "Lo", "Low.")
-doc("G_PID", "PID", "A Proportional Integral Derivitave closed-loop controller.")
+doc("G_PID", "PID", "A Proportional Integral Derivative closed-loop controller.")
 doc("G_PKT", "PKT", "Pocket. Abbreviation for the pocket computer.")
 doc("G_PLC", "PLC", "Programmable Logic Controller. A device that not only reports data and controls outputs, but can also make decisions on its own.")
 doc("G_PPM", "PPM", "Protected Peripheral Manager. This is an abstraction layer created for this project that prevents peripheral calls from crashing applications.")