diff --git a/.github/workflows/npmpublish.yml b/.github/workflows/npmpublish.yml index 588e786..b281f79 100644 --- a/.github/workflows/npmpublish.yml +++ b/.github/workflows/npmpublish.yml @@ -11,12 +11,15 @@ jobs: needs: [prebuild-macos] steps: + - uses: actions/setup-python@v4 + with: + python-version: '3.10' - name: Checkout repository uses: actions/checkout@v2 - name: Set up Node uses: actions/setup-node@master with: - node-version: "14.x" + node-version: "16.x" - name: npm install and build run: | npm ci @@ -42,10 +45,13 @@ jobs: runs-on: macos-11 steps: - uses: actions/checkout@v2 + - uses: actions/setup-python@v4 + with: + python-version: '3.10' - name: Set up Node uses: actions/setup-node@master with: - node-version: "14.x" + node-version: "16.x" - name: npm install and build run: | npm ci diff --git a/binding.gyp b/binding.gyp index 3e08108..5ce4fd4 100644 --- a/binding.gyp +++ b/binding.gyp @@ -19,15 +19,6 @@ "OS=='win'", { "conditions": [ - [ - "target_arch == 'ia32'", - { - "variables": { - "sdk_arch%": "", - "sdk_arch_path%": "i386" - } - } - ], [ "target_arch == 'x64'", { diff --git a/iCUESDK/include/iCUESDK.h b/iCUESDK/include/iCUESDK.h index 83c1811..bf5ffd0 100644 --- a/iCUESDK/include/iCUESDK.h +++ b/iCUESDK/include/iCUESDK.h @@ -57,6 +57,7 @@ enum CorsairDeviceType // contains list of available device types CDT_Motherboard = 0x0200, // for motherboards CDT_GraphicsCard = 0x0400, // for graphics cards CDT_Touchbar = 0x0800, // for touchbars + CDT_GameController = 0x1000, // for game controllers CDT_All = 0xFFFFFFFF // for all devices }; @@ -176,7 +177,8 @@ enum CorsairChannelDeviceType // contains list of the LED-devices which can be c CCDT_DAP = 8, CCDT_Pump = 9, CCDT_DRAM = 10, - CCDT_WaterBlock = 11 + CCDT_WaterBlock = 11, + CCDT_QX_Fan = 12, }; enum CorsairAccessLevel // contains list of available SDK access levels diff --git a/iCUESDK/include/iCUESDKLedIdEnum.h b/iCUESDK/include/iCUESDKLedIdEnum.h index 765a390..b9a7ce6 100644 --- a/iCUESDK/include/iCUESDKLedIdEnum.h +++ b/iCUESDK/include/iCUESDKLedIdEnum.h @@ -16,7 +16,8 @@ enum CorsairLedGroup // contains a list of led groups. Led group is used as a pa CLG_DIY_Channel1 = 11, // for leds on the first channel of DIY devices and coolers CLG_DIY_Channel2 = 12, // for leds on the second channel of DIY devices and coolers CLG_DIY_Channel3 = 13, // for leds on the third channel of DIY devices and coolers - CLG_Touchbar = 14 // for touchbar leds + CLG_Touchbar = 14, // for touchbar leds + CLG_GameController = 15 // for game controller leds }; enum CorsairLedId_Keyboard // contains a list of keyboard leds that belong to CLG_Keyboard group diff --git a/iCUESDK/lib/i386/iCUESDK_2019.lib b/iCUESDK/lib/i386/iCUESDK_2019.lib deleted file mode 100644 index 43ab7aa..0000000 Binary files a/iCUESDK/lib/i386/iCUESDK_2019.lib and /dev/null differ diff --git a/iCUESDK/mac/libiCUESDK.dylib b/iCUESDK/mac/libiCUESDK.dylib index 077d422..f79f0be 100644 Binary files a/iCUESDK/mac/libiCUESDK.dylib and b/iCUESDK/mac/libiCUESDK.dylib differ diff --git a/iCUESDK/redist/i386/iCUESDK_2019.dll b/iCUESDK/redist/i386/iCUESDK_2019.dll deleted file mode 100644 index 0e064a9..0000000 Binary files a/iCUESDK/redist/i386/iCUESDK_2019.dll and /dev/null differ diff --git a/iCUESDK/redist/x64/iCUESDK.x64_2019.dll b/iCUESDK/redist/x64/iCUESDK.x64_2019.dll index 11fe61b..62cd2cc 100644 Binary files a/iCUESDK/redist/x64/iCUESDK.x64_2019.dll and b/iCUESDK/redist/x64/iCUESDK.x64_2019.dll differ diff --git a/package-lock.json b/package-lock.json index 1624354..fe0dba4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cue-sdk", - "version": "4.0.0", + "version": "4.0.84", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "cue-sdk", - "version": "4.0.0", + "version": "4.0.84", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index af37d6a..1bdbb00 100644 --- a/package.json +++ b/package.json @@ -2,14 +2,14 @@ "name": "cue-sdk", "author": "Corsair Memory, Inc.", "license": "MIT", - "version": "4.0.0", + "version": "4.0.84", "description": "A Node.js native wrapper around iCUE SDK", "repository": "https://github.com/CorsairOfficial/cue-sdk-node", "main": "index.js", "scripts": { "install": "node-gyp-build", "gen:converters": "node templates/converters/index.js", - "prebuild": "prebuildify --napi --arch ia32 && prebuildify --napi --arch x64", + "prebuild": "prebuildify --napi --arch x64", "prebuild-mac": "prebuildify --napi --arch x64_arm64", "test": "node test" }, diff --git a/src/enums.js b/src/enums.js index 3e94368..3fc67ed 100644 --- a/src/enums.js +++ b/src/enums.js @@ -33,6 +33,7 @@ const CorsairDeviceType = { CDT_Motherboard: 0x0200, CDT_GraphicsCard: 0x0400, CDT_Touchbar: 0x0800, + CDT_GameController: 0x1000, CDT_All: 0xFFFFFFFF } @@ -120,7 +121,8 @@ const CorsairChannelDeviceType = { CCDT_DAP: 8, CCDT_Pump: 9, CCDT_DRAM: 10, - CCDT_WaterBlock: 11 + CCDT_WaterBlock: 11, + CCDT_QX_Fan: 12 } const CorsairAccessLevel = { @@ -145,7 +147,8 @@ const CorsairLedGroup = { CLG_DIY_Channel1: 11, CLG_DIY_Channel2: 12, CLG_DIY_Channel3: 13, - CLG_Touchbar: 14 + CLG_Touchbar: 14, + CLG_GameController: 15 } const CorsairLedId_Keyboard = { diff --git a/test.js b/test.js index 0405e24..0313618 100644 --- a/test.js +++ b/test.js @@ -3,7 +3,6 @@ const readline = require('readline'); const input_queue = []; readline.emitKeypressEvents(process.stdin); -process.stdin.setRawMode(true); process.stdin.on('keypress', (key, data) => { if (data.sequence === '\u0003') { // ^C