mirror of
https://gitlab.com/zwirbel/illucat.git
synced 2025-12-15 01:42:22 +01:00
no broadcast when dispatched
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"pin": 4,
|
"pin": 4,
|
||||||
"length": 3,
|
"length": 60,
|
||||||
"brightness": 64,
|
"brightness": 64,
|
||||||
"updateInterval": 150,
|
"updateInterval": 150,
|
||||||
"defaultColor": 100
|
"defaultColor": 100
|
||||||
|
|||||||
@@ -10784,9 +10784,11 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
const hues = [ ["#FDEB71", "#F8D800"], ["#ABDCFF", "#0396FF"], ["#FEB692", "#EA5455"], ["#CE9FFC", "#7367F0"], ["#90F7EC", "#32CCBC"], ["#FFF6B7", "#F6416C"], ["#81FBB8", "#28C76F"], ["#E2B0FF", "#9F44D3"], ["#F97794", "#623AA2"], ["#FCCF31", "#F55555"], ["#F761A1", "#8C1BAB"], ["#43CBFF", "#9708CC"], ["#5EFCE8", "#736EFE"], ["#FAD7A1", "#E96D71"], ["#FFD26F", "#3677FF"], ["#A0FE65", "#FA016D"], ["#FFDB01", "#0E197D"], ["#FEC163", "#DE4313"], ["#92FFC0", "#002661"], ["#EEAD92", "#6018DC"], ["#F6CEEC", "#D939CD"], ["#52E5E7", "#130CB7"], ["#F1CA74", "#A64DB6"], ["#E8D07A", "#5312D6"], ["#EECE13", "#B210FF"], ["#79F1A4", "#0E5CAD"], ["#FDD819", "#E80505"], ["#FFF3B0", "#CA26FF"], ["#FFF5C3", "#9452A5"], ["#F05F57", "#360940"], ["#2AFADF", "#4C83FF"], ["#FFF886", "#F072B6"], ["#97ABFF", "#123597"], ["#F5CBFF", "#C346C2"], ["#FFF720", "#3CD500"], ["#FF6FD8", "#3813C2"], ["#EE9AE5", "#5961F9"], ["#FFD3A5", "#FD6585"], ["#C2FFD8", "#465EFB"], ["#FD6585", "#0D25B9"], ["#FD6E6A", "#FFC600"], ["#65FDF0", "#1D6FA3"], ["#6B73FF", "#000DFF"], ["#FF7AF5", "#513162"], ["#F0FF00", "#58CFFB"], ["#FFE985", "#FA742B"], ["#FFA6B7", "#1E2AD2"], ["#FFAA85", "#B3315F"], ["#72EDF2", "#5151E5"], ["#FF9D6C", "#BB4E75"], ["#F6D242", "#FF52E5"], ["#69FF97", "#00E4FF"], ["#3B2667", "#BC78EC"], ["#70F570", "#49C628"], ["#3C8CE7", "#00EAFF"], ["#FAB2FF", "#1904E5"], ["#81FFEF", "#F067B4"], ["#FFA8A8", "#FCFF00"], ["#FFCF71", "#2376DD"], ["#FF96F9", "#C32BAC"] ];
|
|
||||||
let endpoint = '/pixel';
|
let endpoint = '/pixel';
|
||||||
|
|
||||||
|
// gradients
|
||||||
|
// https://uigradients.com
|
||||||
|
|
||||||
__WEBPACK_IMPORTED_MODULE_0_jquery___default()(() => {
|
__WEBPACK_IMPORTED_MODULE_0_jquery___default()(() => {
|
||||||
let app = new __WEBPACK_IMPORTED_MODULE_1__core_App__["a" /* default */](__WEBPACK_IMPORTED_MODULE_0_jquery___default()('body'))
|
let app = new __WEBPACK_IMPORTED_MODULE_1__core_App__["a" /* default */](__WEBPACK_IMPORTED_MODULE_0_jquery___default()('body'))
|
||||||
.components(__WEBPACK_IMPORTED_MODULE_2__components_exports__)
|
.components(__WEBPACK_IMPORTED_MODULE_2__components_exports__)
|
||||||
@@ -10796,15 +10798,17 @@ __WEBPACK_IMPORTED_MODULE_0_jquery___default()(() => {
|
|||||||
let colors = payload.split(',');
|
let colors = payload.split(',');
|
||||||
let msg = JSON.stringify({
|
let msg = JSON.stringify({
|
||||||
topic: 'pixels/state',
|
topic: 'pixels/state',
|
||||||
|
broadcast: "1",
|
||||||
payload: JSON.stringify({
|
payload: JSON.stringify({
|
||||||
brightness: 64,
|
brightness: 64,
|
||||||
color: parseInt(colors[0].replace('#', '0x'), 16),
|
color: parseInt(colors[0].replace('#', '0x'), 16),
|
||||||
color2: parseInt(colors[1].replace('#', '0x'), 16),
|
color2: parseInt(colors[1].replace('#', '0x'), 16),
|
||||||
totalSteps: 32,
|
totalSteps: 128,
|
||||||
pattern: 5
|
pattern: 5
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
app.mediator.trigger('pixels/totalSteps', 32);
|
app.mediator.trigger('pixels/brightness', 64);
|
||||||
|
app.mediator.trigger('pixels/totalSteps', 128);
|
||||||
app.mediator.trigger('pixels/pattern', 5);
|
app.mediator.trigger('pixels/pattern', 5);
|
||||||
app.mediator.trigger('pixels/color', colors[0]);
|
app.mediator.trigger('pixels/color', colors[0]);
|
||||||
app.mediator.trigger('pixels/color2', colors[1]);
|
app.mediator.trigger('pixels/color2', colors[1]);
|
||||||
@@ -11985,19 +11989,19 @@ class ParamSlider extends __WEBPACK_IMPORTED_MODULE_1__base_Slider_Slider__["a"
|
|||||||
constructor(ctx, node) {
|
constructor(ctx, node) {
|
||||||
super(ctx, node);
|
super(ctx, node);
|
||||||
//this.store = new Store(this.config.endpoint);
|
//this.store = new Store(this.config.endpoint);
|
||||||
}
|
|
||||||
|
|
||||||
onChange(evt) {
|
|
||||||
this.ctx.ws.send(JSON.stringify({
|
|
||||||
topic: this.config.topic,
|
|
||||||
payload: evt.target.value + "" // FIXME stupid string conversion
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
subscribe(){
|
|
||||||
this.ctx.mediator.on(this.config.topic, (payload) => {
|
this.ctx.mediator.on(this.config.topic, (payload) => {
|
||||||
this.node.find('input').val(payload);
|
this.node.find('input').val(payload);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onChange(evt) {
|
||||||
|
let msg = JSON.stringify({
|
||||||
|
topic: this.config.topic,
|
||||||
|
payload: evt.target.value,
|
||||||
|
broadcast: 1
|
||||||
|
});
|
||||||
|
this.ctx.ws.send(msg);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
/* harmony export (immutable) */ __webpack_exports__["a"] = ParamSlider;
|
/* harmony export (immutable) */ __webpack_exports__["a"] = ParamSlider;
|
||||||
|
|
||||||
@@ -12060,7 +12064,8 @@ class ParamColor extends __WEBPACK_IMPORTED_MODULE_1__base_ColorPicker_ColorPick
|
|||||||
notify(val){
|
notify(val){
|
||||||
let obj = {
|
let obj = {
|
||||||
topic: this.config.topic,
|
topic: this.config.topic,
|
||||||
payload: parseInt(val.replace('#', '0x'))
|
payload: parseInt(val.replace('#', '0x')),
|
||||||
|
broadcast: 1
|
||||||
};
|
};
|
||||||
this.ctx.ws.send(JSON.stringify(obj));
|
this.ctx.ws.send(JSON.stringify(obj));
|
||||||
}
|
}
|
||||||
@@ -12164,7 +12169,8 @@ class ParamSelect extends __WEBPACK_IMPORTED_MODULE_1__base_Select_Select__["a"
|
|||||||
onChange(evt) {
|
onChange(evt) {
|
||||||
let obj = {
|
let obj = {
|
||||||
topic: this.config.topic,
|
topic: this.config.topic,
|
||||||
payload: evt.target.value
|
payload: evt.target.value,
|
||||||
|
broadcast: 1
|
||||||
};
|
};
|
||||||
this.ctx.mediator.trigger(obj.topic, obj.payload);
|
this.ctx.mediator.trigger(obj.topic, obj.payload);
|
||||||
this.ctx.ws.send(JSON.stringify(obj));
|
this.ctx.ws.send(JSON.stringify(obj));
|
||||||
|
|||||||
@@ -128,6 +128,7 @@ class IlluCat : public MeshSprocket {
|
|||||||
if(type == WS_EVT_DATA){
|
if(type == WS_EVT_DATA){
|
||||||
String frame = WsUtils::parseFrameAsString(type, arg, data, len, 0);
|
String frame = WsUtils::parseFrameAsString(type, arg, data, len, 0);
|
||||||
dispatch(0, frame);
|
dispatch(0, frame);
|
||||||
|
net->mesh.sendBroadcast(frame);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -136,9 +137,6 @@ class IlluCat : public MeshSprocket {
|
|||||||
if(currentMessage.valid){
|
if(currentMessage.valid){
|
||||||
currentMessage.from = from;
|
currentMessage.from = from;
|
||||||
publish(currentMessage.topic, currentMessage.payload);
|
publish(currentMessage.topic, currentMessage.payload);
|
||||||
if(currentMessage.broadcast){
|
|
||||||
net->mesh.sendBroadcast(msg);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -81,6 +81,7 @@ class PixelPlugin : public Plugin {
|
|||||||
}
|
}
|
||||||
void setPattern(String msg){
|
void setPattern(String msg){
|
||||||
pixels->Index = 0;
|
pixels->Index = 0;
|
||||||
|
pixels->Direction = FORWARD;
|
||||||
pixels->ActivePattern = (pattern)atoi(msg.c_str());
|
pixels->ActivePattern = (pattern)atoi(msg.c_str());
|
||||||
}
|
}
|
||||||
void animate(){
|
void animate(){
|
||||||
|
|||||||
Reference in New Issue
Block a user