From 7e1216ed8c4d7becd651d84394fc7e509cb8c201 Mon Sep 17 00:00:00 2001
From: hhvrc <github@heavenvr.tech>
Date: Mon, 18 Nov 2024 02:16:09 +0100
Subject: [PATCH] Renamed "device" to "hub"

---
 .../WifiNetworkEventHandler.ts                | 16 ++++-----
 frontend/src/lib/MessageHandlers/index.ts     | 16 ++++-----
 .../src/lib/components/GpioPinSelector.svelte | 17 +++++++--
 frontend/src/lib/components/WiFiList.svelte   | 22 ++++++++----
 .../lib/components/modals/WiFiDetails.svelte  | 23 ++++++++----
 .../{DeviceStateStore.ts => HubStateStore.ts} |  8 ++---
 frontend/src/lib/stores/index.ts              |  2 +-
 .../lib/types/{DeviceState.ts => HubState.ts} |  2 +-
 frontend/src/lib/types/index.ts               |  2 +-
 frontend/src/routes/+page.svelte              | 29 ++++++++++++---
 include/http/JsonAPI.h                        | 14 ++++----
 include/serialization/JsonAPI.h               |  8 ++---
 include/wifi/WiFiManager.h                    | 14 ++++----
 src/GatewayClient.cpp                         |  2 +-
 src/GatewayConnectionManager.cpp              | 14 ++++----
 src/http/JsonAPI.cpp                          | 21 ++++++-----
 src/serial/command_handlers/factoryreset.cpp  |  8 +++--
 src/serialization/JsonAPI.cpp                 | 36 +++++++++++--------
 18 files changed, 157 insertions(+), 97 deletions(-)
 rename frontend/src/lib/stores/{DeviceStateStore.ts => HubStateStore.ts} (94%)
 rename frontend/src/lib/types/{DeviceState.ts => HubState.ts} (94%)

diff --git a/frontend/src/lib/MessageHandlers/WifiNetworkEventHandler.ts b/frontend/src/lib/MessageHandlers/WifiNetworkEventHandler.ts
index 9b5268c5..bd918226 100644
--- a/frontend/src/lib/MessageHandlers/WifiNetworkEventHandler.ts
+++ b/frontend/src/lib/MessageHandlers/WifiNetworkEventHandler.ts
@@ -1,7 +1,7 @@
 import { WifiNetworkEvent } from '$lib/_fbs/open-shock/serialization/local/wifi-network-event';
 import { WifiNetwork as FbsWifiNetwork } from '$lib/_fbs/open-shock/serialization/types/wifi-network';
 import { WifiNetworkEventType } from '$lib/_fbs/open-shock/serialization/types/wifi-network-event-type';
-import { DeviceStateStore } from '$lib/stores';
+import { HubStateStore } from '$lib/stores';
 import { toastDelegator } from '$lib/stores/ToastDelegator';
 import type { WiFiNetwork } from '$lib/types/WiFiNetwork';
 import type { MessageHandler } from '.';
@@ -27,7 +27,7 @@ function handleDiscoveredEvent(fbsNetwork: FbsWifiNetwork) {
     saved: fbsNetwork.saved(),
   };
 
