feat: segatools.ini loading

rust/src/model/misc.rs

@@ -65,8 +65,8 @@ impl Game {
 
     pub fn has_module(&self, module: ProfileModule) -> bool {
         match self {
-            Game::Ongeki => make_bitflags!(ProfileModule::{Segatools | Display | Network | BepInEx | Mu3Ini}),
-            Game::Chunithm => make_bitflags!(ProfileModule::{Segatools | Network}),
+            Game::Ongeki => make_bitflags!(ProfileModule::{Segatools | Display | Network | BepInEx | Mu3Ini | Keyboard}),
+            Game::Chunithm => make_bitflags!(ProfileModule::{Segatools | Network | Keyboard}),
         }.contains(module)
     }
 }

rust/src/model/profile.rs

@@ -162,6 +162,75 @@ pub struct Mu3Ini {
     pub blacklist: Option<(i32, i32)>,
 }
 
+#[derive(Deserialize, Serialize, Clone, Debug)]
+pub struct OngekiKeyboard {
+    pub use_mouse: bool,
+    pub coin: i32,
+    pub svc: i32,
+    pub test: i32,
+    pub lmenu: i32,
+    pub rmenu: i32,
+    pub l1: i32,
+    pub l2: i32,
+    pub l3: i32,
+    pub r1: i32,
+    pub r2: i32,
+    pub r3: i32,
+    pub lwad: i32,
+    pub rwad: i32,
+}
+
+impl Default for OngekiKeyboard {
+    fn default() -> Self {
+        Self {
+            use_mouse: true,
+            test: 0x70,
+            svc: 0x71,
+            coin: 0x72,
+            lmenu: 0x55,
+            rmenu: 0x4F,
+            lwad: 0x01,
+            rwad: 0x02,
+            l1: 0x41,
+            l2: 0x53,
+            l3: 0x44,
+            r1: 0x4A,
+            r2: 0x4B,
+            r3: 0x4C
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize, Clone, Debug)]
+pub struct ChunithmKeyboard {
+    pub split_ir: bool,
+    pub coin: i32,
+    pub svc: i32,
+    pub test: i32,
+    pub cell: [i32; 32],
+    pub ir: [i32; 6],
+}
+
+impl Default for ChunithmKeyboard {
+    fn default() -> Self {
+        Self {
+            split_ir: false,
+            test: 0x70,
+            svc: 0x71,
+            coin: 0x72,
+            cell: Default::default(),
+            ir: Default::default(),
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize, Clone, Debug)]
+#[serde(tag = "game", content = "data")]
+pub enum Keyboard {
+    Ongeki(OngekiKeyboard),
+    Chunithm(ChunithmKeyboard),
+}
+
 #[bitflags]
 #[repr(u8)]
 #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
@@ -170,5 +239,6 @@ pub enum ProfileModule {
     Network,
     Display,
     BepInEx,
-    Mu3Ini
+    Mu3Ini,
+    Keyboard,
 }

rust/src/model/segatools_base.rs

@@ -38,49 +38,7 @@ cabLedOutputSerial=0
 ; Output slider LED data to the named pipe
 controllerLedOutputPipe=1
 ; Output slider LED data to the serial port
-controllerLedOutputSerial=0
-
-[io4]
-; Test button virtual-key code. Default is the F1 key.
-test=0x70
-; Service button virtual-key code. Default is the F2 key.
-service=0x71
-; Keyboard button to increment coin counter. Default is the F3 key.
-coin=0x72
-
-; Set \"1\" to enable mouse lever emulation, \"0\" to use XInput
-mouse=1
-
-; XInput input bindings
-;
-; Left Stick        Lever
-; Left Trigger      Lever (move to the left)
-; Right Trigger     Lever (move to the right)
-; Left              Left red button
-; Up                Left green button
-; Right             Left blue button
-; Left Shoulder     Left side button
-; Right Shoulder    Right side button
-; X                 Right red button
-; Y                 Right green button
-; A                 Right blue button
-; Back              Left menu button
-; Start             Right menu button
-
-; Keyboard input bindings
-left1=0x41  ; A
-left2=0x53  ; S
-left3=0x44  ; D
-
-leftSide=0x01   ; Mouse Left
-rightSide=0x02  ; Mouse Right
-
-right1=0x4A ; J
-right2=0x4B ; K
-right3=0x4C ; L
-
-leftMenu=0x55   ; U
-rightMenu=0x4F  ; O".to_owned(),
+controllerLedOutputSerial=0".to_owned(),
         Game::Chunithm => "
 [vfd]
 ; Enable VFD emulation. Disable to use a real VFD
@@ -179,120 +137,6 @@ controllerLedOutputOpeNITHM=0
 ; x86 chuniio to path32, x64 to path64. Both are necessary.
 ;path32=
 ;path64=
-
-; -----------------------------------------------------------------------------
-; Input settings
-; -----------------------------------------------------------------------------
-
-; Keyboard bindings are specified as hexadecimal (prefixed with 0x) or decimal
-; (not prefixed with 0x) virtual-key codes, a list of which can be found here:
-;
-; https://docs.microsoft.com/en-us/windows/win32/inputdev/virtual-key-codes
-;
-; This is, admittedly, not the most user-friendly configuration method in the
-; world. An improved solution will be provided later.
-
-[io3]
-
-test=0x31
-
-service=0x32
-
-coin=0x33
-
-ir=0x00
-
-ir6=0x39
-
-ir5=0x38
-
-ir4=0x37
-
-ir3=0x36
-
-ir2=0x35
-
-ir1=0x34
-
-[ir]
-
-ir6=0x39
-
-ir5=0x38
-
-ir4=0x37
-
-ir3=0x36
-
-ir2=0x35
-
-ir1=0x34
-
-[slider]
-
-cell32=0x51
-
-cell30=0x5A
-
-cell28=0x53
-
-cell26=0x45
-
-cell24=0x43
-
-cell22=0x46
-
-cell20=0x54
-
-cell18=0x42
-
-cell16=0x48
-
-cell14=0x55
-
-cell12=0x4D
-
-cell10=0x4B
-
-cell8=0x4F
-
-cell6=190
-
-cell4=186
-
-cell2=219
-
-cell31=0x41
-
-cell29=0x57
-
-cell27=0x58
-
-cell25=0x44
-
-cell23=0x52
-
-cell21=0x56
-
-cell19=0x47
-
-cell17=0x59
-
-cell15=0x4E
-
-cell13=0x4A
-
-cell11=0x49
-
-cell9=188
-
-cell7=0x4C
-
-cell5=0x50
-
-cell3=191
-
-cell1=222
 ".to_owned()
     }
 }