Skip to content

Commit

Permalink
bump version to v2.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@kirainmoe
kirainmoe committed Jul 9, 2020
1 parent b955592 commit 3f671b9
Show file tree
Hide file tree
Showing 13 changed files with 228 additions and 275 deletions.
2 changes: 1 addition & 1 deletion starbeat-client/build/asset-manifest.json
View file
Expand Up @@ -9,7 +9,7 @@
"static/js/2.chunk.js": "./static/js/2.chunk.js",
"static/js/2.chunk.js.map": "./static/js/2.chunk.js.map",
"index.html": "./index.html",
"precache-manifest.0cdf736ee87c3857b2c3d55961299085.js": "./precache-manifest.0cdf736ee87c3857b2c3d55961299085.js",
"precache-manifest.04f66e679a0d7baa7ffe2abb5c46e8f3.js": "./precache-manifest.04f66e679a0d7baa7ffe2abb5c46e8f3.js",
"service-worker.js": "./service-worker.js",
"static/css/2.chunk.css.map": "./static/css/2.chunk.css.map",
"static/css/main.chunk.css.map": "./static/css/main.chunk.css.map",
Expand Down
89 changes: 64 additions & 25 deletions starbeat-client/build/electron/hidutils.js
View file
Expand Up @@ -64,57 +64,96 @@ const initColorUtils = () => {
};