-  DeviceStateStore.setWifiNetwork(network);
+  HubStateStore.setWifiNetwork(network);
 }
 function handleUpdatedEvent(fbsNetwork: FbsWifiNetwork) {
   const ssid = fbsNetwork.ssid();
@@ -47,7 +47,7 @@ function handleUpdatedEvent(fbsNetwork: FbsWifiNetwork) {
     saved: fbsNetwork.saved(),
   };
 
-  DeviceStateStore.setWifiNetwork(network);
+  HubStateStore.setWifiNetwork(network);
 }
 function handleLostEvent(fbsNetwork: FbsWifiNetwork) {
   const bssid = fbsNetwork.bssid();
@@ -57,7 +57,7 @@ function handleLostEvent(fbsNetwork: FbsWifiNetwork) {
     return;
   }
 
-  DeviceStateStore.removeWifiNetwork(bssid);
+  HubStateStore.removeWifiNetwork(bssid);
 }
 function handleSavedEvent(fbsNetwork: FbsWifiNetwork) {
   const ssid = fbsNetwork.ssid();
@@ -68,7 +68,7 @@ function handleSavedEvent(fbsNetwork: FbsWifiNetwork) {
     return;
   }
 
-  DeviceStateStore.updateWifiNetwork(bssid, (network) => {
+  HubStateStore.updateWifiNetwork(bssid, (network) => {
     network.saved = true;
     return network;
   });
@@ -87,7 +87,7 @@ function handleRemovedEvent(fbsNetwork: FbsWifiNetwork) {
     return;
   }
 
-  DeviceStateStore.updateWifiNetwork(bssid, (network) => {
+  HubStateStore.updateWifiNetwork(bssid, (network) => {
     network.saved = false;
     return network;
   });
@@ -106,7 +106,7 @@ function handleConnectedEvent(fbsNetwork: FbsWifiNetwork) {
     return;
   }
 
-  DeviceStateStore.setWifiConnectedBSSID(bssid);
+  HubStateStore.setWifiConnectedBSSID(bssid);
 
   toastDelegator.trigger({
     message: 'WiFi network connected: ' + ssid,
@@ -122,7 +122,7 @@ function handleDisconnectedEvent(fbsNetwork: FbsWifiNetwork) {
     return;
   }
 
-  DeviceStateStore.setWifiConnectedBSSID(null);
+  HubStateStore.setWifiConnectedBSSID(null);
 
   toastDelegator.trigger({
     message: 'WiFi network disconnected: ' + ssid,
diff --git a/frontend/src/lib/MessageHandlers/index.ts b/frontend/src/lib/MessageHandlers/index.ts
index 808c54b8..ecb19354 100644
--- a/frontend/src/lib/MessageHandlers/index.ts
+++ b/frontend/src/lib/MessageHandlers/index.ts
@@ -4,7 +4,7 @@ import { HubToLocalMessagePayload } from '$lib/_fbs/open-shock/serialization/loc
 import { ReadyMessage } from '$lib/_fbs/open-shock/serialization/local/ready-message';
 import { WifiScanStatusMessage } from '$lib/_fbs/open-shock/serialization/local/wifi-scan-status-message';
 import { ByteBuffer } from 'flatbuffers';
-import { DeviceStateStore } from '$lib/stores';
+import { HubStateStore } from '$lib/stores';
 import { SerializeWifiScanCommand } from '$lib/Serializers/WifiScanCommand';
 import { toastDelegator } from '$lib/stores/ToastDelegator';
 import { SetRfTxPinCommandResult } from '$lib/_fbs/open-shock/serialization/local/set-rf-tx-pin-command-result';
@@ -33,9 +33,9 @@ PayloadHandlers[HubToLocalMessagePayload.ReadyMessage] = (cli, msg) => {
   const payload = new ReadyMessage();
   msg.payload(payload);
 
-  console.log('[WS] Connected to device, poggies: ', payload.poggies());
+  console.log('[WS] Connected to hub, poggies: ', payload.poggies());
 
-  DeviceStateStore.update((store) => {
+  HubStateStore.update((store) => {
     store.wifiConnectedBSSID = payload.connectedWifi()?.bssid() || null;
     store.accountLinked = payload.accountLinked();
     store.config = mapConfig(payload.config());
@@ -50,7 +50,7 @@ PayloadHandlers[HubToLocalMessagePayload.ReadyMessage] = (cli, msg) => {
       store.gpioValidOutputs = gpioValidOutputs;
     }
 
-    console.log('[WS] Updated device state store: ', store);
+    console.log('[WS] Updated hub state store: ', store);
 
     return store;
   });
@@ -80,7 +80,7 @@ PayloadHandlers[HubToLocalMessagePayload.WifiScanStatusMessage] = (cli, msg) =>
   const payload = new WifiScanStatusMessage();
   msg.payload(payload);
 
-  DeviceStateStore.setWifiScanStatus(payload.status());
+  HubStateStore.setWifiScanStatus(payload.status());
 };
 
 PayloadHandlers[HubToLocalMessagePayload.WifiNetworkEvent] = WifiNetworkEventHandler;
@@ -135,7 +135,7 @@ PayloadHandlers[HubToLocalMessagePayload.SetRfTxPinCommandResult] = (cli, msg) =
   const result = payload.result();
 
   if (result == SetGPIOResultCode.Success) {
-    DeviceStateStore.setRfTxPin(payload.pin());
+    HubStateStore.setRfTxPin(payload.pin());
     toastDelegator.trigger({
       message: 'Changed RF TX pin to: ' + payload.pin(),
       background: 'bg-green-500',
@@ -168,7 +168,7 @@ PayloadHandlers[HubToLocalMessagePayload.SetEstopEnabledCommandResult] = (cli, m
   const success = payload.success();
 
   if (success) {
-    DeviceStateStore.setEstopEnabled(payload.enabled());
+    HubStateStore.setEstopEnabled(payload.enabled());
     toastDelegator.trigger({
       message: 'Changed EStop enabled to: ' + enabled,
       background: 'bg-green-500',
@@ -189,7 +189,7 @@ PayloadHandlers[HubToLocalMessagePayload.SetEstopPinCommandResult] = (cli, msg)
 
   if (result == SetGPIOResultCode.Success) {
     const gpioPin = payload.gpioPin();
-    DeviceStateStore.setEstopGpioPin(gpioPin);
+    HubStateStore.setEstopGpioPin(gpioPin);
     toastDelegator.trigger({
       message: 'Changed EStop pin to: ' + gpioPin,
       background: 'bg-green-500',
diff --git a/frontend/src/lib/components/GpioPinSelector.svelte b/frontend/src/lib/components/GpioPinSelector.svelte
index 6c5d1766..e7256b3c 100644
--- a/frontend/src/lib/components/GpioPinSelector.svelte
+++ b/frontend/src/lib/components/GpioPinSelector.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { DeviceStateStore } from '$lib/stores';
+  import { HubStateStore } from '$lib/stores';
   import { UsedPinsStore } from '$lib/stores/UsedPinsStore';
   import { WebSocketClient } from '$lib/WebSocketClient';
 
@@ -10,7 +10,13 @@
   let pendingPin: number | null = null;
   let statusText: string = 'Loading...';
 
-  $: canSet = pendingPin !== null && pendingPin !== currentPin && pendingPin >= 0 && pendingPin <= 255 && $DeviceStateStore.gpioValidOutputs.includes(pendingPin) && !$UsedPinsStore.has(pendingPin);
+  $: canSet =
+    pendingPin !== null &&
+    pendingPin !== currentPin &&
+    pendingPin >= 0 &&
+    pendingPin <= 255 &&
+    $HubStateStore.gpioValidOutputs.includes(pendingPin) &&
+    !$UsedPinsStore.has(pendingPin);
 
   $: if (currentPin !== null) {
     UsedPinsStore.markPinUsed(currentPin, name);
@@ -40,7 +46,12 @@
     <span class="text-sm text-gray-500">{statusText}</span>
   </div>
   <div class="flex space-x-2">
-    <input class="input variant-form-material" type="number" placeholder="GPIO Pin" bind:value={pendingPin} />
+    <input
+      class="input variant-form-material"
+      type="number"
+      placeholder="GPIO Pin"
+      bind:value={pendingPin}
+    />
     <button class="btn variant-filled" on:click={setGpioPin} disabled={!canSet}>Set</button>
   </div>
 </div>
diff --git a/frontend/src/lib/components/WiFiList.svelte b/frontend/src/lib/components/WiFiList.svelte
index 0a625955..3061a014 100644
--- a/frontend/src/lib/components/WiFiList.svelte
+++ b/frontend/src/lib/components/WiFiList.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { getModalStore } from '@skeletonlabs/skeleton';
-  import { DeviceStateStore } from '$lib/stores';
+  import { HubStateStore } from '$lib/stores';
   import { WebSocketClient } from '$lib/WebSocketClient';
   import { WifiAuthMode } from '$lib/_fbs/open-shock/serialization/types/wifi-auth-mode';
   import { WifiScanStatus } from '$lib/_fbs/open-shock/serialization/types/wifi-scan-status';
@@ -13,14 +13,16 @@
 
   const modalStore = getModalStore();
 
-  $: scanStatus = $DeviceStateStore.wifiScanStatus;
+  $: scanStatus = $HubStateStore.wifiScanStatus;
   $: isScanning = scanStatus === WifiScanStatus.Started || scanStatus === WifiScanStatus.InProgress;
 
-  $: connectedBSSID = $DeviceStateStore.wifiConnectedBSSID;
+  $: connectedBSSID = $HubStateStore.wifiConnectedBSSID;
 
   // Sorting the groups themselves by each one's strongest network (by RSSI, higher is stronger)
   // Only need to check the first network in each group, since they're already sorted by signal strength
-  $: strengthSortedGroups = Array.from($DeviceStateStore.wifiNetworkGroups.entries()).sort((a, b) => b[1].networks[0].rssi - a[1].networks[0].rssi);
+  $: strengthSortedGroups = Array.from($HubStateStore.wifiNetworkGroups.entries()).sort(
+    (a, b) => b[1].networks[0].rssi - a[1].networks[0].rssi
+  );
 
   function wifiScan() {
     const data = SerializeWifiScanCommand(!isScanning);
@@ -87,14 +89,20 @@
           {#if netgroup.ssid}
             <span class="ml-2">{netgroup.ssid}</span>
           {:else}
-            <span class="ml-2">{netgroup.networks[0].bssid}</span><span class="text-gray-500 ml-1">(Hidden)</span>
+            <span class="ml-2">{netgroup.networks[0].bssid}</span><span class="text-gray-500 ml-1"
+              >(Hidden)</span
+            >
           {/if}
         </span>
         <div class="btn-group variant-outline">
           {#if netgroup.saved}
-            <button on:click={() => wifiConnect(netgroup)}><i class="fa fa-arrow-right text-green-500" /></button>
+            <button on:click={() => wifiConnect(netgroup)}
+              ><i class="fa fa-arrow-right text-green-500" /></button
+            >
           {:else}
-            <button on:click={() => wifiAuthenticate(netgroup)}><i class="fa fa-link text-green-500" /></button>
+            <button on:click={() => wifiAuthenticate(netgroup)}
+              ><i class="fa fa-link text-green-500" /></button
+            >
           {/if}
           <button on:click={() => wifiSettings(netgroupKey)}><i class="fa fa-cog" /></button>
         </div>
diff --git a/frontend/src/lib/components/modals/WiFiDetails.svelte b/frontend/src/lib/components/modals/WiFiDetails.svelte
index ccaf7c73..be03c642 100644
--- a/frontend/src/lib/components/modals/WiFiDetails.svelte
+++ b/frontend/src/lib/components/modals/WiFiDetails.svelte
@@ -2,7 +2,7 @@
   import { SerializeWifiNetworkSaveCommand } from '$lib/Serializers/WifiNetworkSaveCommand';
   import { SerializeWifiNetworkConnectCommand } from '$lib/Serializers/WifiNetworkConnectCommand';
   import { WebSocketClient } from '$lib/WebSocketClient';
-  import { DeviceStateStore } from '$lib/stores';
+  import { HubStateStore } from '$lib/stores';
   import { getModalStore } from '@skeletonlabs/skeleton';
   import { SerializeWifiNetworkForgetCommand } from '$lib/Serializers/WifiNetworkForgetCommand';
   import { WifiAuthMode } from '$lib/_fbs/open-shock/serialization/types/wifi-auth-mode';
@@ -10,7 +10,7 @@
   const modalStore = getModalStore();
 
   export let groupKey: string;
-  $: group = $DeviceStateStore.wifiNetworkGroups.get(groupKey);
+  $: group = $HubStateStore.wifiNetworkGroups.get(groupKey);
 
   function GetWifiAuthModeString(type: WifiAuthMode) {
     switch (type) {
@@ -85,11 +85,17 @@
   {#if group}
     <div class="flex justify-between space-x-2">
       <h2 class="h2">Network Info</h2>
-      <button class="btn-icon variant-outline" on:click={() => modalStore.close()}><i class="fa fa-xmark"></i></button>
+      <button class="btn-icon variant-outline" on:click={() => modalStore.close()}
+        ><i class="fa fa-xmark"></i></button
+      >
     </div>
     <div>
       {#each rows as row (row.key)}
-        <span class="flex justify-between"><span class="font-bold">{row.key}:</span><span class="text-gray-700 dark:text-gray-300">{row.value}</span></span>
+        <span class="flex justify-between"
+          ><span class="font-bold">{row.key}:</span><span class="text-gray-700 dark:text-gray-300"
+            >{row.value}</span
+          ></span
+        >
       {/each}
     </div>
     <!-- Per-AP info -->
@@ -117,7 +123,10 @@
         {#if showPasswordPrompt}
           <button on:click={() => (showPasswordPrompt = false)}>Cancel</button>
         {/if}
-        <button on:click={ConnectWiFi} disabled={showPasswordPrompt && !validPassword}><i class={'fa mr-2 text-green-500' + (group.saved ? ' fa-wifi' : ' fa-link')}></i>Connect</button>
+        <button on:click={ConnectWiFi} disabled={showPasswordPrompt && !validPassword}
+          ><i class={'fa mr-2 text-green-500' + (group.saved ? ' fa-wifi' : ' fa-link')}
+          ></i>Connect</button
+        >
         {#if group.saved}
           <button on:click={ForgetWiFi}><i class="fa fa-trash mr-2 text-red-500"></i>Forget</button>
         {/if}
@@ -126,7 +135,9 @@
   {:else}
     <div class="flex justify-between space-x-2">
       <h2 class="h2">WiFi Info</h2>
-      <button class="btn-icon variant-outline" on:click={() => modalStore.close()}><i class="fa fa-xmark"></i></button>
+      <button class="btn-icon variant-outline" on:click={() => modalStore.close()}
+        ><i class="fa fa-xmark"></i></button
+      >
     </div>
     <div class="flex justify-center">
       <i class="fa fa-spinner fa-spin"></i>
diff --git a/frontend/src/lib/stores/DeviceStateStore.ts b/frontend/src/lib/stores/HubStateStore.ts
similarity index 94%
rename from frontend/src/lib/stores/DeviceStateStore.ts
rename to frontend/src/lib/stores/HubStateStore.ts
index ff804183..5edc2547 100644
--- a/frontend/src/lib/stores/DeviceStateStore.ts
+++ b/frontend/src/lib/stores/HubStateStore.ts
@@ -1,9 +1,9 @@
 import type { WifiScanStatus } from '$lib/_fbs/open-shock/serialization/types/wifi-scan-status';
-import type { WiFiNetwork, WiFiNetworkGroup, DeviceState } from '$lib/types';
+import type { WiFiNetwork, WiFiNetworkGroup, HubState } from '$lib/types';
 import { writable } from 'svelte/store';
 import { WifiAuthMode } from '$lib/_fbs/open-shock/serialization/types/wifi-auth-mode';
 
-const { subscribe, update } = writable<DeviceState>({
+const { subscribe, update } = writable<HubState>({
   wifiConnectedBSSID: null,
   wifiScanStatus: null,
   wifiNetworks: new Map<string, WiFiNetwork>(),
@@ -47,11 +47,11 @@ function SsidMapReducer(groups: Map<string, WiFiNetworkGroup>, [, value]: [strin
   return groups;
 }
 
-function updateWifiNetworkGroups(store: DeviceState) {
+function updateWifiNetworkGroups(store: HubState) {
   store.wifiNetworkGroups = Array.from(store.wifiNetworks.entries()).reduce(SsidMapReducer, new Map<string, WiFiNetworkGroup>());
 }
 
-export const DeviceStateStore = {
+export const HubStateStore = {
   subscribe,
   update,
   setWifiConnectedBSSID(connectedBSSID: string | null) {
diff --git a/frontend/src/lib/stores/index.ts b/frontend/src/lib/stores/index.ts
index fddeb1f2..2d7a1d22 100644
--- a/frontend/src/lib/stores/index.ts
+++ b/frontend/src/lib/stores/index.ts
@@ -1 +1 @@
-export * from './DeviceStateStore';
+export * from './HubStateStore';
diff --git a/frontend/src/lib/types/DeviceState.ts b/frontend/src/lib/types/HubState.ts
similarity index 94%
rename from frontend/src/lib/types/DeviceState.ts
rename to frontend/src/lib/types/HubState.ts
index 4898a1ad..62e0d7a2 100644
--- a/frontend/src/lib/types/DeviceState.ts
+++ b/frontend/src/lib/types/HubState.ts
@@ -2,7 +2,7 @@ import type { WifiScanStatus } from '$lib/_fbs/open-shock/serialization/types/wi
 import type { Config } from '$lib/mappers/ConfigMapper';
 import type { WiFiNetwork, WiFiNetworkGroup } from './';
 
-export type DeviceState = {
+export type HubState = {
   wifiConnectedBSSID: string | null;
   wifiScanStatus: WifiScanStatus | null;
   wifiNetworks: Map<string, WiFiNetwork>;
diff --git a/frontend/src/lib/types/index.ts b/frontend/src/lib/types/index.ts
index 3cbfd44e..b4ba867b 100644
--- a/frontend/src/lib/types/index.ts
+++ b/frontend/src/lib/types/index.ts
@@ -1,3 +1,3 @@
-export * from './DeviceState';
+export * from './HubState';
 export * from './WiFiNetwork';
 export * from './WiFiNetworkGroup';
diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte
index bbfed90e..0786bedb 100644
--- a/frontend/src/routes/+page.svelte
+++ b/frontend/src/routes/+page.svelte
@@ -5,7 +5,7 @@
   import { WebSocketClient } from '$lib/WebSocketClient';
   import GpioPinSelector from '$lib/components/GpioPinSelector.svelte';
   import WiFiList from '$lib/components/WiFiList.svelte';
-  import { DeviceStateStore } from '$lib/stores';
+  import { HubStateStore } from '$lib/stores';
 
   function isValidLinkCode(str: string) {
     if (typeof str != 'string') return false;
@@ -34,15 +34,34 @@
     <div class="flex flex-col space-y-2">
       <h3 class="h3">Account Linking</h3>
       <div class="flex space-x-2">
-        <input class={'input variant-form-material ' + (linkCodeValid ? '' : 'input-error')} type="text" inputmode="numeric" pattern="[0-9]*" placeholder="Link Code" bind:value={linkCode} />
-        <button class="btn variant-filled" on:click={linkAccount} disabled={!linkCodeValid || linkCode.length < 6}>Link</button>
+        <input
+          class={'input variant-form-material ' + (linkCodeValid ? '' : 'input-error')}
+          type="text"
+          inputmode="numeric"
+          pattern="[0-9]*"
+          placeholder="Link Code"
+          bind:value={linkCode}
+        />
+        <button
+          class="btn variant-filled"
+          on:click={linkAccount}
+          disabled={!linkCodeValid || linkCode.length < 6}>Link</button
+        >
       </div>
     </div>
 
-    <GpioPinSelector name="RF TX Pin" currentPin={$DeviceStateStore.config?.rf?.txPin ?? null} serializer={SerializeSetRfTxPinCommand} />
+    <GpioPinSelector
+      name="RF TX Pin"
+      currentPin={$HubStateStore.config?.rf?.txPin ?? null}
+      serializer={SerializeSetRfTxPinCommand}
+    />
 
     <!-- TODO: Add EStop Enable/Disable toggle -->
 
-    <GpioPinSelector name="EStop Pin" currentPin={$DeviceStateStore.config?.estop?.gpioPin ?? null} serializer={SerializeSetEstopPinCommand} />
+    <GpioPinSelector
+      name="EStop Pin"
+      currentPin={$HubStateStore.config?.estop?.gpioPin ?? null}
+      serializer={SerializeSetEstopPinCommand}
+    />
   </div>
 </div>
diff --git a/include/http/JsonAPI.h b/include/http/JsonAPI.h
index 43b8070d..fc735bb4 100644
--- a/include/http/JsonAPI.h
+++ b/include/http/JsonAPI.h
@@ -6,18 +6,18 @@
 #include <string_view>
 
 namespace OpenShock::HTTP::JsonAPI {
-  /// @brief Links the device to the account with the given account link code, returns the device token. Valid response codes: 200, 404
-  /// @param deviceToken
+  /// @brief Links the hub to the account with the given account link code, returns the hub token. Valid response codes: 200, 404
+  /// @param hubToken
   /// @return
   HTTP::Response<Serialization::JsonAPI::AccountLinkResponse> LinkAccount(std::string_view accountLinkCode);
 
-  /// @brief Gets the device info for the given device token. Valid response codes: 200, 401
-  /// @param deviceToken
+  /// @brief Gets the hub info for the given hub token. Valid response codes: 200, 401
+  /// @param hubToken
   /// @return
-  HTTP::Response<Serialization::JsonAPI::DeviceInfoResponse> GetDeviceInfo(std::string_view deviceToken);
+  HTTP::Response<Serialization::JsonAPI::HubInfoResponse> GetHubInfo(std::string_view hubToken);
 
   /// @brief Requests a Live Control Gateway to connect to. Valid response codes: 200, 401
-  /// @param deviceToken
+  /// @param hubToken
   /// @return
-  HTTP::Response<Serialization::JsonAPI::AssignLcgResponse> AssignLcg(std::string_view deviceToken);
+  HTTP::Response<Serialization::JsonAPI::AssignLcgResponse> AssignLcg(std::string_view hubToken);
 }  // namespace OpenShock::HTTP::JsonAPI
diff --git a/include/serialization/JsonAPI.h b/include/serialization/JsonAPI.h
index 8aca7f50..c268252c 100644
--- a/include/serialization/JsonAPI.h
+++ b/include/serialization/JsonAPI.h
@@ -24,9 +24,9 @@ namespace OpenShock::Serialization::JsonAPI {
   struct AccountLinkResponse {
     std::string authToken;
   };
-  struct DeviceInfoResponse {
-    std::string deviceId;
-    std::string deviceName;
+  struct HubInfoResponse {
+    std::string hubId;
+    std::string hubName;
     struct ShockerInfo {
       std::string id;
       uint16_t rfId;
@@ -42,6 +42,6 @@ namespace OpenShock::Serialization::JsonAPI {
   bool ParseLcgInstanceDetailsJsonResponse(int code, const cJSON* root, LcgInstanceDetailsResponse& out);
   bool ParseBackendVersionJsonResponse(int code, const cJSON* root, BackendVersionResponse& out);
   bool ParseAccountLinkJsonResponse(int code, const cJSON* root, AccountLinkResponse& out);
-  bool ParseDeviceInfoJsonResponse(int code, const cJSON* root, DeviceInfoResponse& out);
+  bool ParseHubInfoJsonResponse(int code, const cJSON* root, HubInfoResponse& out);
   bool ParseAssignLcgJsonResponse(int code, const cJSON* root, AssignLcgResponse& out);
 }  // namespace OpenShock::Serialization::JsonAPI
diff --git a/include/wifi/WiFiManager.h b/include/wifi/WiFiManager.h
index ac13685f..e3f94ef1 100644
--- a/include/wifi/WiFiManager.h
+++ b/include/wifi/WiFiManager.h
@@ -45,23 +45,23 @@ namespace OpenShock::WiFiManager {
   /// @brief Disconnects from the currently connected network
   void Disconnect();
 
-  /// @brief Checks if the device is currently connected to a network
-  /// @return True if the device is connected to a network
+  /// @brief Checks if the hub is currently connected to a network
+  /// @return True if the hub is connected to a network
   bool IsConnected();
 
   /// @brief Gets the currently connected network
   /// @param network Variable to store the network info in
-  /// @return True if the device is connected to a network
+  /// @return True if the hub is connected to a network
   bool GetConnectedNetwork(OpenShock::WiFiNetwork& network);
 
-  /// @brief Gets the devices IP address if it's connected to a network (IPv4)
+  /// @brief Gets the hubs IP address if it's connected to a network (IPv4)
   /// @param ipAddress Variable to store the IP address in
-  /// @return True if the device is connected to a network
+  /// @return True if the hub is connected to a network
   bool GetIPAddress(char* ipAddress);
 
-  /// @brief Gets the devices IP address if it's connected to a network (IPv6)
+  /// @brief Gets the hubs IP address if it's connected to a network (IPv6)
   /// @param ipAddress Variable to store the IP address in
-  /// @return True if the device is connected to a network
+  /// @return True if the hub is connected to a network
   bool GetIPv6Address(char* ipAddress);
 
   /// @brief Gets a copy of the vector of discovered WiFi networks
diff --git a/src/GatewayClient.cpp b/src/GatewayClient.cpp
index a98267f7..6e089182 100644
--- a/src/GatewayClient.cpp
+++ b/src/GatewayClient.cpp
@@ -60,7 +60,7 @@ void GatewayClient::connect(const char* lcgFqdn)
 //
 #warning SSL certificate verification is currently not implemented, by RFC definition this is a security risk, and allows for MITM attacks, but the realistic risk is low
 
-  m_webSocket.beginSSL(lcgFqdn, 443, "/2/ws/device");
+  m_webSocket.beginSSL(lcgFqdn, 443, "/2/ws/hub");
   OS_LOGW(TAG, "WEBSOCKET CONNECTION BY RFC DEFINITION IS INSECURE, remote endpoint can not be verified due to lack of CA verification support, theoretically this is a security risk and allows for MITM attacks, but the realistic risk is low");
 }
 
diff --git a/src/GatewayConnectionManager.cpp b/src/GatewayConnectionManager.cpp
index de2ac417..fbe75672 100644
--- a/src/GatewayConnectionManager.cpp
+++ b/src/GatewayConnectionManager.cpp
@@ -157,20 +157,20 @@ bool GatewayConnectionManager::SendMessageBIN(const uint8_t* data, std::size_t l
   return s_wsClient->sendMessageBIN(data, length);
 }
 
-bool FetchDeviceInfo(std::string_view authToken)
+bool FetchHubInfo(std::string_view authToken)
 {
   // TODO: this function is very slow, should be optimized!
   if ((s_flags & FLAG_HAS_IP) == 0) {
     return false;
   }
 
-  auto response = HTTP::JsonAPI::GetDeviceInfo(authToken);
+  auto response = HTTP::JsonAPI::GetHubInfo(authToken);
 
   if (response.result == HTTP::RequestResult::RateLimited) {
     return false;  // Just return false, don't spam the console with errors
   }
   if (response.result != HTTP::RequestResult::Success) {
-    OS_LOGE(TAG, "Error while fetching device info: %d %d", response.result, response.code);
+    OS_LOGE(TAG, "Error while fetching hub info: %d %d", response.result, response.code);
     return false;
   }
 
@@ -185,8 +185,8 @@ bool FetchDeviceInfo(std::string_view authToken)
     return false;
   }
 
-  OS_LOGI(TAG, "Device ID:   %s", response.data.deviceId.c_str());
-  OS_LOGI(TAG, "Device Name: %s", response.data.deviceName.c_str());
+  OS_LOGI(TAG, "Hub ID:   %s", response.data.hubId.c_str());
+  OS_LOGI(TAG, "Hub Name: %s", response.data.hubName.c_str());
   OS_LOGI(TAG, "Shockers:");
   for (auto& shocker : response.data.shockers) {
     OS_LOGI(TAG, "  [%s] rf=%u model=%u", shocker.id.c_str(), shocker.rfId, shocker.model);
@@ -280,8 +280,8 @@ void GatewayConnectionManager::Update()
       return;
     }
 
-    // Fetch device info
-    if (!FetchDeviceInfo(authToken.c_str())) {
+    // Fetch hub info
+    if (!FetchHubInfo(authToken.c_str())) {
       return;
     }
 
diff --git a/src/http/JsonAPI.cpp b/src/http/JsonAPI.cpp
index f5d4af18..9e8569e7 100644
--- a/src/http/JsonAPI.cpp
+++ b/src/http/JsonAPI.cpp
@@ -6,7 +6,8 @@
 
 using namespace OpenShock;
 
-HTTP::Response<Serialization::JsonAPI::AccountLinkResponse> HTTP::JsonAPI::LinkAccount(std::string_view accountLinkCode) {
+HTTP::Response<Serialization::JsonAPI::AccountLinkResponse> HTTP::JsonAPI::LinkAccount(std::string_view accountLinkCode)
+{
   std::string domain;
   if (!Config::GetBackendDomain(domain)) {
     return {HTTP::RequestResult::InternalError, 0, {}};
@@ -25,7 +26,8 @@ HTTP::Response<Serialization::JsonAPI::AccountLinkResponse> HTTP::JsonAPI::LinkA
   );
 }
 
-HTTP::Response<Serialization::JsonAPI::DeviceInfoResponse> HTTP::JsonAPI::GetDeviceInfo(std::string_view deviceToken) {
+HTTP::Response<Serialization::JsonAPI::HubInfoResponse> HTTP::JsonAPI::GetHubInfo(std::string_view hubToken)
+{
   std::string domain;
   if (!Config::GetBackendDomain(domain)) {
     return {HTTP::RequestResult::InternalError, 0, {}};
@@ -34,18 +36,19 @@ HTTP::Response<Serialization::JsonAPI::DeviceInfoResponse> HTTP::JsonAPI::GetDev
   char uri[OPENSHOCK_URI_BUFFER_SIZE];
   sprintf(uri, "https://%s/1/device/self", domain.c_str());
 
-  return HTTP::GetJSON<Serialization::JsonAPI::DeviceInfoResponse>(
+  return HTTP::GetJSON<Serialization::JsonAPI::HubInfoResponse>(
     uri,
     {
-      {     "Accept",            "application/json"},
-      {"DeviceToken", OpenShock::StringToArduinoString(deviceToken)}
+      {     "Accept",                         "application/json"},
+      {"DeviceToken", OpenShock::StringToArduinoString(hubToken)}
   },
-    Serialization::JsonAPI::ParseDeviceInfoJsonResponse,
+    Serialization::JsonAPI::ParseHubInfoJsonResponse,
     {200, 401}
   );
 }
 
-HTTP::Response<Serialization::JsonAPI::AssignLcgResponse> HTTP::JsonAPI::AssignLcg(std::string_view deviceToken) {
+HTTP::Response<Serialization::JsonAPI::AssignLcgResponse> HTTP::JsonAPI::AssignLcg(std::string_view hubToken)
+{
   std::string domain;
   if (!Config::GetBackendDomain(domain)) {
     return {HTTP::RequestResult::InternalError, 0, {}};
@@ -57,8 +60,8 @@ HTTP::Response<Serialization::JsonAPI::AssignLcgResponse> HTTP::JsonAPI::AssignL
   return HTTP::GetJSON<Serialization::JsonAPI::AssignLcgResponse>(
     uri,
     {
-      {     "Accept",            "application/json"},
-      {"DeviceToken", OpenShock::StringToArduinoString(deviceToken)}
+      {     "Accept",                         "application/json"},
+      {"DeviceToken", OpenShock::StringToArduinoString(hubToken)}
   },
     Serialization::JsonAPI::ParseAssignLcgJsonResponse,
     {200, 401}
diff --git a/src/serial/command_handlers/factoryreset.cpp b/src/serial/command_handlers/factoryreset.cpp
index 7d69f0c3..5bebe53c 100644
--- a/src/serial/command_handlers/factoryreset.cpp
+++ b/src/serial/command_handlers/factoryreset.cpp
@@ -2,7 +2,8 @@
 
 #include "config/Config.h"
 
-void _handleFactoryResetCommand(std::string_view arg, bool isAutomated) {
+void _handleFactoryResetCommand(std::string_view arg, bool isAutomated)
+{
   (void)arg;
 
   ::Serial.println("Resetting to factory defaults...");
@@ -11,10 +12,11 @@ void _handleFactoryResetCommand(std::string_view arg, bool isAutomated) {
   ESP.restart();
 }
 
-OpenShock::Serial::CommandGroup OpenShock::Serial::CommandHandlers::FactoryResetHandler() {
+OpenShock::Serial::CommandGroup OpenShock::Serial::CommandHandlers::FactoryResetHandler()
+{
   auto group = OpenShock::Serial::CommandGroup("factoryreset"sv);
 
-  auto& cmd = group.addCommand("Reset the device to factory defaults and restart"sv, _handleFactoryResetCommand);
+  auto& cmd = group.addCommand("Reset the hub to factory defaults and restart"sv, _handleFactoryResetCommand);
 
   return group;
 }
diff --git a/src/serialization/JsonAPI.cpp b/src/serialization/JsonAPI.cpp
index 6e2d729d..47d918ad 100644
--- a/src/serialization/JsonAPI.cpp
+++ b/src/serialization/JsonAPI.cpp
@@ -8,7 +8,8 @@ const char* const TAG = "JsonAPI";
 
 using namespace OpenShock::Serialization;
 
-bool JsonAPI::ParseLcgInstanceDetailsJsonResponse(int code, const cJSON* root, JsonAPI::LcgInstanceDetailsResponse& out) {
+bool JsonAPI::ParseLcgInstanceDetailsJsonResponse(int code, const cJSON* root, JsonAPI::LcgInstanceDetailsResponse& out)
+{
   (void)code;
 
   if (cJSON_IsObject(root) == 0) {
@@ -56,7 +57,8 @@ bool JsonAPI::ParseLcgInstanceDetailsJsonResponse(int code, const cJSON* root, J
 
   return true;
 }
-bool JsonAPI::ParseBackendVersionJsonResponse(int code, const cJSON* root, JsonAPI::BackendVersionResponse& out) {
+bool JsonAPI::ParseBackendVersionJsonResponse(int code, const cJSON* root, JsonAPI::BackendVersionResponse& out)
+{
   (void)code;
 
   if (cJSON_IsObject(root) == 0) {
@@ -97,7 +99,8 @@ bool JsonAPI::ParseBackendVersionJsonResponse(int code, const cJSON* root, JsonA
   return true;
 }
 
-bool JsonAPI::ParseAccountLinkJsonResponse(int code, const cJSON* root, JsonAPI::AccountLinkResponse& out) {
+bool JsonAPI::ParseAccountLinkJsonResponse(int code, const cJSON* root, JsonAPI::AccountLinkResponse& out)
+{
   (void)code;
 
   if (cJSON_IsObject(root) == 0) {
@@ -117,7 +120,8 @@ bool JsonAPI::ParseAccountLinkJsonResponse(int code, const cJSON* root, JsonAPI:
 
   return true;
 }
-bool JsonAPI::ParseDeviceInfoJsonResponse(int code, const cJSON* root, JsonAPI::DeviceInfoResponse& out) {
+bool JsonAPI::ParseHubInfoJsonResponse(int code, const cJSON* root, JsonAPI::HubInfoResponse& out)
+{
   (void)code;
 
   if (cJSON_IsObject(root) == 0) {
@@ -131,36 +135,37 @@ bool JsonAPI::ParseDeviceInfoJsonResponse(int code, const cJSON* root, JsonAPI::
     return false;
   }
 
-  const cJSON* deviceId = cJSON_GetObjectItemCaseSensitive(data, "id");
-  if (cJSON_IsString(deviceId) == 0) {
+  const cJSON* hubId = cJSON_GetObjectItemCaseSensitive(data, "id");
+  if (cJSON_IsString(hubId) == 0) {
     ESP_LOGJSONE("value at 'data.id' is not a string", root);
     return false;
   }
 
-  const cJSON* deviceName = cJSON_GetObjectItemCaseSensitive(data, "name");
-  if (cJSON_IsString(deviceName) == 0) {
+  const cJSON* hubName = cJSON_GetObjectItemCaseSensitive(data, "name");
+  if (cJSON_IsString(hubName) == 0) {
     ESP_LOGJSONE("value at 'data.name' is not a string", root);
     return false;
   }
 
-  const cJSON* deviceShockers = cJSON_GetObjectItemCaseSensitive(data, "shockers");
-  if (cJSON_IsArray(deviceShockers) == 0) {
+  const cJSON* hubShockers = cJSON_GetObjectItemCaseSensitive(data, "shockers");
+  if (cJSON_IsArray(hubShockers) == 0) {
     ESP_LOGJSONE("value at 'data.shockers' is not an array", root);
     return false;
   }
 
   out = {};
 
-  out.deviceId   = deviceId->valuestring;
-  out.deviceName = deviceName->valuestring;
+  out.hubId   = hubId->valuestring;
+  out.hubName = hubName->valuestring;
 
-  if (out.deviceId.empty() || out.deviceName.empty()) {
+  if (out.hubId.empty() || out.hubName.empty()) {
     ESP_LOGJSONE("value at 'data.id' or 'data.name' is empty", root);
     return false;
   }
 
   cJSON* shocker = nullptr;
-  cJSON_ArrayForEach(shocker, deviceShockers) {
+  cJSON_ArrayForEach(shocker, hubShockers)
+  {
     const cJSON* shockerId = cJSON_GetObjectItemCaseSensitive(shocker, "id");
     if (cJSON_IsString(shockerId) == 0) {
       ESP_LOGJSONE("value at 'shocker.id' is not a string", shocker);
@@ -208,7 +213,8 @@ bool JsonAPI::ParseDeviceInfoJsonResponse(int code, const cJSON* root, JsonAPI::
 
   return true;
 }
-bool JsonAPI::ParseAssignLcgJsonResponse(int code, const cJSON* root, JsonAPI::AssignLcgResponse& out) {
+bool JsonAPI::ParseAssignLcgJsonResponse(int code, const cJSON* root, JsonAPI::AssignLcgResponse& out)
+{
   (void)code;
 
   if (cJSON_IsObject(root) == 0) {