Deploying to gh-pages from @ 56fd3e5 🚀

pixelit-project · Oct 13, 2023 · b347364 · b347364
1 parent e21bdbd
commit b347364
Show file tree

Hide file tree

Showing 9 changed files with 104 additions and 51 deletions.
diff --git a/public/demoData/demo.json b/public/demoData/demo.json
@@ -106,9 +106,12 @@
         "uuid": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
         "version": "1.3.3.7",
         "type": "esp8266",
+        "buildsection": "ESP8266_generic",
         "matrix": {
-            "type": 4,
-            "name": "Demo Matrix"
+            "type": 1,
+            "name": "Colum major",
+            "width": 32,
+            "height": 8
         },
         "sensors": [
             "LDR"

diff --git a/src/store/index.js b/src/store/index.js
@@ -16,21 +16,46 @@ export default new Vuex.Store({
             json: JSON.stringify(
                 {
                     text: {
-                        textString: 'Pixel it 😀',
+                        textString: 'Hello world! 😀',
                         scrollText: 'auto',
                         bigFont: false,
                         centerText: false,
                         scrollTextDelay: 40,
                         hexColor: '#FFFFFF',
                         position: {
-                            x: 0,
+                            x: 9,
                             y: 1,
                         },
                     },
+                    bitmapAnimation: {
+                        data: [
+                            [43008, 0, 0, 0, 0, 0, 0, 0, 64170, 0, 0, 0, 0, 0, 0, 0, 64853, 0, 0, 0, 0, 64853, 0, 0, 65535, 65535, 0, 0, 0, 65535, 0, 0, 65535, 65535, 0, 65535, 0, 65535, 0, 65535, 65535, 65535, 0, 65535, 65535, 65535, 0, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535],
+                            [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64853, 0, 0, 0, 0, 0, 0, 0, 65535, 0, 0, 0, 0, 0, 0, 65535, 65535, 65535, 0, 0, 65535, 0, 0, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 0, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535],
+                            [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65535, 0, 0, 0, 65535, 0, 0, 65535, 65535, 65535, 0, 65535, 65535, 65535, 0, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535],
+                            [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65535, 0, 0, 65535, 0, 0, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535],
+                            [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65535, 0, 0, 0, 65535, 0, 0, 65535, 65535, 0, 0, 0, 65535, 65535, 0, 65535, 65535, 0, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535],
+                            [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64853, 0, 0, 0, 0, 0, 65535, 0, 65535, 0, 0, 0, 0, 65535, 65535, 0, 65535, 65535, 0, 65535, 0, 65535, 65535, 65535, 65535, 65535, 0, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535],
+                        ],
+                        position: {
+                            x: 0,
+                            y: 0,
+                        },
+                        animationDelay: 200,
+                        rubberbanding: false,
+                        limitLoops: 0,
+                    },
+                },
+                function (k, v) {
+                    if (v instanceof Array) return JSON.stringify(v);
+                    return v;
                 },
-                null,
-                4
-            ),
+                2
+            )
+                .replace(/\\/g, '')
+                .replace(/"\[/g, '[')
+                .replace(/\]"/g, ']')
+                .replace(/"\{/g, '{')
+                .replace(/\}"/g, '}'),
             text: '€ ← ↑ → ↓ ★ 📁 📄 ♥ ↧ 🚗 😀',
             image: '[33808,0,0,0,0,0,0,33808,43680,33808,0,0,0,0,33808,43680,43680,33808,44373,44373,44373,44373,33808,43680,33808,65535,65535,44373,44373,65535,65535,33808,33808,65535,0,44373,44373,65535,0,33808,33808,65535,0,33808,33808,65535,0,33808,0,33808,33808,43680,43680,33808,33808,0,0,0,33808,33808,33808,33808,0,0],[33808,0,0,0,0,0,0,33808,43680,33808,0,0,0,0,33808,43680,43680,33808,44373,44373,44373,44373,33808,43680,33808,65535,65535,44373,44373,65535,65535,33808,33808,0,65535,44373,44373,0,65535,33808,33808,0,65535,33808,33808,0,65535,33808,0,33808,33808,43680,43680,33808,33808,0,0,0,33808,33808,33808,33808,0,0],[33808,0,0,0,0,0,0,33808,43680,33808,0,0,0,0,33808,43680,43680,33808,44373,44373,44373,44373,33808,43680,33808,65535,65535,44373,44373,65535,65535,33808,33808,65535,0,44373,44373,65535,0,33808,33808,65535,0,33808,33808,65535,0,33808,0,33808,33808,43680,43680,33808,33808,0,0,0,33808,33808,33808,33808,0,0],[33808,0,0,0,0,0,0,33808,43680,33808,0,0,0,0,33808,43680,43680,33808,44373,44373,44373,44373,33808,43680,33808,44373,44373,44373,44373,44373,44373,33808,33808,44373,44373,44373,44373,44373,44373,33808,33808,0,0,33808,33808,0,0,33808,0,33808,33808,43680,43680,33808,33808,0,0,0,33808,33808,33808,33808,0,0]',
         },
@@ -525,28 +550,32 @@ function addToLogData(obj, state) {
 
 function addToSensorData(obj, state) {
     for (const key in obj) {
-        const oldEntry = state.sensorData.find((x) => x.name == getDisplayName(key));
-        if (oldEntry) {
-            oldEntry.value = getDisplayValue(key, obj[key]);
-        } else {
-            state.sensorData.push({
-                name: getDisplayName(key),
-                value: getDisplayValue(key, obj[key]),
-            });
+        if (key != 'hostname') {
+            const oldEntry = state.sensorData.find((x) => x.name == getDisplayName(key));
+            if (oldEntry) {
+                oldEntry.value = getDisplayValue(key, obj[key]);
+            } else {
+                state.sensorData.push({
+                    name: getDisplayName(key),
+                    value: getDisplayValue(key, obj[key]),
+                });
+            }
         }
     }
 }
 
 function addToButtonData(obj, state) {
     for (const key in obj) {
-        const oldEntry = state.buttonData.find((x) => x.name == getDisplayName(key));
-        if (oldEntry) {
-            oldEntry.value = getDisplayValue(key, obj[key]);
-        } else {
-            state.buttonData.push({
-                name: getDisplayName(key),
-                value: getDisplayValue(key, obj[key]),
-            });
+        if (key != 'hostname') {
+            const oldEntry = state.buttonData.find((x) => x.name == getDisplayName(key));
+            if (oldEntry) {
+                oldEntry.value = getDisplayValue(key, obj[key]);
+            } else {
+                state.buttonData.push({
+                    name: getDisplayName(key),
+                    value: getDisplayValue(key, obj[key]),
+                });
+            }
         }
     }
 }
@@ -604,7 +633,7 @@ function getDisplayName(key) {
             key = 'Pressure';
             break;
         case 'pixelitVersion':
-            key = 'PixelIt version';
+            key = 'PixelIt Version';
             break;
         case 'hostname':
             key = 'Hostname';
@@ -616,7 +645,7 @@ function getDisplayName(key) {
             key = 'Sketch size';
             break;
         case 'freeSketchSpace':
-            key = 'Free sketch space';
+            key = 'Free Sketch Space';
             break;
         case 'wifiRSSI':
             key = 'Wifi RSSI';
@@ -669,6 +698,9 @@ function getDisplayName(key) {
         case 'battery':
             key = 'Battery';
             break;
+        case 'buildSection':
+            key = 'Build Section';
+            break;
     }
     return key;
 }
@@ -729,7 +761,9 @@ function getDisplayValue(key, value) {
             value = value.cols + ' x ' + value.rows + ' (cols x rows)';
             break;
         case 'battery':
-            value = value + ' %';
+            if (typeof value == 'number') {
+                value = value + ' %';
+            }
             break;
     }
     return value;

diff --git a/src/views/Options.vue b/src/views/Options.vue
@@ -124,15 +124,17 @@
                         <v-card-text>
                             <h3>Why?</h3>
                             <br />
-                            Why we want to collect telemetry data and what data:<br /><br />
                             The telemetry data helps us to understand which hardware is used for the PixelIt and also which software versions of the PixelIt are on the road.<br />
                             Also it is a motivator for us developers to see the spread so that we can continue to have fun developing :)<br /><br />
                             The data is sent anonymously and includes the following data:<br />
-                            <li>UUID is a generated hash from the ESP hardware</li>
-                            <li>Version from the PixelIt</li>
-                            <li>Matrix type</li>
-                            <li>Sensors used</li>
-                            <li>Country (via GeoIP service)</li>
+                            <ul>
+                                <li>UUID is a generated hash from the ESP hardware</li>
+                                <li>Version from the PixelIt</li>
+                                <li>Build section name</li>
+                                <li>Matrix type and size</li>
+                                <li>Sensors used (types)</li>
+                                <li>Country (via GeoIP service, but <u>NO</u> IP address)</li>
+                            </ul>
                             <br />
                             That was it :)
                         </v-card-text>
@@ -242,3 +244,11 @@ export default {
     },
 };
 </script>
+<style>
+ul {
+    margin-top: 10px;
+}
+li {
+    margin-left: 20px;
+}
+</style>
diff --git a/src/views/TestArea.vue b/src/views/TestArea.vue
@@ -11,20 +11,6 @@
                     <Liveview class="text-center" :data="liveview" :options="liveviewCanvasSettings" />
                 </v-card>
                 <br />
-                <v-card class="pa-2" elevation="4">
-                    <v-card-title>
-                        <h2>JSON String</h2>
-                    </v-card-title>
-                    <hr />
-                    <br />
-                    <prism-editor class="editor" v-model="testarea.json" :highlight="highlighter" line-numbers></prism-editor>
-                    <br />
-                    <div class="text-center">
-                        <ButtonCondition color="info" :condition="sockedIsConnected" text="Send JSON" icon="mdi-cloud-upload" :onclick="sendJson" />
-                    </div>
-                </v-card>
-            </v-col>
-            <v-col cols="12" lg="4">
                 <v-card class="pa-2" elevation="4">
                     <v-card-title>
                         <h2>Text / Brightness</h2>
@@ -39,8 +25,7 @@
                         <ButtonCondition color="info" :condition="sockedIsConnected" text="Send Text" icon="mdi-cloud-upload" :onclick="sendText" />
                     </div>
                 </v-card>
-            </v-col>
-            <v-col cols="12" lg="4">
+                <br />
                 <v-card class="pa-2" elevation="4">
                     <v-card-title>
                         <h2>Bitmap Array</h2>
@@ -54,6 +39,20 @@
                     </div>
                 </v-card>
             </v-col>
+            <v-col cols="24" lg="8">
+                <v-card class="pa-2" elevation="4">
+                    <v-card-title>
+                        <h2>JSON String</h2>
+                    </v-card-title>
+                    <hr />
+                    <br />
+                    <prism-editor class="editor" v-model="testarea.json" :highlight="highlighter" line-numbers></prism-editor>
+                    <br />
+                    <div class="text-center">
+                        <ButtonCondition color="info" :condition="sockedIsConnected" text="Send JSON" icon="mdi-cloud-upload" :onclick="sendJson" />
+                    </div>
+                </v-card>
+            </v-col>
         </v-row>
     </v-container>
 </template>

diff --git a/webui/css/app.d50cf40d.css b/webui/css/app.d50cf40d.css
diff --git a/webui/demoData/demo.json b/webui/demoData/demo.json
@@ -106,9 +106,12 @@
         "uuid": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
         "version": "1.3.3.7",
         "type": "esp8266",
+        "buildsection": "ESP8266_generic",
         "matrix": {
-            "type": 4,
-            "name": "Demo Matrix"
+            "type": 1,
+            "name": "Colum major",
+            "width": 32,
+            "height": 8
         },
         "sensors": [
             "LDR"

diff --git a/webui/index.html b/webui/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="mobile-web-app-capable" content="yes"><link rel="icon" href="https://pixelit-project.github.io/PixelIt/webui/favicon.ico"><title>PixelIt WebUI</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><link href="https://pixelit-project.github.io/PixelIt/webui/css/app.ccf38f0b.css" rel="preload" as="style"><link href="https://pixelit-project.github.io/PixelIt/webui/css/chunk-vendors.d0ec1288.css" rel="preload" as="style"><link href="https://pixelit-project.github.io/PixelIt/webui/js/app.619f1946.js" rel="preload" as="script"><link href="https://pixelit-project.github.io/PixelIt/webui/js/chunk-vendors.801941cf.js" rel="preload" as="script"><link href="https://pixelit-project.github.io/PixelIt/webui/css/chunk-vendors.d0ec1288.css" rel="stylesheet"><link href="https://pixelit-project.github.io/PixelIt/webui/css/app.ccf38f0b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but Pixel It the Matrix Display doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="https://pixelit-project.github.io/PixelIt/webui/js/chunk-vendors.801941cf.js"></script><script src="https://pixelit-project.github.io/PixelIt/webui/js/app.619f1946.js"></script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="mobile-web-app-capable" content="yes"><link rel="icon" href="https://pixelit-project.github.io/PixelIt/webui/favicon.ico"><title>PixelIt WebUI</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><link href="https://pixelit-project.github.io/PixelIt/webui/css/app.d50cf40d.css" rel="preload" as="style"><link href="https://pixelit-project.github.io/PixelIt/webui/css/chunk-vendors.d0ec1288.css" rel="preload" as="style"><link href="https://pixelit-project.github.io/PixelIt/webui/js/app.969cd781.js" rel="preload" as="script"><link href="https://pixelit-project.github.io/PixelIt/webui/js/chunk-vendors.801941cf.js" rel="preload" as="script"><link href="https://pixelit-project.github.io/PixelIt/webui/css/chunk-vendors.d0ec1288.css" rel="stylesheet"><link href="https://pixelit-project.github.io/PixelIt/webui/css/app.d50cf40d.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but Pixel It the Matrix Display doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="https://pixelit-project.github.io/PixelIt/webui/js/chunk-vendors.801941cf.js"></script><script src="https://pixelit-project.github.io/PixelIt/webui/js/app.969cd781.js"></script></body></html>
diff --git a/webui/js/app.969cd781.js b/webui/js/app.969cd781.js
diff --git a/webui/js/app.969cd781.js.map b/webui/js/app.969cd781.js.map
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="mobile-web-app-capable" content="yes"><link rel="icon" href="https://pixelit-project.github.io/PixelIt/webui/favicon.ico"><title>PixelIt WebUI</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><link href="https://pixelit-project.github.io/PixelIt/webui/css/app.ccf38f0b.css" rel="preload" as="style"><link href="https://pixelit-project.github.io/PixelIt/webui/css/chunk-vendors.d0ec1288.css" rel="preload" as="style"><link href="https://pixelit-project.github.io/PixelIt/webui/js/app.619f1946.js" rel="preload" as="script"><link href="https://pixelit-project.github.io/PixelIt/webui/js/chunk-vendors.801941cf.js" rel="preload" as="script"><link href="https://pixelit-project.github.io/PixelIt/webui/css/chunk-vendors.d0ec1288.css" rel="stylesheet"><link href="https://pixelit-project.github.io/PixelIt/webui/css/app.ccf38f0b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but Pixel It the Matrix Display doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="https://pixelit-project.github.io/PixelIt/webui/js/chunk-vendors.801941cf.js"></script><script src="https://pixelit-project.github.io/PixelIt/webui/js/app.619f1946.js"></script></body></html>
		<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="mobile-web-app-capable" content="yes"><link rel="icon" href="https://pixelit-project.github.io/PixelIt/webui/favicon.ico"><title>PixelIt WebUI</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><link href="https://pixelit-project.github.io/PixelIt/webui/css/app.d50cf40d.css" rel="preload" as="style"><link href="https://pixelit-project.github.io/PixelIt/webui/css/chunk-vendors.d0ec1288.css" rel="preload" as="style"><link href="https://pixelit-project.github.io/PixelIt/webui/js/app.969cd781.js" rel="preload" as="script"><link href="https://pixelit-project.github.io/PixelIt/webui/js/chunk-vendors.801941cf.js" rel="preload" as="script"><link href="https://pixelit-project.github.io/PixelIt/webui/css/chunk-vendors.d0ec1288.css" rel="stylesheet"><link href="https://pixelit-project.github.io/PixelIt/webui/css/app.d50cf40d.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but Pixel It the Matrix Display doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="https://pixelit-project.github.io/PixelIt/webui/js/chunk-vendors.801941cf.js"></script><script src="https://pixelit-project.github.io/PixelIt/webui/js/app.969cd781.js"></script></body></html>