Skip to content

Commit

Permalink
Bigfixes, ready to merge to prerelease
Browse files Browse the repository at this point in the history
  • Loading branch information
shillinc-osu committed May 13, 2024
1 parent d504984 commit 30f50a3
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 8 deletions.
2 changes: 1 addition & 1 deletion WebApp/size-plugin.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"timestamp":1715496618539,"files":[{"filename":"bundle.9a98b.css","previous":853,"size":853,"diff":0},{"filename":"bundle.*****.esm.js","previous":12942,"size":12943,"diff":1},{"filename":"polyfills.*****.esm.js","previous":2316,"size":2316,"diff":0},{"filename":"route-sets.chunk.*****.esm.js","previous":11135,"size":11132,"diff":-3},{"filename":"route-wifi.chunk.2ac7e.css","previous":1360,"size":1360,"diff":0},{"filename":"route-wifi.chunk.*****.esm.js","previous":4252,"size":4252,"diff":0},{"filename":"index.html","previous":1627,"size":1627,"diff":0},{"filename":"route-sets.chunk.de96b.css","previous":2355,"size":2355,"diff":0},{"filename":"polyfills.503f5.js","previous":2415,"size":2415,"diff":0},{"filename":"route-wifi.chunk.52e5a.js","previous":5221,"size":5221,"diff":0},{"filename":"bundle.94fa7.js","previous":13720,"size":0,"diff":-13720},{"filename":"route-sets.chunk.1785a.js","previous":12165,"size":0,"diff":-12165},{"filename":"bundle.6f347.js","previous":0,"size":13720,"diff":13720},{"filename":"route-sets.chunk.b3802.js","previous":0,"size":12162,"diff":12162}]},{"timestamp":1715495165752,"files":[{"filename":"bundle.9a98b.css","previous":853,"size":853,"diff":0},{"filename":"bundle.*****.esm.js","previous":12944,"size":12942,"diff":-2},{"filename":"polyfills.*****.esm.js","previous":2316,"size":2316,"diff":0},{"filename":"route-sets.chunk.*****.esm.js","previous":11075,"size":11135,"diff":60},{"filename":"route-wifi.chunk.2ac7e.css","previous":1360,"size":1360,"diff":0},{"filename":"route-wifi.chunk.*****.esm.js","previous":4252,"size":4252,"diff":0},{"filename":"index.html","previous":1628,"size":1627,"diff":-1},{"filename":"route-sets.chunk.de96b.css","previous":2355,"size":2355,"diff":0},{"filename":"polyfills.503f5.js","previous":2415,"size":2415,"diff":0},{"filename":"route-wifi.chunk.52e5a.js","previous":5221,"size":5221,"diff":0},{"filename":"bundle.64db4.js","previous":13721,"size":0,"diff":-13721},{"filename":"route-sets.chunk.42808.js","previous":12116,"size":0,"diff":-12116},{"filename":"bundle.94fa7.js","previous":0,"size":13720,"diff":13720},{"filename":"route-sets.chunk.1785a.js","previous":0,"size":12165,"diff":12165}]},{"timestamp":1715375393941,"files":[{"filename":"bundle.9a98b.css","previous":853,"size":853,"diff":0},{"filename":"bundle.*****.esm.js","previous":12942,"size":12944,"diff":2},{"filename":"polyfills.*****.esm.js","previous":2316,"size":2316,"diff":0},{"filename":"route-sets.chunk.*****.esm.js","previous":11068,"size":11075,"diff":7},{"filename":"route-wifi.chunk.2ac7e.css","previous":1360,"size":1360,"diff":0},{"filename":"route-wifi.chunk.*****.esm.js","previous":4252,"size":4252,"diff":0},{"filename":"index.html","previous":1626,"size":1628,"diff":2},{"filename":"route-sets.chunk.de96b.css","previous":2355,"size":2355,"diff":0},{"filename":"bundle.b1c5d.js","previous":13718,"size":0,"diff":-13718},{"filename":"polyfills.503f5.js","previous":2415,"size":2415,"diff":0},{"filename":"route-sets.chunk.df07f.js","previous":12107,"size":0,"diff":-12107},{"filename":"route-wifi.chunk.52e5a.js","previous":5221,"size":5221,"diff":0},{"filename":"bundle.64db4.js","previous":0,"size":13721,"diff":13721},{"filename":"route-sets.chunk.42808.js","previous":0,"size":12116,"diff":12116}]},{"timestamp":1715373624030,"files":[{"filename":"bundle.9a98b.css","previous":853,"size":853,"diff":0},{"filename":"bundle.*****.esm.js","previous":12354,"size":12942,"diff":588},{"filename":"polyfills.*****.esm.js","previous":2317,"size":2316,"diff":-1},{"filename":"route-sets.chunk.dc97d.css","previous":1200,"size":0,"diff":-1200},{"filename":"route-sets.chunk.*****.esm.js","previous":7249,"size":11068,"diff":3819},{"filename":"route-wifi.chunk.2ac7e.css","previous":1360,"size":1360,"diff":0},{"filename":"route-wifi.chunk.*****.esm.js","previous":4253,"size":4252,"diff":-1},{"filename":"bundle.46848.js","previous":13135,"size":0,"diff":-13135},{"filename":"polyfills.57a8e.js","previous":2416,"size":0,"diff":-2416},{"filename":"route-sets.chunk.d3aed.js","previous":8240,"size":0,"diff":-8240},{"filename":"route-wifi.chunk.f7a56.js","previous":5222,"size":0,"diff":-5222},{"filename":"index.html","previous":1630,"size":1626,"diff":-4},{"filename":"route-sets.chunk.de96b.css","previous":0,"size":2355,"diff":2355},{"filename":"bundle.b1c5d.js","previous":0,"size":13718,"diff":13718},{"filename":"polyfills.503f5.js","previous":0,"size":2415,"diff":2415},{"filename":"route-sets.chunk.df07f.js","previous":0,"size":12107,"diff":12107},{"filename":"route-wifi.chunk.52e5a.js","previous":0,"size":5221,"diff":5221}]},{"timestamp":1715372022163,"files":[{"filename":"ssr-build/ssr-bundle.3be01.css","previous":2759,"size":0,"diff":-2759},{"filename":"ssr-build/ssr-bundle.js","previous":34905,"size":0,"diff":-34905},{"filename":"bundle.9a98b.css","previous":0,"size":853,"diff":853},{"filename":"bundle.*****.esm.js","previous":0,"size":12354,"diff":12354},{"filename":"polyfills.*****.esm.js","previous":0,"size":2317,"diff":2317},{"filename":"route-sets.chunk.dc97d.css","previous":0,"size":1200,"diff":1200},{"filename":"route-sets.chunk.*****.esm.js","previous":0,"size":7249,"diff":7249},{"filename":"route-wifi.chunk.2ac7e.css","previous":0,"size":1360,"diff":1360},{"filename":"route-wifi.chunk.*****.esm.js","previous":0,"size":4253,"diff":4253},{"filename":"bundle.46848.js","previous":0,"size":13135,"diff":13135},{"filename":"polyfills.57a8e.js","previous":0,"size":2416,"diff":2416},{"filename":"route-sets.chunk.d3aed.js","previous":0,"size":8240,"diff":8240},{"filename":"route-wifi.chunk.f7a56.js","previous":0,"size":5222,"diff":5222},{"filename":"index.html","previous":0,"size":1630,"diff":1630}]}]
[{"timestamp":1715564075090,"files":[{"filename":"bundle.9a98b.css","previous":853,"size":853,"diff":0},{"filename":"bundle.*****.esm.js","previous":12943,"size":12941,"diff":-2},{"filename":"polyfills.*****.esm.js","previous":2316,"size":2316,"diff":0},{"filename":"route-sets.chunk.*****.esm.js","previous":11132,"size":19858,"diff":8726},{"filename":"route-wifi.chunk.2ac7e.css","previous":1360,"size":1360,"diff":0},{"filename":"route-wifi.chunk.*****.esm.js","previous":4252,"size":4252,"diff":0},{"filename":"index.html","previous":1627,"size":1627,"diff":0},{"filename":"route-sets.chunk.de96b.css","previous":2355,"size":2355,"diff":0},{"filename":"polyfills.503f5.js","previous":2415,"size":2415,"diff":0},{"filename":"route-wifi.chunk.52e5a.js","previous":5221,"size":5221,"diff":0},{"filename":"bundle.6f347.js","previous":13720,"size":0,"diff":-13720},{"filename":"route-sets.chunk.b3802.js","previous":12162,"size":0,"diff":-12162},{"filename":"bundle.b00cb.js","previous":0,"size":13719,"diff":13719},{"filename":"route-sets.chunk.4ab02.js","previous":0,"size":24246,"diff":24246}]},{"timestamp":1715496618539,"files":[{"filename":"bundle.9a98b.css","previous":853,"size":853,"diff":0},{"filename":"bundle.*****.esm.js","previous":12942,"size":12943,"diff":1},{"filename":"polyfills.*****.esm.js","previous":2316,"size":2316,"diff":0},{"filename":"route-sets.chunk.*****.esm.js","previous":11135,"size":11132,"diff":-3},{"filename":"route-wifi.chunk.2ac7e.css","previous":1360,"size":1360,"diff":0},{"filename":"route-wifi.chunk.*****.esm.js","previous":4252,"size":4252,"diff":0},{"filename":"index.html","previous":1627,"size":1627,"diff":0},{"filename":"route-sets.chunk.de96b.css","previous":2355,"size":2355,"diff":0},{"filename":"polyfills.503f5.js","previous":2415,"size":2415,"diff":0},{"filename":"route-wifi.chunk.52e5a.js","previous":5221,"size":5221,"diff":0},{"filename":"bundle.94fa7.js","previous":13720,"size":0,"diff":-13720},{"filename":"route-sets.chunk.1785a.js","previous":12165,"size":0,"diff":-12165},{"filename":"bundle.6f347.js","previous":0,"size":13720,"diff":13720},{"filename":"route-sets.chunk.b3802.js","previous":0,"size":12162,"diff":12162}]},{"timestamp":1715495165752,"files":[{"filename":"bundle.9a98b.css","previous":853,"size":853,"diff":0},{"filename":"bundle.*****.esm.js","previous":12944,"size":12942,"diff":-2},{"filename":"polyfills.*****.esm.js","previous":2316,"size":2316,"diff":0},{"filename":"route-sets.chunk.*****.esm.js","previous":11075,"size":11135,"diff":60},{"filename":"route-wifi.chunk.2ac7e.css","previous":1360,"size":1360,"diff":0},{"filename":"route-wifi.chunk.*****.esm.js","previous":4252,"size":4252,"diff":0},{"filename":"index.html","previous":1628,"size":1627,"diff":-1},{"filename":"route-sets.chunk.de96b.css","previous":2355,"size":2355,"diff":0},{"filename":"polyfills.503f5.js","previous":2415,"size":2415,"diff":0},{"filename":"route-wifi.chunk.52e5a.js","previous":5221,"size":5221,"diff":0},{"filename":"bundle.64db4.js","previous":13721,"size":0,"diff":-13721},{"filename":"route-sets.chunk.42808.js","previous":12116,"size":0,"diff":-12116},{"filename":"bundle.94fa7.js","previous":0,"size":13720,"diff":13720},{"filename":"route-sets.chunk.1785a.js","previous":0,"size":12165,"diff":12165}]},{"timestamp":1715375393941,"files":[{"filename":"bundle.9a98b.css","previous":853,"size":853,"diff":0},{"filename":"bundle.*****.esm.js","previous":12942,"size":12944,"diff":2},{"filename":"polyfills.*****.esm.js","previous":2316,"size":2316,"diff":0},{"filename":"route-sets.chunk.*****.esm.js","previous":11068,"size":11075,"diff":7},{"filename":"route-wifi.chunk.2ac7e.css","previous":1360,"size":1360,"diff":0},{"filename":"route-wifi.chunk.*****.esm.js","previous":4252,"size":4252,"diff":0},{"filename":"index.html","previous":1626,"size":1628,"diff":2},{"filename":"route-sets.chunk.de96b.css","previous":2355,"size":2355,"diff":0},{"filename":"bundle.b1c5d.js","previous":13718,"size":0,"diff":-13718},{"filename":"polyfills.503f5.js","previous":2415,"size":2415,"diff":0},{"filename":"route-sets.chunk.df07f.js","previous":12107,"size":0,"diff":-12107},{"filename":"route-wifi.chunk.52e5a.js","previous":5221,"size":5221,"diff":0},{"filename":"bundle.64db4.js","previous":0,"size":13721,"diff":13721},{"filename":"route-sets.chunk.42808.js","previous":0,"size":12116,"diff":12116}]},{"timestamp":1715373624030,"files":[{"filename":"bundle.9a98b.css","previous":853,"size":853,"diff":0},{"filename":"bundle.*****.esm.js","previous":12354,"size":12942,"diff":588},{"filename":"polyfills.*****.esm.js","previous":2317,"size":2316,"diff":-1},{"filename":"route-sets.chunk.dc97d.css","previous":1200,"size":0,"diff":-1200},{"filename":"route-sets.chunk.*****.esm.js","previous":7249,"size":11068,"diff":3819},{"filename":"route-wifi.chunk.2ac7e.css","previous":1360,"size":1360,"diff":0},{"filename":"route-wifi.chunk.*****.esm.js","previous":4253,"size":4252,"diff":-1},{"filename":"bundle.46848.js","previous":13135,"size":0,"diff":-13135},{"filename":"polyfills.57a8e.js","previous":2416,"size":0,"diff":-2416},{"filename":"route-sets.chunk.d3aed.js","previous":8240,"size":0,"diff":-8240},{"filename":"route-wifi.chunk.f7a56.js","previous":5222,"size":0,"diff":-5222},{"filename":"index.html","previous":1630,"size":1626,"diff":-4},{"filename":"route-sets.chunk.de96b.css","previous":0,"size":2355,"diff":2355},{"filename":"bundle.b1c5d.js","previous":0,"size":13718,"diff":13718},{"filename":"polyfills.503f5.js","previous":0,"size":2415,"diff":2415},{"filename":"route-sets.chunk.df07f.js","previous":0,"size":12107,"diff":12107},{"filename":"route-wifi.chunk.52e5a.js","previous":0,"size":5221,"diff":5221}]},{"timestamp":1715372022163,"files":[{"filename":"ssr-build/ssr-bundle.3be01.css","previous":2759,"size":0,"diff":-2759},{"filename":"ssr-build/ssr-bundle.js","previous":34905,"size":0,"diff":-34905},{"filename":"bundle.9a98b.css","previous":0,"size":853,"diff":853},{"filename":"bundle.*****.esm.js","previous":0,"size":12354,"diff":12354},{"filename":"polyfills.*****.esm.js","previous":0,"size":2317,"diff":2317},{"filename":"route-sets.chunk.dc97d.css","previous":0,"size":1200,"diff":1200},{"filename":"route-sets.chunk.*****.esm.js","previous":0,"size":7249,"diff":7249},{"filename":"route-wifi.chunk.2ac7e.css","previous":0,"size":1360,"diff":1360},{"filename":"route-wifi.chunk.*****.esm.js","previous":0,"size":4253,"diff":4253},{"filename":"bundle.46848.js","previous":0,"size":13135,"diff":13135},{"filename":"polyfills.57a8e.js","previous":0,"size":2416,"diff":2416},{"filename":"route-sets.chunk.d3aed.js","previous":0,"size":8240,"diff":8240},{"filename":"route-wifi.chunk.f7a56.js","previous":0,"size":5222,"diff":5222},{"filename":"index.html","previous":0,"size":1630,"diff":1630}]}]
8 changes: 8 additions & 0 deletions WebApp/src/components/pattern_settings/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { LabelSpinner } from '../../components/spinner';
import RANGE_CONSTANTS from '../../utils/constants';
import style from './style.css';
import MultiRangeSliderWrapper from '../../components/multi_range_slider';
import ConfigDropDown from "../config_drop_down";

