Update controller server config

NTUEELightDance · Mar 22, 2024 · e063416 · e063416
1 parent 429e898
commit e063416
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 50 deletions.
diff --git a/controller-server/configs/dancerTable.ts b/controller-server/configs/dancerTable.ts
@@ -98,17 +98,17 @@ const dancerTable: DancerData = {
     connected: false,
     interface: "wifi",
   },
-  "B8:27:EB:83:21:2C": { // 6
+  "D8:3A:DD:22:AC:76": { // 6
     IP: "192.168.0.44",
-    MAC: "B8:27:EB:83:21:2C",
+    MAC: "D8:3A:DD:22:AC:76",
     dancer: "6_rakec",
     hostname: "lightdance-06",
     connected: false,
     interface: "ethernet",
   },
-  "B8:27:EB:D6:74:79": { // 6
+  "D8:3A:DD:22:AC:78": { // 6
     IP: "192.168.0.44",
-    MAC: "B8:27:EB:D6:74:79",
+    MAC: "D8:3A:DD:22:AC:78",
     dancer: "6_rakec",
     hostname: "lightdance-06",
     connected: false,
@@ -162,15 +162,15 @@ const dancerTable: DancerData = {
     connected: false,
     interface: "wifi",
   },
-  "D8:3A:DD:22:AD:16": { // 10
+  "D8:3A:DD:22:AC:DD": { // 10
     IP: "192.168.0.0",
     MAC: "D8:3A:DD:22:AC:DD",
     dancer: "10_chris",
     hostname: "lightdance-10",
     connected: false,
     interface: "ethernet",
   },
-  "D8:3A:DD:22:AD:15": { // 10
+  "D8:3A:DD:22:AC:DE": { // 10
     IP: "192.168.0.0",
     MAC: "D8:3A:DD:22:AC:DE",
     dancer: "10_chris",
@@ -242,35 +242,35 @@ const dancerTable: DancerData = {
   //   connected: false,
   //   interface: "wifi",
   // },
-  "B8:27:EB:BB:57:AD": { // 15
-    IP: "192.168.0.0",
-    MAC: "B8:27:EB:BB:57:AD",
-    dancer: "15_nian_1",
-    hostname: "lightdance-15",
-    connected: false,
-    interface: "ethernet",
-  },
-  "B8:27:EB:EE:02:F8": { // 15
-    IP: "192.168.0.0",
-    MAC: "B8:27:EB:EE:02:F8",
-    dancer: "15_nian_1",
-    hostname: "lightdance-15",
-    connected: false,
-    interface: "wifi",
-  },
+  // "B8:27:EB:BB:57:AD": { // 15
+  //   IP: "192.168.0.0",
+  //   MAC: "B8:27:EB:BB:57:AD",
+  //   dancer: "15_nian_1",
+  //   hostname: "lightdance-15",
+  //   connected: false,
+  //   interface: "ethernet",
+  // },
+  // "B8:27:EB:EE:02:F8": { // 15
+  //   IP: "192.168.0.0",
+  //   MAC: "B8:27:EB:EE:02:F8",
+  //   dancer: "15_nian_1",
+  //   hostname: "lightdance-15",
+  //   connected: false,
+  //   interface: "wifi",
+  // },
   "B8:27:EB:3A:21:4F": { // 16
     IP: "192.168.0.0",
     MAC: "B8:27:EB:3A:21:4F",
-    dancer: "16_nian_2",
-    hostname: "lightdance-16",
+    dancer: "15_nian_1",
+    hostname: "lightdance-15",
     connected: false,
     interface: "ethernet",
   },
   "B8:27:EB:6F:74:1A": { // 16
     IP: "192.168.0.0",
     MAC: "B8:27:EB:6F:74:1A",
-    dancer: "16_nian_2",
-    hostname: "lightdance-16",
+    dancer: "15_nian_1",
+    hostname: "lightdance-15",
     connected: false,
     interface: "wifi",
   },
@@ -339,22 +339,7 @@ const dancerTable: DancerData = {
     connected: false,
     interface: "wifi",
   },
-  "D8:3A:DD:22:AC:DD": { // 22
-    IP: "192.168.0.0",
-    MAC: "D8:3A:DD:22:AC:DD",
-    dancer: "22",
-    hostname: "lightdance-22",
-    connected: false,
-    interface: "ethernet",
-  },
-  "D8:3A:DD:22:AC:DE": { // 22
-    IP: "192.168.0.0",
-    MAC: "D8:3A:DD:22:AC:DE",
-    dancer: "22",
-    hostname: "lightdance-22",
-    connected: false,
-    interface: "wifi",
-  },
+  // 22 replaced
   // 23 broken
   "B8:27:EB:82:79:49": { // 24
     IP: "192.168.0.0",

diff --git a/controller-server/configs/pinMapTable.ts b/controller-server/configs/pinMapTable.ts
@@ -671,11 +671,6 @@ const pinMapTable: PinMapTable = {
       backfoot_left_out: 10,
       backpalm_left_out: 11,
       backpalm_left_mid: 12,
-      forefoot_left_out: 20,
-      forefoot_left_mid: 21,
-      forefoot_left_in: 22,
-      forepalm_left_out: 23,
-      forepalm_left_in: 24,
       tail1: 30,
       tail2: 31,
       tail3: 32,
@@ -686,7 +681,8 @@ const pinMapTable: PinMapTable = {
     LEDPARTS: {
       backfoot_right_LED: { id: 0, len: 57 },
       backfoot_left_LED: { id: 3, len: 30 },
-      tail_LED: { id: 5, len: 78 },
+      back_LED: { id: 4, len: 76 },
+      tail_LED: { id: 5, len: 119 },
       slash_LED: { id: 6, len: 40 },
     },
     LEDPARTS_MERGE: {},
@@ -713,12 +709,16 @@ const pinMapTable: PinMapTable = {
       nose: 22, 
       jaw_up: 23,
       jaw_mid: 24,
-      jaw_low: 25
+      jaw_low: 25,
+      forefoot_left_out: 30,
+      forefoot_left_mid: 31,
+      forefoot_left_in: 32,
+      forepalm_left_out: 33,
+      forepalm_left_in: 34
     },
     LEDPARTS: {
       forefoot_left_LED: { id: 0, len: 66 },
       forefoot_right_LED: { id: 3, len: 64 },
-      back_LED: { id: 4, len: 76 },
       upperjaw_LED: { id: 5, len: 33 },
       lowerjaw_LED: { id: 6, len: 16 }
     },