diff --git a/Package.mk b/Package.mk index 00055ea..ee0dea9 100644 --- a/Package.mk +++ b/Package.mk @@ -209,7 +209,6 @@ $(BUILD_DIR_ZIP)/apm3.zip: $(V)mkdir -p $(BUILD_DIR_ZIP)/apm3/DEVICE $(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \ $(BUILD_DIR_64)/apm3hook/apm3hook.dll \ - $(DIST_DIR)/apm3/config_hook.json \ $(DIST_DIR)/apm3/segatools.ini \ $(DIST_DIR)/apm3/start.bat \ $(BUILD_DIR_ZIP)/apm3 diff --git a/apm3hook/apm3hook.def b/apm3hook/apm3hook.def index 4ce36a0..582be69 100644 --- a/apm3hook/apm3hook.def +++ b/apm3hook/apm3hook.def @@ -16,6 +16,7 @@ EXPORTS apm3_io_init apm3_io_poll apm3_io_led_init + apm3_io_led_set_colors CFW_init CFW_term CFW_open diff --git a/apm3hook/dllmain.c b/apm3hook/dllmain.c index 5b8483f..03a6ecf 100644 --- a/apm3hook/dllmain.c +++ b/apm3hook/dllmain.c @@ -80,7 +80,7 @@ static DWORD CALLBACK apm3_pre_startup(void) return hr; } - hr = sg_reader_hook_init(&apm3_hook_cfg.aime, 3, 3, apm3_hook_mod); + hr = sg_reader_hook_init(&apm3_hook_cfg.aime, 3, 1, apm3_hook_mod); if (FAILED(hr)) { goto fail; diff --git a/apm3io/apm3io.c b/apm3io/apm3io.c index 087c5b3..e5718c6 100644 --- a/apm3io/apm3io.c +++ b/apm3io/apm3io.c @@ -53,7 +53,19 @@ void apm3_io_get_opbtns(uint8_t *opbtn) } } +void apm3_io_get_gamebtns(uint8_t *btn) +{ + if (btn != NULL) { + *btn = apm3_gamebtn; + } +} + HRESULT apm3_io_led_init(void) { return S_OK; } + +void apm3_io_led_set_colors(uint8_t board, uint8_t *rgb) +{ + return; +} diff --git a/apm3io/apm3io.h b/apm3io/apm3io.h index 0d3abfd..6ab143a 100644 --- a/apm3io/apm3io.h +++ b/apm3io/apm3io.h @@ -53,3 +53,9 @@ void apm3_io_get_opbtns(uint8_t *opbtn); Minimum API version: 0x0101 */ HRESULT apm3_io_led_init(void); + +/* Update the RGB LEDs. rgb is a pointer to an array of up to 61 * 3 = 183 bytes. + + Minimum API version: 0x0101 */ + +void apm3_io_led_set_colors(uint8_t board, uint8_t *rgb); diff --git a/dist/apm3/config_hook.json b/dist/apm3/config_hook.json deleted file mode 100644 index 5723db7..0000000 --- a/dist/apm3/config_hook.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "credit" : - { - "coin_selector_AS6DB" : - { - "enable" : false - } - } -} diff --git a/dist/apm3/segatools.ini b/dist/apm3/segatools.ini index c3152ee..7feb7ea 100644 --- a/dist/apm3/segatools.ini +++ b/dist/apm3/segatools.ini @@ -23,7 +23,7 @@ enable=1 aimePath=DEVICE\aime.txt [vfd] -; Enable VFD emulation (currently just stubbed). Disable to use a real VFD +; Enable VFD emulation Disable to use a real VFD ; GP1232A02A FUTABA assembly. enable=1 @@ -101,3 +101,8 @@ test=0x70 service=0x71 ; Keyboard button to increment coin counter. Default is the F3 key. coin=0x72 + +up=0x57 +down=0x53 +left=0x41 +right=0x44 \ No newline at end of file diff --git a/dist/apm3/start.bat b/dist/apm3/start.bat index 570fb9c..0f8e542 100644 --- a/dist/apm3/start.bat +++ b/dist/apm3/start.bat @@ -2,10 +2,10 @@ pushd %~dp0 -start "AM Daemon" /min inject -d -k cmhook.dll amdaemon.exe -c config_common.json config_server.json config_client.json config_hook.json -inject -d -k cmhook.dll CardMaker.exe -screen-fullscreen 0 -popupwindow -screen-width 1080 -screen-height 1920 +start "AM Daemon" /min inject -d -k apm3hook.dll amdaemonD.exe -c daemon_config\common.json daemon_config\standalone.json +inject -d -k apm3hook.dll Apmv3System.exe -screen-fullscreen 0 -popupwindow -screen-width 1920 -screen-height 1080 -taskkill /f /im amdaemon.exe > nul 2>&1 +taskkill /f /im amdaemonD.exe > nul 2>&1 echo. echo Game processes have terminated