From ab54aaead6a4cbd133d982f57d9810335a1b059f Mon Sep 17 00:00:00 2001 From: Persephone Bubblegum-Holiday Date: Wed, 2 Apr 2025 15:27:52 -0700 Subject: [PATCH] add rae characters to selection --- ...nkConnection2-Firmware-Servo-GuestStar.ino | 8 ++--- rshw2sst/Program.cs | 36 ++++++++----------- 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/PinkConnection2-Firmware-Servo-GuestStar/PinkConnection2-Firmware-Servo-GuestStar.ino b/PinkConnection2-Firmware-Servo-GuestStar/PinkConnection2-Firmware-Servo-GuestStar.ino index 7429856..c24303c 100644 --- a/PinkConnection2-Firmware-Servo-GuestStar/PinkConnection2-Firmware-Servo-GuestStar.ino +++ b/PinkConnection2-Firmware-Servo-GuestStar/PinkConnection2-Firmware-Servo-GuestStar.ino @@ -4,8 +4,8 @@ #include Servo servoChannel[8]; -byte onDegrees[8] = { 90, 0, 0, 0, 0, 0, 0, 0 }; // these are incomplete, i need to tune them when i get the servos in -byte offDegrees[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; +byte onDegrees[8] = { 90, 0, 0, 0, 45, 135, 0, 0 }; // these are incomplete, i need to tune them when i get the servos in +byte offDegrees[8] = { 0, 0, 0, 0, 90, 90, 0, 0 }; int byte1 = 0; int byte2 = 0; @@ -64,7 +64,7 @@ void loop() { servoChannel[2].write(onDegrees[3]); digitalWrite(A3, 1); } else { - servoChannel[2].write(offDegrees[3]); + //servoChannel[2].write(offDegrees[3]); dont digitalWrite(A3, 0); } @@ -80,7 +80,7 @@ void loop() { servoChannel[4].write(onDegrees[5]); digitalWrite(A5, 1); } else { - servoChannel[4].write(offDegrees[5]); + //servoChannel[4].write(offDegrees[5]); dont digitalWrite(A5, 0); } diff --git a/rshw2sst/Program.cs b/rshw2sst/Program.cs index fa5641e..7c1c35f 100644 --- a/rshw2sst/Program.cs +++ b/rshw2sst/Program.cs @@ -36,29 +36,21 @@ namespace rshw2sst Console.WriteLine("FATAL: Only RSHW and CSHW files are supported."); return; } - switch (args[1].ToLower()) + string chara = args[1].ToLower(); + if (chara.Contains("chuck") || chara.Contains("rolfe")) charaIndex = 0; + else if (chara.Contains("helen") || chara.Contains("mitzi")) charaIndex = 1; + else if (chara.Contains("munch") || chara.Contains("fatz")) charaIndex = 2; + else if (chara.Contains("jasper") || chara.Contains("beach")) charaIndex = 3; + else if (chara.Contains("pasqually") || chara.Contains("dook")) charaIndex = 4; + else if (chara.Contains("bella") || chara.Contains("billy")) { - case "chuck": - charaIndex = 0; - break; - case "helen": - charaIndex = 1; - break; - case "munch": - charaIndex = 2; - break; - case "jasper": - charaIndex = 3; - break; - case "pasqually": - charaIndex = 4; - break; - case "bella": - Console.WriteLine("you wish!!!"); - return; - default: - Console.WriteLine("FATAL: Invalid character."); - return; + Console.WriteLine("you wish!!!!"); + return; + } + else + { + Console.WriteLine("FATAL: Invalid character."); + return; } if (!Directory.Exists(args[2])) Directory.CreateDirectory(args[2]); RSHWFile file = RSHWLoader.Load(args[0]);