diff --git a/README b/README index 4babd5b..903f054 100644 --- a/README +++ b/README @@ -39,15 +39,15 @@ macros: List of individual macros. Each macro is an ordered list. The pre2015 "m1" : ["", "", "", ""] -UltiStik 360: +UltraStik 360: version: This should be set to 1(pre 2015 board) or 2(2015 and newer). This is used for determining which version of the board to configure -Product: The UltiStik 360 product format “ultistik" +Product: The UltraStik 360 product format “ultrastik" The following entries are available when configuring the joystick controller id: This number is 1-4. This states which joystick this configuration is for. map size: Always set to 9 restrictor: true or false. If you have the restrictor plate installed then this should be true -flash: true or false. If you want to flash the RAM. See the ultiStik 360 webpage for more information +flash: true or false. If you want to flash the RAM. See the UltraStik 360 webpage for more information borders: array with the following numbers [30, 58, 86, 114, 142, 170, 198, 226] map: An array with 81 elements for each square of the joystick. The following strings are valid entries; “-”: empty diff --git a/README.md b/README.md index 690f8b5..5aba79e 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Ultimarc-linux Library and command line utility #### Introduction: -This utility will configure the following Ultimarc boards; ServoStik, PACDrive, IPAC Ultimate, I-Pac 2, I-Pac 4, Mini-Pac, JPAC, UltraStik 360, PacLED64, U-HID and U-HID Nano. There is support for the PAC 2015 boards, Ultistik 2015 board and the previous generation of the PAC boards. It uses json configuration files to configure the different boards. It also supports the ability to change the device ID of the UltiStik 360 boards. Allowing for the configuring of four different boards at once. +This utility will configure the following Ultimarc boards; ServoStik, PACDrive, IPAC Ultimate, I-Pac 2, I-Pac 4, Mini-Pac, JPAC, UltraStik 360, PacLED64, U-HID and U-HID Nano. There is support for the PAC 2015 boards, UltraStik 2015 board and the previous generation of the PAC boards. It uses json configuration files to configure the different boards. It also supports the ability to change the device ID of the UltraStik 360 boards. Allowing for the configuring of four different boards at once. This library and command line utility support 2012 through 2015 boards. If you need support for older Ultimarc boards, please look at the following utility developed by Travis, Ipacutil or use the Windows WinIpac v1 from Ultimarc diff --git a/src/libs/Makefile.am b/src/libs/Makefile.am index 40ec4eb..e0ea45a 100644 --- a/src/libs/Makefile.am +++ b/src/libs/Makefile.am @@ -5,7 +5,7 @@ AM_LDFLAGS = $(JSON_LIBS) $(LIBUSB_LIBS) lib_LTLIBRARIES = libultimarc.la -libultimarc_la_SOURCES = ultimarc.c ipac.c ultistik.c pacLED.c common.c pacdrive.c ipacultimate.c ipacseries.c ulboard.c usbbutton.c servostik.c uhid.c ipac.h ultistik.h pacLED.h common.h pacdrive.h ipacultimate.h dbg.h ipacseries.h usbbutton.h servostik.h uhid.h +libultimarc_la_SOURCES = ultimarc.c ipac.c ultrastik.c pacLED.c common.c pacdrive.c ipacultimate.c ipacseries.c ulboard.c usbbutton.c servostik.c uhid.c ipac.h ultrastik.h pacLED.h common.h pacdrive.h ipacultimate.h dbg.h ipacseries.h usbbutton.h servostik.h uhid.h libultimarc_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:1:0 otherincludedir = $(includedir)/ultimarc diff --git a/src/libs/servostik.c b/src/libs/servostik.c index 078d6de..517715b 100644 --- a/src/libs/servostik.c +++ b/src/libs/servostik.c @@ -82,7 +82,7 @@ bool validateServoStikData(json_object* jobj, ulboard* board) return result; } -bool updateServoStik (json_object* bcfg, ulboard* board) +bool updateBoardServoStik (json_object* bcfg, ulboard* board) { bool result = false; diff --git a/src/libs/servostik.h b/src/libs/servostik.h index bca7bb1..5135e2f 100644 --- a/src/libs/servostik.h +++ b/src/libs/servostik.h @@ -30,7 +30,7 @@ typedef struct ulboard ulboard; bool isServoStikConfig(json_object *jobj, ulboard* board); bool validateServoStikData(json_object* jobj, ulboard* board); -bool updateServoStik(json_object* bcfg, ulboard* board); +bool updateBoardServoStik(json_object* bcfg, ulboard* board); bool writeServoStik(unsigned char* barray, int autoconnect, bool transfer); diff --git a/src/libs/uhid.c b/src/libs/uhid.c index 8c81ed6..07d27c5 100644 --- a/src/libs/uhid.c +++ b/src/libs/uhid.c @@ -713,7 +713,7 @@ int decipherUHidLookupKey (const char* key) return lkey; } -bool updateUHid (json_object* bcfg, ulboard* board) +bool updateBoardUHid (json_object* bcfg, ulboard* board) { unsigned char* barray = NULL; diff --git a/src/libs/uhid.h b/src/libs/uhid.h index 09ea299..39ca7b6 100644 --- a/src/libs/uhid.h +++ b/src/libs/uhid.h @@ -40,7 +40,7 @@ bool validateUHidMacros(json_object* jobj, bool curResult); bool validateUHidCalibration(json_object* jobj, bool curResult); bool validateUHidQuadratureButtonTime(json_object* jobj, bool curResult); -bool updateUHid(json_object* bcfg, ulboard* board); +bool updateBoardUHid(json_object* bcfg, ulboard* board); void populateUHidBoardArray(enum uhid_boards_t bid, json_object* jobj, unsigned char* barray); void populateUHidMacro(json_object* jobj, unsigned char* barray); diff --git a/src/libs/ulboard.c b/src/libs/ulboard.c index be5b330..4e21ecf 100644 --- a/src/libs/ulboard.c +++ b/src/libs/ulboard.c @@ -15,7 +15,7 @@ #define ULSIZE(a) (sizeof(a)/sizeof(a[0])) const char* ulBoardTypeName[] = { "null", "IPAC2", "IPAC4", "JPAC", "MINIPAC", "ULTIMATE", - "PACDRIVE", "PACLED64", "ULTISTIK", "USBBUTTON", "SERVOSTIK", + "PACDRIVE", "PACLED64", "ULTRASTIK", "USBBUTTON", "SERVOSTIK", "UHID", "UHID NANO"}; const char* ulBoardVersionName[] = diff --git a/src/libs/ulboard.h b/src/libs/ulboard.h index 135fba6..ee44873 100644 --- a/src/libs/ulboard.h +++ b/src/libs/ulboard.h @@ -27,7 +27,7 @@ typedef enum ulboard_type ulboard_type_ultimate, ulboard_type_pacDrive, ulboard_type_pacLED, - ulboard_type_ultistik, + ulboard_type_ultrastik, ulboard_type_usbbutton, ulboard_type_servostik, ulboard_type_uhid, diff --git a/src/libs/ultimarc.c b/src/libs/ultimarc.c index 1039b84..abbc9d1 100644 --- a/src/libs/ultimarc.c +++ b/src/libs/ultimarc.c @@ -22,7 +22,7 @@ #include "ulboard.h" #include "ipac.h" #include "pacLED.h" -#include "ultistik.h" +#include "ultrastik.h" #include "pacdrive.h" #include "ipacultimate.h" #include "usbbutton.h" @@ -45,7 +45,7 @@ ulValidateConfig (json_object* bcfg, ulboard* ulcfg) || isIPACUltimateConfig (bcfg, ulcfg) || isPACDriveConfig (bcfg, ulcfg) || isPACLED64Config (bcfg, ulcfg) - || isUltistikConfig (bcfg, ulcfg) + || isUltraStikConfig (bcfg, ulcfg) || isUSBButtonConfig(bcfg, ulcfg) || isServoStikConfig(bcfg, ulcfg) || isUHidConfig (bcfg, ulcfg)) @@ -111,25 +111,26 @@ ulWriteToBoard (json_object* bcfg, ulboard* board) log_info("Updating PAC LED 64 board..."); ret = updateBoardPacLED (bcfg); } - else if (board->type == ulboard_type_ultistik) + else if (board->type == ulboard_type_ultrastik) { - log_info("Updating Ultistik board..."); - ret = updateBoardULTISTIK (bcfg, board); + log_info("Updating UltraStik board..."); + ret = updateBoardUltraStik (bcfg, board); } else if (board->type == ulboard_type_usbbutton) { - log_info("Updating USBButton..."); - ret = updateUSBButton (bcfg, board); + log_info("Updating USBButton board..."); + ret = updateBoardUSBButton (bcfg, board); } else if (board->type == ulboard_type_servostik) { - log_info("Updating ServoStik..."); - ret = updateServoStik (bcfg, board); + log_info("Updating ServoStik board..."); + ret = updateBoardServoStik (bcfg, board); } else if (board->type == ulboard_type_uhid || board->type == ulboard_type_uhidNano) { - ret = updateUHid (bcfg, board); + log_info("Updating UHid board..."); + ret = updateBoardUHid (bcfg, board); } if (ret) diff --git a/src/libs/ultistik.c b/src/libs/ultrastik.c similarity index 95% rename from src/libs/ultistik.c rename to src/libs/ultrastik.c index 9f78090..d50bfb8 100644 --- a/src/libs/ultistik.c +++ b/src/libs/ultrastik.c @@ -1,10 +1,10 @@ /* ============================================================================ - Name : ultistik.c + Name : ultrastik.c Author : Robert Abram, Katie Snow Version : Copyright : Copyright 2014 Robert Abram, Katie Snow - Description : Ultimarc Ultistik configuration library + Description : Ultimarc UltraStik configuration library ============================================================================ */ @@ -18,23 +18,23 @@ /* Local */ #include "common.h" -#include "ultistik.h" +#include "ultrastik.h" #include "dbg.h" #include "ulboard.h" -bool isUltistikConfig (json_object* jobj, ulboard* board) +bool isUltraStikConfig (json_object* jobj, ulboard* board) { bool isBoardCfg = false; - if (board->type == ulboard_type_ultistik) + if (board->type == ulboard_type_ultrastik) { - isBoardCfg = validateUltistikData(jobj, board); + isBoardCfg = validateUltraStikData(jobj, board); } return isBoardCfg; } -bool validateUltistikData(json_object* jobj, ulboard* board) +bool validateUltraStikData(json_object* jobj, ulboard* board) { int idx = 0; bool valid = false; @@ -62,7 +62,7 @@ bool validateUltistikData(json_object* jobj, ulboard* board) for (idx = 0; idx < json_object_array_length(tmp); ++ idx) { key = json_object_array_get_idx(tmp, idx); - data = convertULTISTIK (key); + data = convertUltraStik (key); if (strcmp(&invalidKey, &data) == -1) { log_err ("Error at index %i in 'map' array, entry is '%s'", idx, json_object_get_string(key)); @@ -195,14 +195,14 @@ bool validateUltistikData(json_object* jobj, ulboard* board) } else { - log_err ("Ultistik configuration file is not configured correctly"); + log_err ("UltraStik configuration file is not configured correctly"); } return valid; } char -convertULTISTIK (json_object *jobj) +convertUltraStik (json_object *jobj) { char retval = 0xFF; const char* str = json_object_get_string(jobj); @@ -236,7 +236,7 @@ convertULTISTIK (json_object *jobj) return retval; } -bool updateBoardULTISTIK (json_object* jobj, ulboard* board) +bool updateBoardUltraStik (json_object* jobj, ulboard* board) { int idx = 0; int itemidx = 0; @@ -306,7 +306,7 @@ bool updateBoardULTISTIK (json_object* jobj, ulboard* board) for (idx = 0; idx < json_object_array_length(innerobj); ++ idx) { item = json_object_array_get_idx(innerobj, idx); - data[itemidx] = convertULTISTIK(item); + data[itemidx] = convertUltraStik(item); ++itemidx; } @@ -494,7 +494,7 @@ bool updateBoardULTISTIK (json_object* jobj, ulboard* board) break; } - log_info ("Ultistik #%i needs to be physically disconnected and reconnected before use.", controlNew); + log_info ("UltraStik #%i needs to be physically disconnected and reconnected before use.", controlNew); } /* I know these have the same statement currently, but leaving diff --git a/src/libs/ultistik.h b/src/libs/ultrastik.h similarity index 72% rename from src/libs/ultistik.h rename to src/libs/ultrastik.h index 6dd5c2c..3550a61 100644 --- a/src/libs/ultistik.h +++ b/src/libs/ultrastik.h @@ -1,15 +1,15 @@ /* ============================================================================ - Name : ultistik.h + Name : ultrastik.h Author : Robert Abram, Katie Snow Version : Copyright : Copyright 2014 Robert Abram, Katie Snow - Description : Ultimarc Ultistik configuration library + Description : Ultimarc UltraStik configuration library ============================================================================ */ -#ifndef ULTISTIK_H_ -#define ULTISTIK_H_ +#ifndef ULTRASTIK_H_ +#define ULTRASTIK_H_ #include @@ -38,20 +38,20 @@ extern "C" { typedef struct json_object json_object; typedef struct ulboard ulboard; -bool isUltistikConfig (json_object* jobj, ulboard* board); +bool isUltraStikConfig (json_object* jobj, ulboard* board); -bool validateUltistikData(json_object* jobj, ulboard* board); +bool validateUltraStikData(json_object* jobj, ulboard* board); /* - * Convert the JSON keys data into Ultistik data + * Convert the JSON keys data into UltraStik data * This is done one array element at a time */ -char convertULTISTIK (json_object* jobj); +char convertUltraStik (json_object* jobj); -bool updateBoardULTISTIK (json_object* jobj, ulboard* board); +bool updateBoardUltraStik (json_object* jobj, ulboard* board); #ifdef __cplusplus } #endif -#endif /* ULTISTIK_H_ */ +#endif /* ULTRASTIK_H_ */ diff --git a/src/libs/usbbutton.c b/src/libs/usbbutton.c index 6cad75f..0a161eb 100644 --- a/src/libs/usbbutton.c +++ b/src/libs/usbbutton.c @@ -292,7 +292,7 @@ int usbKeyLookupTable[8][6] = { }; -bool updateUSBButton(json_object* bcfg, ulboard* board) +bool updateBoardUSBButton(json_object* bcfg, ulboard* board) { bool result = false; @@ -302,18 +302,18 @@ bool updateUSBButton(json_object* bcfg, ulboard* board) { if (json_object_object_get_ex(bcfg, "color", &tmp)) { - result = updateUSBButtonColor(tmp, board); + result = updateBoardUSBButtonColor(tmp, board); } else { - result = updateUSBButtonData(bcfg, board); + result = updateBoardUSBButtonData(bcfg, board); } } return result; } -bool updateUSBButtonColor(json_object* bcfg, ulboard* board) +bool updateBoardUSBButtonColor(json_object* bcfg, ulboard* board) { bool result = false; @@ -339,7 +339,7 @@ bool updateUSBButtonColor(json_object* bcfg, ulboard* board) return result; } -bool updateUSBButtonData(json_object* bcfg, ulboard* board) +bool updateBoardUSBButtonData(json_object* bcfg, ulboard* board) { bool result = false; diff --git a/src/libs/usbbutton.h b/src/libs/usbbutton.h index f0f42ef..216c467 100644 --- a/src/libs/usbbutton.h +++ b/src/libs/usbbutton.h @@ -32,9 +32,9 @@ bool validateUSBButtonColor(json_object* jobj, bool curResult); bool validateUSBButtonData(json_object* jobj, ulboard* board); bool validateUSBButtonRowData(json_object* entries, const char* rowStr, bool curResult); -bool updateUSBButton(json_object* bcfg, ulboard* board); -bool updateUSBButtonColor(json_object* bcfg, ulboard* board); -bool updateUSBButtonData(json_object* bcfg, ulboard* board); +bool updateBoardUSBButton(json_object* bcfg, ulboard* board); +bool updateBoardUSBButtonColor(json_object* bcfg, ulboard* board); +bool updateBoardUSBButtonData(json_object* bcfg, ulboard* board); void populateUSBKeys(json_object* keys, int row, unsigned char* barray); bool writeUSBButton(unsigned char* barray, int autoconnect, bool transfer, unsigned int size); diff --git a/src/test/start.json b/src/test/start.json index 1eafc38..fcc3554 100644 --- a/src/test/start.json +++ b/src/test/start.json @@ -21,18 +21,18 @@ "../test/pacLED_invalid_current_board_id_2.json", "../test/pacLED_invalid_new_board_id_1.json", "../test/pacLED_invalid_new_board_id_2.json", - "../test/ultistik_invalid_controller_id.json", - "../test/ultistik_invalid_missing_controller_id.json", - "../test/ultistik_invalid_missing_5.json", - "../test/ultistik_invalid_map_size_1.json", - "../test/ultistik_invalid_map_size_2.json", - "../test/ultistik_invalid_restrictor_1.json", - "../test/ultistik_invalid_flash_1.json", - "../test/ultistik_invalid_borders_1.json", - "../test/ultistik_invalid_borders_2.json", - "../test/ultistik_invalid_map_1.json", - "../test/ultistik_invalid_map_2.json", - "../test/ultistik_invalid_map_3.json", + "../test/ultrastik_invalid_controller_id.json", + "../test/ultrastik_invalid_missing_controller_id.json", + "../test/ultrastik_invalid_missing_5.json", + "../test/ultrastik_invalid_map_size_1.json", + "../test/ultrastik_invalid_map_size_2.json", + "../test/ultrastik_invalid_restrictor_1.json", + "../test/ultrastik_invalid_flash_1.json", + "../test/ultrastik_invalid_borders_1.json", + "../test/ultrastik_invalid_borders_2.json", + "../test/ultrastik_invalid_map_1.json", + "../test/ultrastik_invalid_map_2.json", + "../test/ultrastik_invalid_map_3.json", "../test/pacdrive_invalid_led_1.json", "../test/pacdrive_invalid_led_2.json", "../test/pacdrive_invalid_led_3.json", diff --git a/src/test/ultistik_invalid_borders_1.json b/src/test/ultrastik_invalid_borders_1.json similarity index 100% rename from src/test/ultistik_invalid_borders_1.json rename to src/test/ultrastik_invalid_borders_1.json diff --git a/src/test/ultistik_invalid_borders_2.json b/src/test/ultrastik_invalid_borders_2.json similarity index 100% rename from src/test/ultistik_invalid_borders_2.json rename to src/test/ultrastik_invalid_borders_2.json diff --git a/src/test/ultistik_invalid_controller_id.json b/src/test/ultrastik_invalid_controller_id.json similarity index 100% rename from src/test/ultistik_invalid_controller_id.json rename to src/test/ultrastik_invalid_controller_id.json diff --git a/src/test/ultistik_invalid_flash_1.json b/src/test/ultrastik_invalid_flash_1.json similarity index 100% rename from src/test/ultistik_invalid_flash_1.json rename to src/test/ultrastik_invalid_flash_1.json diff --git a/src/test/ultistik_invalid_map_1.json b/src/test/ultrastik_invalid_map_1.json similarity index 100% rename from src/test/ultistik_invalid_map_1.json rename to src/test/ultrastik_invalid_map_1.json diff --git a/src/test/ultistik_invalid_map_2.json b/src/test/ultrastik_invalid_map_2.json similarity index 100% rename from src/test/ultistik_invalid_map_2.json rename to src/test/ultrastik_invalid_map_2.json diff --git a/src/test/ultistik_invalid_map_3.json b/src/test/ultrastik_invalid_map_3.json similarity index 100% rename from src/test/ultistik_invalid_map_3.json rename to src/test/ultrastik_invalid_map_3.json diff --git a/src/test/ultistik_invalid_map_size_1.json b/src/test/ultrastik_invalid_map_size_1.json similarity index 100% rename from src/test/ultistik_invalid_map_size_1.json rename to src/test/ultrastik_invalid_map_size_1.json diff --git a/src/test/ultistik_invalid_map_size_2.json b/src/test/ultrastik_invalid_map_size_2.json similarity index 100% rename from src/test/ultistik_invalid_map_size_2.json rename to src/test/ultrastik_invalid_map_size_2.json diff --git a/src/test/ultistik_invalid_missing_5.json b/src/test/ultrastik_invalid_missing_5.json similarity index 100% rename from src/test/ultistik_invalid_missing_5.json rename to src/test/ultrastik_invalid_missing_5.json diff --git a/src/test/ultistik_invalid_missing_controller_id.json b/src/test/ultrastik_invalid_missing_controller_id.json similarity index 100% rename from src/test/ultistik_invalid_missing_controller_id.json rename to src/test/ultrastik_invalid_missing_controller_id.json diff --git a/src/test/ultistik_invalid_restrictor_1.json b/src/test/ultrastik_invalid_restrictor_1.json similarity index 100% rename from src/test/ultistik_invalid_restrictor_1.json rename to src/test/ultrastik_invalid_restrictor_1.json diff --git a/src/umtool/multiple.json b/src/umtool/multiple.json index f722786..d35bbe6 100644 --- a/src/umtool/multiple.json +++ b/src/umtool/multiple.json @@ -1,6 +1,6 @@ { "list" : [ "pacLED.json", - "ultistik_2015_map2way.json" + "ultrastik_2015_map2way.json" ] } diff --git a/src/umtool/ultistik_2014_config.json b/src/umtool/ultrastik_2014_config.json similarity index 74% rename from src/umtool/ultistik_2014_config.json rename to src/umtool/ultrastik_2014_config.json index 5bf5007..df79794 100644 --- a/src/umtool/ultistik_2014_config.json +++ b/src/umtool/ultrastik_2014_config.json @@ -1,6 +1,6 @@ { "version" : 1, - "product" : "ultistik", + "product" : "ultrastik", "current controller id" : 4, "new controller id" : 1 } diff --git a/src/umtool/ultistik_2014_map2way.json b/src/umtool/ultrastik_2014_map2way.json similarity index 96% rename from src/umtool/ultistik_2014_map2way.json rename to src/umtool/ultrastik_2014_map2way.json index 6146ae6..b441005 100644 --- a/src/umtool/ultistik_2014_map2way.json +++ b/src/umtool/ultrastik_2014_map2way.json @@ -1,6 +1,6 @@ { "version" : 1, - "product" : "ultistik", + "product" : "ultrastik", "controller id" : 1, "map size" : 9, "restrictor" : false, diff --git a/src/umtool/ultistik_2015_analog.json b/src/umtool/ultrastik_2015_analog.json similarity index 96% rename from src/umtool/ultistik_2015_analog.json rename to src/umtool/ultrastik_2015_analog.json index c7f74e0..d648510 100644 --- a/src/umtool/ultistik_2015_analog.json +++ b/src/umtool/ultrastik_2015_analog.json @@ -1,6 +1,6 @@ { "version" : 2, - "product" : "ultistik", + "product" : "ultrastik", "controller id" : 1, "map size" : 9, "restrictor" : false, diff --git a/src/umtool/ultistik_2015_config.json b/src/umtool/ultrastik_2015_config.json similarity index 74% rename from src/umtool/ultistik_2015_config.json rename to src/umtool/ultrastik_2015_config.json index a40ab01..5494c33 100644 --- a/src/umtool/ultistik_2015_config.json +++ b/src/umtool/ultrastik_2015_config.json @@ -1,6 +1,6 @@ { "version" : 2, - "product" : "ultistik", + "product" : "ultrastik", "current controller id" : 4, "new controller id" : 1 } diff --git a/src/umtool/ultistik_2015_djoy4way.json b/src/umtool/ultrastik_2015_djoy4way.json similarity index 96% rename from src/umtool/ultistik_2015_djoy4way.json rename to src/umtool/ultrastik_2015_djoy4way.json index 75375fd..bb6162f 100644 --- a/src/umtool/ultistik_2015_djoy4way.json +++ b/src/umtool/ultrastik_2015_djoy4way.json @@ -1,6 +1,6 @@ { "version" : 2, - "product" : "ultistik", + "product" : "ultrastik", "controller id" : 1, "map size" : 9, "restrictor" : false, diff --git a/src/umtool/ultistik_2015_easyjoy8way.json b/src/umtool/ultrastik_2015_easyjoy8way.json similarity index 96% rename from src/umtool/ultistik_2015_easyjoy8way.json rename to src/umtool/ultrastik_2015_easyjoy8way.json index 9839e57..37db9c0 100644 --- a/src/umtool/ultistik_2015_easyjoy8way.json +++ b/src/umtool/ultrastik_2015_easyjoy8way.json @@ -1,6 +1,6 @@ { "version" : 2, - "product" : "ultistik", + "product" : "ultrastik", "controller id" : 1, "map size" : 9, "restrictor" : false, diff --git a/src/umtool/ultistik_2015_joy2way.json b/src/umtool/ultrastik_2015_joy2way.json similarity index 96% rename from src/umtool/ultistik_2015_joy2way.json rename to src/umtool/ultrastik_2015_joy2way.json index 7302191..96f3bad 100644 --- a/src/umtool/ultistik_2015_joy2way.json +++ b/src/umtool/ultrastik_2015_joy2way.json @@ -1,6 +1,6 @@ { "version" : 2, - "product" : "ultistik", + "product" : "ultrastik", "controller id" : 1, "map size" : 9, "restrictor" : false, diff --git a/src/umtool/ultistik_2015_joy4way.json b/src/umtool/ultrastik_2015_joy4way.json similarity index 96% rename from src/umtool/ultistik_2015_joy4way.json rename to src/umtool/ultrastik_2015_joy4way.json index 63bacb2..5b3f25a 100644 --- a/src/umtool/ultistik_2015_joy4way.json +++ b/src/umtool/ultrastik_2015_joy4way.json @@ -1,6 +1,6 @@ { "version" : 2, - "product" : "ultistik", + "product" : "ultrastik", "controller id" : 1, "map size" : 9, "restrictor" : false, diff --git a/src/umtool/ultistik_2015_joy8way.json b/src/umtool/ultrastik_2015_joy8way.json similarity index 96% rename from src/umtool/ultistik_2015_joy8way.json rename to src/umtool/ultrastik_2015_joy8way.json index 2381fa4..7056784 100644 --- a/src/umtool/ultistik_2015_joy8way.json +++ b/src/umtool/ultrastik_2015_joy8way.json @@ -1,6 +1,6 @@ { "version" : 2, - "product" : "ultistik", + "product" : "ultrastik", "controller id" : 1, "map size" : 9, "restrictor" : false, diff --git a/src/umtool/ultistik_2015_map2way.json b/src/umtool/ultrastik_2015_map2way.json similarity index 96% rename from src/umtool/ultistik_2015_map2way.json rename to src/umtool/ultrastik_2015_map2way.json index ed9bf44..5d28fee 100644 --- a/src/umtool/ultistik_2015_map2way.json +++ b/src/umtool/ultrastik_2015_map2way.json @@ -1,6 +1,6 @@ { "version" : 2, - "product" : "ultistik", + "product" : "ultrastik", "controller id" : 1, "map size" : 9, "restrictor" : false, diff --git a/src/umtool/ultistik_2015_mouse.json b/src/umtool/ultrastik_2015_mouse.json similarity index 96% rename from src/umtool/ultistik_2015_mouse.json rename to src/umtool/ultrastik_2015_mouse.json index 9d0eae9..e4e3f1a 100644 --- a/src/umtool/ultistik_2015_mouse.json +++ b/src/umtool/ultrastik_2015_mouse.json @@ -1,6 +1,6 @@ { "version" : 2, - "product" : "ultistik", + "product" : "ultrastik", "controller id" : 1, "map size" : 9, "restrictor" : false, diff --git a/src/umtool/ultistik_2015_udbjoy4way.json b/src/umtool/ultrastik_2015_udbjoy4way.json similarity index 96% rename from src/umtool/ultistik_2015_udbjoy4way.json rename to src/umtool/ultrastik_2015_udbjoy4way.json index 2c7da6a..c20da4a 100644 --- a/src/umtool/ultistik_2015_udbjoy4way.json +++ b/src/umtool/ultrastik_2015_udbjoy4way.json @@ -1,6 +1,6 @@ { "version" : 2, - "product" : "ultistik", + "product" : "ultrastik", "controller id" : 1, "map size" : 9, "restrictor" : false, diff --git a/src/umtool/ultistik_2015_vjoy2way.json b/src/umtool/ultrastik_2015_vjoy2way.json similarity index 96% rename from src/umtool/ultistik_2015_vjoy2way.json rename to src/umtool/ultrastik_2015_vjoy2way.json index ed9bf44..5d28fee 100644 --- a/src/umtool/ultistik_2015_vjoy2way.json +++ b/src/umtool/ultrastik_2015_vjoy2way.json @@ -1,6 +1,6 @@ { "version" : 2, - "product" : "ultistik", + "product" : "ultrastik", "controller id" : 1, "map size" : 9, "restrictor" : false,