const monoColor = (red, green, blue, save, block, brightness) => {
const packet = [0x14, 0x00, 0x01, red, green, blue, 0x00, 0x00],
endPacket = [0x08, 0x02, 0x01, 0x05, brightness, 0x08, 0x00, save ? 0x01 : 0x00];

if (block) { // set specific block
packet[2] = block;
device.sendFeatureReport(packet.zeroFill(16));
} else {
// keyboard has 4 discrete color areas
for (let i = 1; i <= 4; i++) {
if (getITErevision() === 2) {
const packet = [0x14, 0x00, 0x01, red, green, blue, 0x00, 0x00],
endPacket = [0x08, 0x02, 0x01, 0x05, brightness, 0x08, 0x00, save ? 0x01 : 0x00];
if (block) { // set specific block
packet[2] = block;
device.sendFeatureReport(packet.zeroFill(16));
packet[2]++;
} else {
// keyboard has 4 discrete color areas
for (let i = 1; i <= 4; i++) {
device.sendFeatureReport(packet.zeroFill(16));
packet[2]++;
}
}
// send ending packet
device.sendFeatureReport(endPacket.zeroFill(16));
} else {
const commandPacket = [0x08, 0x02, 0x33, 0x0, 0x32, 0x0, 0x0, 0x0];
device.sendFeatureReport(commandPacket);

const endPacket = [0x12, 0x00, 0x00, 0x08, save ? 0x01 : 0x00, 0x00, 0x00, 0x00];
device.sendFeatureReport(endPacket);

let colorPacket = [];
for (let i = 0; i < 16; i++) {
colorPacket.push(red);
colorPacket.push(green);
colorPacket.push(blue);
}
device.sendFeatureReport(colorPacket);
}
// send ending packet
device.sendFeatureReport(endPacket.zeroFill(16));
};

const breathing = (save, speed, brightness) => {
const endPacket = [0x08, 0x02, 0x02, speed, brightness, 0x08, 0x00, save ? 0x01 : 0x00];
sendGenericPacket();
device.sendFeatureReport(endPacket.zeroFill(16));
if (getITErevision() === 2) {
sendGenericPacket();
device.sendFeatureReport(endPacket.zeroFill(16));
} else {
device.sendFeatureReport(endPacket);
}
};

const wave = (save, speed, brightness, direction) => {
const endPacket = [0x08, 0x02, 0x03, speed, brightness, 0x08, direction, save ? 0x01 : 0x00];
sendGenericPacket();
device.sendFeatureReport(endPacket.zeroFill(16));
if (getITErevision() === 2) {
sendGenericPacket();
device.sendFeatureReport(endPacket.zeroFill(16));
} else {
device.sendFeatureReport(endPacket);
}
};

const rainbow = (save, brightness) => {
for (let i = 1; i <= 4; i++)
device.sendFeatureReport([0x14, 0x00, i, ...rainbowColor[i-1], 0x00, 0x00].zeroFill(9));
const endPacket = [0x08, 0x02, 0x05, 0x05, brightness, 0x08, 0x00, save ? 0x01 : 0x00];
device.sendFeatureReport(endPacket.zeroFill(9));
if (getITErevision() === 2) {
const endPacket = [0x08, 0x02, 0x05, 0x05, brightness, 0x08, 0x00, save ? 0x01 : 0x00];
for (let i = 1; i <= 4; i++)
device.sendFeatureReport([0x14, 0x00, i, ...rainbowColor[i-1], 0x00, 0x00].zeroFill(9));
device.sendFeatureReport(endPacket.zeroFill(9));
} else {
const endPacket = [0x08, 0x02, 0x05, 0x05, brightness, 0x00, 0x00, save ? 0x01 : 0x00];
device.sendFeatureReport(endPacket);
}
};

const flash = (save, speed, brightness, direction) => {
const endPacket = [0x08, 0x02, 0x12, speed, brightness, 0x08, direction, save ? 0x01 : 0x00];
sendGenericPacket();
device.sendFeatureReport(endPacket.zeroFill(16));
if (getITErevision() === 2) {
sendGenericPacket();
device.sendFeatureReport(endPacket.zeroFill(16));
} else {
device.sendFeatureReport(endPacket);
}
};

const mix = (save, speed, brightness) => {
const endPacket = [0x08, 0x02, 0x13, speed, brightness, 0x08, 0x00, save ? 0x01 : 0x00];
sendGenericPacket();
device.sendFeatureReport(endPacket.zeroFill(16));
if (getITErevision() === 2) {
sendGenericPacket();
device.sendFeatureReport(endPacket.zeroFill(16));
} else {
device.sendFeatureReport(endPacket);
}
};

const disabler = () => {
const endPacket = [0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00];
device.sendFeatureReport(endPacket.zeroFill(16));
if (getITErevision() === 2)
device.sendFeatureReport(endPacket.zeroFill(16));
else
device.sendFeatureReport(endPacket);
}

return {
Expand Down
2 changes: 1 addition & 1 deletion starbeat-client/build/index.html
View file
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link href="https://fonts.googleapis.com/css?family=Zhi+Mang+Xing&display=swap" rel="stylesheet"><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><title>Tongfang Hackintosh Utility</title><link href="./static/css/2.chunk.css" rel="stylesheet"><link href="./static/css/main.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="./electron/hidutils.js"></script><script src="./electron/electronCompat.js"></script><script>!function(e){function t(t){for(var n,a,l=t[0],f=t[1],i=t[2],p=0,s=[];p<l.length;p++)a=l[p],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&s.push(o[a][0]),o[a]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(c&&c(t);s.length;)s.shift()();return u.push.apply(u,i||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,l=1;l<r.length;l++){var f=r[l];0!==o[f]&&(n=!1)}n&&(u.splice(t--,1),e=a(a.s=r[0]))}return e}var n={},o={1:0},u=[];function a(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,a),r.l=!0,r.exports}a.m=e,a.c=n,a.d=function(e,t,r){a.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,t){if(1&t&&(e=a(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(a.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)a.d(r,n,function(t){return e[t]}.bind(null,n));return r},a.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(t,"a",t),t},a.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},a.p="./";var l=this["webpackJsonpstarbeat-backend"]=this["webpackJsonpstarbeat-backend"]||[],f=l.push.bind(l);l.push=t,l=l.slice();for(var i=0;i<l.length;i++)t(l[i]);var c=f;r()}([])</script><script src="./static/js/2.chunk.js"></script><script src="./static/js/main.chunk.js"></script></body></html>
<!doctype html><html lang="zh-cn"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link href="https://fonts.googleapis.com/css?family=Zhi+Mang+Xing&display=swap" rel="stylesheet"><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><title>Tongfang Hackintosh Utility</title><link href="./static/css/2.chunk.css" rel="stylesheet"><link href="./static/css/main.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="./electron/hidutils.js"></script><script src="./electron/electronCompat.js"></script><script>!function(e){function t(t){for(var n,a,l=t[0],f=t[1],i=t[2],p=0,s=[];p<l.length;p++)a=l[p],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&s.push(o[a][0]),o[a]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(c&&c(t);s.length;)s.shift()();return u.push.apply(u,i||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,l=1;l<r.length;l++){var f=r[l];0!==o[f]&&(n=!1)}n&&(u.splice(t--,1),e=a(a.s=r[0]))}return e}var n={},o={1:0},u=[];function a(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,a),r.l=!0,r.exports}a.m=e,a.c=n,a.d=function(e,t,r){a.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,t){if(1&t&&(e=a(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(a.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)a.d(r,n,function(t){return e[t]}.bind(null,n));return r},a.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(t,"a",t),t},a.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},a.p="./";var l=this["webpackJsonpstarbeat-backend"]=this["webpackJsonpstarbeat-backend"]||[],f=l.push.bind(l);l.push=t,l=l.slice();for(var i=0;i<l.length;i++)t(l[i]);var c=f;r()}([])</script><script src="./static/js/2.chunk.js"></script><script src="./static/js/main.chunk.js"></script></body></html>
6 changes: 3 additions & 3 deletions ...ifest.0cdf736ee87c3857b2c3d55961299085.js → ...ifest.04f66e679a0d7baa7ffe2abb5c46e8f3.js
View file
@@ -1,14 +1,14 @@
self.__precacheManifest = (self.__precacheManifest || []).concat([
{
"revision": "1670704588913f9912bda69985c25070",
"revision": "8e82088d25237a966e762adf2e517fab",
"url": "./index.html"
},
{
"revision": "dc3a3ba41bc1eccce49c",
"url": "./static/css/2.chunk.css"
},
{
"revision": "6b3cc1032c7100a33ea4",
"revision": "0b3528a22d30455d7ad0",
"url": "./static/css/main.chunk.css"
},
{
Expand All @@ -20,7 +20,7 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "./static/js/2.chunk.js.LICENSE.txt"
},
{
"revision": "6b3cc1032c7100a33ea4",
"revision": "0b3528a22d30455d7ad0",
"url": "./static/js/main.chunk.js"
},
{
Expand Down
2 changes: 1 addition & 1 deletion starbeat-client/build/service-worker.js
View file
Expand Up @@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");

importScripts(
"./precache-manifest.0cdf736ee87c3857b2c3d55961299085.js"
"./precache-manifest.04f66e679a0d7baa7ffe2abb5c46e8f3.js"
);

self.addEventListener('message', (event) => {
Expand Down
2 changes: 1 addition & 1 deletion starbeat-client/build/static/js/main.chunk.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion starbeat-client/build/static/js/main.chunk.js.map
View file

Large diffs are not rendered by default.

89 changes: 64 additions & 25 deletions starbeat-core/public/electron/hidutils.js
View file
Expand Up @@ -64,57 +64,96 @@ const initColorUtils = () => {
};

const monoColor = (red, green, blue, save, block, brightness) => {
const packet = [0x14, 0x00, 0x01, red, green, blue, 0x00, 0x00],
endPacket = [0x08, 0x02, 0x01, 0x05, brightness, 0x08, 0x00, save ? 0x01 : 0x00];

if (block) { // set specific block
packet[2] = block;
device.sendFeatureReport(packet.zeroFill(16));
} else {
// keyboard has 4 discrete color areas
for (let i = 1; i <= 4; i++) {
if (getITErevision() === 2) {
const packet = [0x14, 0x00, 0x01, red, green, blue, 0x00, 0x00],
endPacket = [0x08, 0x02, 0x01, 0x05, brightness, 0x08, 0x00, save ? 0x01 : 0x00];
if (block) { // set specific block
packet[2] = block;
device.sendFeatureReport(packet.zeroFill(16));
packet[2]++;
} else {
// keyboard has 4 discrete color areas
for (let i = 1; i <= 4; i++) {
device.sendFeatureReport(packet.zeroFill(16));
packet[2]++;
}
}
// send ending packet
device.sendFeatureReport(endPacket.zeroFill(16));
} else {
const commandPacket = [0x08, 0x02, 0x33, 0x0, 0x32, 0x0, 0x0, 0x0];
device.sendFeatureReport(commandPacket);

const endPacket = [0x12, 0x00, 0x00, 0x08, save ? 0x01 : 0x00, 0x00, 0x00, 0x00];
device.sendFeatureReport(endPacket);

let colorPacket = [];
for (let i = 0; i < 16; i++) {
colorPacket.push(red);
colorPacket.push(green);
colorPacket.push(blue);
}
device.sendFeatureReport(colorPacket);
}
// send ending packet
device.sendFeatureReport(endPacket.zeroFill(16));
};

const breathing = (save, speed, brightness) => {
const endPacket = [0x08, 0x02, 0x02, speed, brightness, 0x08, 0x00, save ? 0x01 : 0x00];
sendGenericPacket();
device.sendFeatureReport(endPacket.zeroFill(16));
if (getITErevision() === 2) {
sendGenericPacket();
device.sendFeatureReport(endPacket.zeroFill(16));
} else {
device.sendFeatureReport(endPacket);
}
};

const wave = (save, speed, brightness, direction) => {
const endPacket = [0x08, 0x02, 0x03, speed, brightness, 0x08, direction, save ? 0x01 : 0x00];
sendGenericPacket();
device.sendFeatureReport(endPacket.zeroFill(16));
if (getITErevision() === 2) {
sendGenericPacket();
device.sendFeatureReport(endPacket.zeroFill(16));
} else {
device.sendFeatureReport(endPacket);
}
};

const rainbow = (save, brightness) => {
for (let i = 1; i <= 4; i++)
device.sendFeatureReport([0x14, 0x00, i, ...rainbowColor[i-1], 0x00, 0x00].zeroFill(9));
const endPacket = [0x08, 0x02, 0x05, 0x05, brightness, 0x08, 0x00, save ? 0x01 : 0x00];
device.sendFeatureReport(endPacket.zeroFill(9));
if (getITErevision() === 2) {
const endPacket = [0x08, 0x02, 0x05, 0x05, brightness, 0x08, 0x00, save ? 0x01 : 0x00];
for (let i = 1; i <= 4; i++)
device.sendFeatureReport([0x14, 0x00, i, ...rainbowColor[i-1], 0x00, 0x00].zeroFill(9));
device.sendFeatureReport(endPacket.zeroFill(9));
} else {
const endPacket = [0x08, 0x02, 0x05, 0x05, brightness, 0x00, 0x00, save ? 0x01 : 0x00];
device.sendFeatureReport(endPacket);
}
};

const flash = (save, speed, brightness, direction) => {
const endPacket = [0x08, 0x02, 0x12, speed, brightness, 0x08, direction, save ? 0x01 : 0x00];
sendGenericPacket();
device.sendFeatureReport(endPacket.zeroFill(16));
if (getITErevision() === 2) {
sendGenericPacket();
device.sendFeatureReport(endPacket.zeroFill(16));
} else {
device.sendFeatureReport(endPacket);
}
};

const mix = (save, speed, brightness) => {
const endPacket = [0x08, 0x02, 0x13, speed, brightness, 0x08, 0x00, save ? 0x01 : 0x00];
sendGenericPacket();
device.sendFeatureReport(endPacket.zeroFill(16));
if (getITErevision() === 2) {
sendGenericPacket();
device.sendFeatureReport(endPacket.zeroFill(16));
} else {
device.sendFeatureReport(endPacket);
}
};

const disabler = () => {
const endPacket = [0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00];
device.sendFeatureReport(endPacket.zeroFill(16));
if (getITErevision() === 2)
device.sendFeatureReport(endPacket.zeroFill(16));
else
device.sendFeatureReport(endPacket);
}

return {
Expand Down
2 changes: 1 addition & 1 deletion starbeat-core/public/index.html
View file
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<html lang="zh-cn">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
Expand Down

0 comments on commit 3f671b9

Please sign in to comment.