changed default operator buttons to F1, F2 and F3 and fixed subnets

carolio/config.c

@@ -14,7 +14,7 @@ void carol_io_config_load(
     assert(cfg != NULL);
     assert(filename != NULL);
 
-    cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", '1', filename);
+    cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", VK_F1, filename);
-    cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", '2', filename);
+    cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", VK_F2, filename);
-    cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", '3', filename);
+    cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", VK_F3, filename);
 }

chuniio/config.c

@@ -34,9 +34,9 @@ void chuni_io_config_load(
     assert(filename != NULL);
 
     // Technically it's io4 but leave this for compatibility with old configs.
-    cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", '1', filename);
+    cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", VK_F1, filename);
-    cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", '2', filename);
+    cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", VK_F2, filename);
-    cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", '3', filename);
+    cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", VK_F3, filename);
     cfg->vk_ir_emu = GetPrivateProfileIntW(L"io3", L"ir", VK_SPACE, filename);
 
     for (i = 0 ; i < 6 ; i++) {

cmio/config.c

@@ -16,7 +16,7 @@ void cm_io_config_load(
     assert(cfg != NULL);
     assert(filename != NULL);
 
-    cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", '1', filename);
+    cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", VK_F1, filename);
-    cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", '2', filename);
+    cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", VK_F2, filename);
-    cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", '3', filename);
+    cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", VK_F3, filename);
 }

dist/carol/segatools.ini

@@ -39,10 +39,22 @@ monitor=0
 ; Leave empty if you want to use Segatools built-in keyboard input.
 path=
 
+; -----------------------------------------------------------------------------
+; 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 button virtual-key code. Default is the 1 key.
+; Test button virtual-key code. Default is the F1 key.
-test=0x31
+test=0x70
-; Service button virtual-key code. Default is the 2 key.
+; Service button virtual-key code. Default is the F2 key.
-service=0x32
+service=0x71
-; Keyboard button to increment coin counter. Default is the 3 key.
+; Keyboard button to increment coin counter. Default is the F3 key.
-coin=0x33
+coin=0x72

dist/chuni/segatools.ini

@@ -18,6 +18,10 @@ default=127.0.0.1
 ; Chunithm is extremely picky about its LAN environment, so leaving this
 ; setting enabled is strongly recommended.
 enable=1
+; The final octet of the local host's IP address on the virtualized subnet (so,
+; if the keychip subnet is `192.168.32.0` and this value is set to `11`, then the
+; local host's virtualized LAN IP is `192.168.32.11`).
+addrSuffix=11
 
 [keychip]
 ; The /24 LAN subnet that the emulated keychip will tell the game to expect.
@@ -97,12 +101,12 @@ controllerLedOutputSerial=0
 ; world. An improved solution will be provided later.
 
 [io3]
-; Test button virtual-key code. Default is the 1 key.
+; Test button virtual-key code. Default is the F1 key.
-test=0x31
+test=0x70
-; Service button virtual-key code. Default is the 2 key.
+; Service button virtual-key code. Default is the F2 key.
-service=0x32
+service=0x71
-; Keyboard button to increment coin counter. Default is the 3 key.
+; Keyboard button to increment coin counter. Default is the F3 key.
-coin=0x33
+coin=0x72
 ; Set to 0 for enable separate ir control. Deafult is space key.
 ir=0x20
 

dist/chusan/segatools.ini

@@ -137,12 +137,12 @@ controllerLedOutputSerial=0
 ; world. An improved solution will be provided later.
 
 [io3]
-; Test button virtual-key code. Default is the 1 key.
+; Test button virtual-key code. Default is the F1 key.
-test=0x31
+test=0x70
-; Service button virtual-key code. Default is the 2 key.
+; Service button virtual-key code. Default is the F2 key.
-service=0x32
+service=0x71
-; Keyboard button to increment coin counter. Default is the 3 key.
+; Keyboard button to increment coin counter. Default is the F3 key.
-coin=0x33
+coin=0x72
 ; Set to 0 for enable separate ir control. Deafult is space key.
 ir=0x20
 

dist/cm/segatools.ini

@@ -48,6 +48,7 @@ dipsw1=0
 ; Enable/Disable WinTouch emulation
 enable=0
 
+
 ; -----------------------------------------------------------------------------
 ; Input settings
 ; -----------------------------------------------------------------------------
@@ -61,9 +62,9 @@ enable=0
 ; world. An improved solution will be provided later.
 
 [io4]
-; Test button virtual-key code. Default is the 1 key.
+; Test button virtual-key code. Default is the F1 key.
-test=0x31
+test=0x70
-; Service button virtual-key code. Default is the 2 key.
+; Service button virtual-key code. Default is the F2 key.
-service=0x32
+service=0x71
-; Keyboard button to increment coin counter. Default is the 3 key.
+; Keyboard button to increment coin counter. Default is the F3 key.
-coin=0x33
+coin=0x72

dist/cxb/segatools.ini

@@ -24,7 +24,7 @@ enable=1
 ; The /24 LAN subnet that the emulated keychip will tell the game to expect.
 ; If you disable netenv then you must set this to your LAN's IP subnet, and
 ; that subnet must start with 192.168.
-subnet=192.168.100.0
+subnet=192.168.150.0
 billingCa=../DEVICE/ca.crt
 billingPub=../DEVICE/billing.pub
 billingType=2
@@ -61,12 +61,12 @@ enable=1
 [revio]
 ; Enable emulation of the rev IO board
 enabe=1
-; Test button virtual-key code. Default is the 1 key.
+; Test button virtual-key code. Default is the F1 key.
-test=0x31
+test=0x70
-; Service button virtual-key code. Default is the 2 key.
+; Service button virtual-key code. Default is the F2 key.
-service=0x32
+service=0x71
-; Keyboard button to increment coin counter. Default is the 3 key.
+; Keyboard button to increment coin counter. Default is the F3 key.
-coin=0x33
+coin=0x72
 ; Menu up key. Default is up arrow.
 up=0x26
 ; Menu down key. Default is down arrow.

dist/diva/segatools.ini

@@ -8,6 +8,12 @@ option=
 ; NOTE: This has nothing to do with Windows %APPDATA%.
 appdata=
 
+[aime]
+; Enable Aime card reader assembly emulation. Disable to use a real SEGA Aime
+; reader.
+enable=1
+aimePath=DEVICE\aime.txt
+
 [dns]
 ; Insert the hostname or IP address of the server you wish to use here.
 ; Note that 127.0.0.1, localhost etc are specifically rejected.
@@ -26,7 +32,27 @@ dipsw1=1
 ; The /24 LAN subnet that the emulated keychip will tell the game to expect.
 ; If you disable netenv then you must set this to your LAN's IP subnet, and
 ; that subnet must start with 192.168.
-subnet=192.168.150.0
+subnet=192.168.78.0
+
+; -----------------------------------------------------------------------------
+; 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 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
 
 [slider]
 cell1=0x51

dist/fgo/segatools.ini

@@ -38,7 +38,7 @@ addrSuffix=11
 ; The /24 LAN subnet that the emulated keychip will tell the game to expect.
 ; If you disable netenv then you must set this to your LAN's IP subnet, and
 ; that subnet must start with 192.168.
-subnet=192.168.172.0
+subnet=192.168.167.0
 
 [touch]
 ; WinTouch emulation setting.

dist/idac/segatools.ini

@@ -82,12 +82,12 @@ path=
 ; world. An improved solution will be provided later.
 
 [io4]
-; Test button virtual-key code. Default is the 1 key.
+; Test button virtual-key code. Default is the F1 key.
-test=0x31
+test=0x70
-; Service button virtual-key code. Default is the 2 key.
+; Service button virtual-key code. Default is the F2 key.
-service=0x32
+service=0x71
-; Keyboard button to increment coin counter. Default is the 3 key.
+; Keyboard button to increment coin counter. Default is the F3 key.
-coin=0x33
+coin=0x72
 
 ; Input API selection for IO4 input emulator.
 ; Set "xinput" to use a gamepad and "dinput" to use a steering wheel.

dist/idz/segatools.ini

@@ -34,7 +34,6 @@ region=4
 ; SEGA games are somewhat picky about their LAN environment, so leaving this
 ; setting enabled is recommended.
 enable=1
-
 ; The final octet of the local host's IP address on the virtualized subnet 
 ; (so, if the keychip subnet is 192.168.32.0 and this value is set to 11, 
 ; then the local host's virtualized LAN IP is 192.168.32.11).
@@ -88,12 +87,12 @@ path=
 ; world. An improved solution will be provided later.
 
 [io3]
-; Test button virtual-key code. Default is the 1 key.
+; Test button virtual-key code. Default is the F1 key.
-test=0x31
+test=0x70
-; Service button virtual-key code. Default is the 2 key.
+; Service button virtual-key code. Default is the F2 key.
-service=0x32
+service=0x71
-; Keyboard button to increment coin counter. Default is the 3 key.
+; Keyboard button to increment coin counter. Default is the F3 key.
-coin=0x33
+coin=0x72
 
 ; Input API selection for JVS input emulator.
 ; Set "xinput" to use a gamepad and "dinput" to use a steering wheel.

dist/mai2/segatools.ini

@@ -34,7 +34,7 @@ enable=1
 ; The /24 LAN subnet that the emulated keychip will tell the game to expect.
 ; If you disable netenv then you must set this to your LAN's IP subnet, and
 ; that subnet must start with 192.168.
-subnet=192.168.100.0
+subnet=192.168.172.0
 
 [gpio]
 ; ALLS DIP switches.
@@ -62,12 +62,12 @@ dipsw1=1
 ; world. An improved solution will be provided later.
 
 [io4]
-; Test button virtual-key code. Default is the 1 key.
+; Test button virtual-key code. Default is the F1 key.
-test=0x31
+test=0x70
-; Service button virtual-key code. Default is the 2 key.
+; Service button virtual-key code. Default is the F2 key.
-service=0x32
+service=0x71
-; Keyboard button to increment coin counter. Default is the 3 key.
+; Keyboard button to increment coin counter. Default is the F3 key.
-coin=0x33
+coin=0x72
 
 ; Key bindings for buttons around screen. The default key map, depicted
 ; in clockwise order, is as follows:

dist/mercury/segatools.ini

@@ -64,12 +64,12 @@ dipsw1=1
 ; world. An improved solution will be provided later.
 
 [io4]
-; Test button virtual-key code. Default is the 1 key.
+; Test button virtual-key code. Default is the F1 key.
-test=0x31
+test=0x70
-; Service button virtual-key code. Default is the 2 key.
+; Service button virtual-key code. Default is the F2 key.
-service=0x32
+service=0x71
-; Keyboard button to increment coin counter. Default is the 3 key.
+; Keyboard button to increment coin counter. Default is the F3 key.
-coin=0x33
+coin=0x72
 
 ; Volume up virtual-key code. Default is the "UP" key.
 volup=0x26

dist/mu3/segatools.ini

@@ -69,28 +69,27 @@ enable=1
 ; world. An improved solution will be provided later.
 
 [io4]
-; Input API selection for JVS input emulator.
+; Test button virtual-key code. Default is the F1 key.
-; Test button virtual-key code. Default is the 1 key.
+test=0x70
-test=0x31
+; Service button virtual-key code. Default is the F2 key.
-; Service button virtual-key code. Default is the 2 key.
+service=0x71
-service=0x32
+; Keyboard button to increment coin counter. Default is the F3 key.
-; Keyboard button to increment coin counter. Default is the 3 key.
+coin=0x72
-coin=0x33
 
 ; Set "1" to enable mouse lever emulation, "0" to use XInput
 mouse=1
 
 ; Keyboard input bindings
 left1=0x41  ; A
-left2=0x53	; S
+left2=0x53  ; S
-left3=0x44	; D
+left3=0x44  ; D
 
-leftSide=0x01	; Mouse Left
+leftSide=0x01   ; Mouse Left
-rightSide=0x02	; Mouse Right
+rightSide=0x02  ; Mouse Right
 
 right1=0x4A ; J
 right1=0x4B ; K
-right3=0x4C	; L
+right3=0x4C ; L
 
-leftMenu=0x55	; U
+leftMenu=0x55   ; U
-rightMenu=0x4F	; O
+rightMenu=0x4F  ; O

dist/swdc/segatools.ini

@@ -29,12 +29,16 @@ default=127.0.0.1
 ; SEGA games are somewhat picky about their LAN environment, so leaving this
 ; setting enabled is recommended.
 enable=1
+; The final octet of the local host's IP address on the virtualized subnet (so,
+; if the keychip subnet is `192.168.32.0` and this value is set to `11`, then the
+; local host's virtualized LAN IP is `192.168.32.11`).
+addrSuffix=11
 
 [keychip]
 ; The /24 LAN subnet that the emulated keychip will tell the game to expect.
 ; You must set this to your LAN's IP subnet, and that subnet must start with 192.168, 
 ; in order to find the MAIN cabinet.
-subnet=192.168.100.0
+subnet=192.168.160.0
 
 [aimeio]
 ; To use a custom card reader IO DLL enter its path here.
@@ -68,12 +72,12 @@ freeplay=0
 ; world. An improved solution will be provided later.
 
 [io4]
-; Test button virtual-key code. Default is the 1 key.
+; Test button virtual-key code. Default is the F1 key.
-test=0x31
+test=0x70
-; Service button virtual-key code. Default is the 2 key.
+; Service button virtual-key code. Default is the F2 key.
-service=0x32
+service=0x71
-; Keyboard button to increment coin counter. Default is the 3 key.
+; Keyboard button to increment coin counter. Default is the F3 key.
-coin=0x33
+coin=0x72
 
 ; Input API selection for IO4 input emulator.
 ; Set "xinput" to use a gamepad and "dinput" to use a steering wheel.

divaio/config.c

@@ -27,9 +27,9 @@ void diva_io_config_load(
     assert(cfg != NULL);
     assert(filename != NULL);
 
-    cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", '1', filename);
+    cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", VK_F1, filename);
-    cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", '2', filename);
+    cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", VK_F2, filename);
-    cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", '3', filename);
+    cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", VK_F3, filename);
 
     for (i = 0 ; i < _countof(cfg->vk_buttons) ; i++) {
         swprintf_s(key, _countof(key), L"key%i", i + 1);

fgoio/config.c

@@ -14,7 +14,7 @@ void fgo_io_config_load(
     assert(cfg != NULL);
     assert(filename != NULL);
 
-    cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", '1', filename);
+    cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", VK_F1, filename);
-    cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", '2', filename);
+    cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", VK_F2, filename);
-    cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", '3', filename);
+    cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", VK_F3, filename);
 }

idacio/config.c

@@ -124,9 +124,9 @@ void idac_io_config_load(struct idac_io_config *cfg, const wchar_t *filename)
     assert(cfg != NULL);
     assert(filename != NULL);
 
-    cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", '1', filename);
+    cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", VK_F1, filename);
-    cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", '2', filename);
+    cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", VK_F2, filename);
-    cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", '3', filename);
+    cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", VK_F3, filename);
     cfg->restrict_ = GetPrivateProfileIntW(L"io4", L"restrict", 128, filename);
 
     GetPrivateProfileStringW(

idzio/config.c

@@ -121,9 +121,10 @@ void idz_io_config_load(struct idz_io_config *cfg, const wchar_t *filename)
     assert(cfg != NULL);
     assert(filename != NULL);
 
-    cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", '1', filename);
+    /* Technically it's io4 */
-    cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", '2', filename);
+    cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", VK_F1, filename);
-    cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", '3', filename);
+    cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", VK_F2, filename);
+    cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", VK_F3, filename);
     cfg->restrict_ = GetPrivateProfileIntW(L"io3", L"restrict", 97, filename);
 
     GetPrivateProfileStringW(

mai2io/config.c

@@ -24,9 +24,9 @@ void mai2_io_config_load(
     assert(cfg != NULL);
     assert(filename != NULL);
 
-    cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", '1', filename);
+    cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", VK_F1, filename);
-    cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", '2', filename);
+    cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", VK_F2, filename);
-    cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", '3', filename);
+    cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", VK_F3, filename);
 
     for (i = 0 ; i < 9 ; i++) {
         swprintf_s(key, _countof(key), L"1p_btn%i", i + 1);

mercuryio/config.c

@@ -27,11 +27,11 @@ void mercury_io_config_load(
     assert(cfg != NULL);
     assert(filename != NULL);
 
-    cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", 0x2D, filename);
+    cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", VK_F1, filename);
-    cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", 0x2E, filename);
+    cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", VK_F2, filename);
-    cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", 0x24, filename);
+    cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", VK_F3, filename);
-    cfg->vk_vol_up = GetPrivateProfileIntW(L"io4", L"volup", 0x26, filename);
+    cfg->vk_vol_up = GetPrivateProfileIntW(L"io4", L"volup", VK_UP, filename);
-    cfg->vk_vol_down = GetPrivateProfileIntW(L"io4", L"voldown", 0x28, filename);
+    cfg->vk_vol_down = GetPrivateProfileIntW(L"io4", L"voldown", VK_DOWN, filename);
 
     for (i = 0 ; i < 240 ; i++) {
         swprintf_s(key, _countof(key), L"cell%i", i + 1);

mu3io/config.c

@@ -14,9 +14,9 @@ void mu3_io_config_load(
     assert(cfg != NULL);
     assert(filename != NULL);
 
-    cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", '1', filename);
+    cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", VK_F1, filename);
-    cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", '2', filename);
+    cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", VK_F2, filename);
-    cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", '3', filename);
+    cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", VK_F3, filename);
 
     cfg->use_mouse = GetPrivateProfileIntW(L"io4", L"mouse", 0, filename);
 

swdcio/config.c

@@ -112,9 +112,9 @@ void swdc_io_config_load(struct swdc_io_config *cfg, const wchar_t *filename)
     assert(cfg != NULL);
     assert(filename != NULL);
 
-    cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", '1', filename);
+    cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", VK_F1, filename);
-    cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", '2', filename);
+    cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", VK_F2, filename);
-    cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", '3', filename);
+    cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", VK_F3, filename);
     cfg->restrict_ = GetPrivateProfileIntW(L"io4", L"restrict", 128, filename);
 
     GetPrivateProfileStringW(