/**
* @brief An object meant to hold and display settings for a specific pattern
Expand Down Expand Up @@ -94,6 +95,13 @@ const PatternSettings = ({num, patterns}) => {
patterns={patterns}
/>
<br/>
<ConfigDropDown
patternIdx={data.idx}
structureRef={"config"}
update={update}
initial={data.config}
/>
<br/>
<NumericSlider
className={style.settings_control}
label="Brightness"
Expand Down
2 changes: 1 addition & 1 deletion main/api.h
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ inline void handle_pattern_put_request(AsyncWebServerRequest* request, JsonVaria
const uint8_t minhue = payload["hue_min"];
const uint8_t maxhue = payload["hue_max"];
const uint8_t conf = payload["config"];
const bool postprocess = payload["postprocess"];
const uint8_t postprocess = payload["postprocess"];

if(idx != loaded_patterns.pattern[pattern_num].idx)
pattern_changed = true;
Expand Down
2 changes: 1 addition & 1 deletion main/main.ino
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ void audio_analysis() {

noise_gate(loaded_patterns.noise_thresh);

Serial.println(volume);
Serial.println(loaded_patterns.pattern[0].postprocessing_mode);

#ifdef SHOW_TIMINGS
const int end = micros();
Expand Down
10 changes: 5 additions & 5 deletions main/patterns.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void getFhue(uint8_t min_hue, uint8_t max_hue){
log(peak) / log(2),
log(MIN_FREQUENCY) / log(2),
log(MAX_FREQUENCY) / log(2),
min_hue, max_hue);
double(min_hue), double(max_hue));
}

// void getFhue(){
Expand Down Expand Up @@ -157,8 +157,8 @@ void hue_trail(Strip_Buffer* buf, int len, Pattern_Data* params) {
switch (params->config) {
case 0: // freq_hue_trail (also default case)
default: // Default case set to execute the freq_hue_trail pattern
buf->leds[0] = CHSV(fHue, 255, params->brightness);
buf->leds[1] = CHSV(fHue, 255, params->brightness);
buf->leds[0] = CHSV(fHue, 255, vbrightness);
buf->leds[1] = CHSV(fHue, 255, vbrightness);
for (int i = len - 1; i > 1; i -= 2) {
buf->leds[i] = buf->leds[i - 2];
buf->leds[i - 1] = buf->leds[i - 2];
Expand All @@ -167,8 +167,8 @@ void hue_trail(Strip_Buffer* buf, int len, Pattern_Data* params) {

case 1: // blur
{
buf->leds[0] = CHSV(fHue, 255, params->brightness);
buf->leds[1] = CHSV(fHue, 255, params->brightness);
buf->leds[0] = CHSV(fHue, 255, vbrightness);
buf->leds[1] = CHSV(fHue, 255, vbrightness);
for (int i = len - 1; i > 1; i -= 2) {
buf->leds[i] = buf->leds[i - 2];
buf->leds[i - 1] = buf->leds[i - 2];
Expand Down

0 comments on commit 30f50a3

Please sign in to comment.