Merge pull request #86 from shufps/new-ui

New UI
shufps · Feb 16, 2025 · 36a789a · 36a789a
2 parents 5d6ee5d + a7ab31b
commit 36a789a
Show file tree

Hide file tree

Showing 227 changed files with 10,919 additions and 12,519 deletions.
diff --git a/main/boards/board.h b/main/boards/board.h
@@ -76,6 +76,8 @@ class Board {
 
     virtual void requestBuckTelemtry() = 0;
 
+    virtual void shutdown() = 0;
+
     virtual bool getPSUFault() {
         return false;
     }

diff --git a/main/boards/nerdaxe.cpp b/main/boards/nerdaxe.cpp
@@ -113,6 +113,10 @@ bool NerdAxe::initBoard()
     return true;
 }
 
+void NerdAxe::shutdown() {
+    // NOP / TODO
+}
+
 bool NerdAxe::initAsics()
 {
     // disable buck (disables EN pin)

diff --git a/main/boards/nerdaxe.h b/main/boards/nerdaxe.h
@@ -11,6 +11,8 @@ class NerdAxe : public Board {
   public:
     NerdAxe();
 
+    virtual void shutdown();
+
     virtual bool initBoard();
     virtual bool initAsics();
 

diff --git a/main/boards/nerdaxegamma.cpp b/main/boards/nerdaxegamma.cpp
@@ -77,6 +77,10 @@ bool NerdaxeGamma::initBoard()
     return true;
 }
 
+void NerdaxeGamma::shutdown() {
+    // NOP / TODO
+}
+
 bool NerdaxeGamma::initAsics() {
 
     // set output voltage

diff --git a/main/boards/nerdaxegamma.h b/main/boards/nerdaxegamma.h
@@ -8,13 +8,15 @@
 class NerdaxeGamma : public NerdAxe {
   protected:
     float m_initVoltage;
-    
+
   public:
     NerdaxeGamma();
 
     virtual bool initBoard();
     virtual bool initAsics();
 
+    virtual void shutdown();
+
 // abstract common methos
     virtual bool setVoltage(float core_voltage);
 

diff --git a/main/boards/nerdqaxeplus.cpp b/main/boards/nerdqaxeplus.cpp
@@ -81,6 +81,16 @@ bool NerdQaxePlus::initBoard()
     return true;
 }
 
+void NerdQaxePlus::shutdown() {
+    setVoltage(0.0);
+
+    vTaskDelay(500 / portTICK_PERIOD_MS);
+
+    LDO_disable();
+
+    vTaskDelay(500 / portTICK_PERIOD_MS);
+}
+
 bool NerdQaxePlus::initAsics()
 {
     // disable buck (disables EN pin)

diff --git a/main/boards/nerdqaxeplus.h b/main/boards/nerdqaxeplus.h
@@ -20,6 +20,8 @@ class NerdQaxePlus : public Board {
     virtual bool initBoard();
     virtual bool initAsics();
 
+    virtual void shutdown();
+
 // abstract common methos
     virtual bool setVoltage(float core_voltage);
 

diff --git a/main/http_server/axe-os/angular.json b/main/http_server/axe-os/angular.json
@@ -7,7 +7,14 @@
       "projectType": "application",
       "schematics": {
         "@schematics/angular:component": {
-          "style": "scss"
+          "style": "scss",
+          "standalone": false
+        },
+        "@schematics/angular:directive": {
+          "standalone": false
+        },
+        "@schematics/angular:pipe": {
+          "standalone": false
         }
       },
       "root": "",
@@ -30,8 +37,8 @@
               "src/assets"
             ],
             "styles": [
-              "src/styles.scss",
-              "node_modules/ngx-toastr/toastr.css"
+              "node_modules/@nebular/theme/styles/prebuilt/corporate.css",
+              "src/app/@theme/styles/styles.scss"
             ],
             "scripts": []
           },
@@ -46,13 +53,13 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "2mb",
-                  "maximumError": "3mb"
+                  "maximumWarning": "5mb",
+                  "maximumError": "5mb"
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "2kb",
-                  "maximumError": "4kb"
+                  "maximumWarning": "3mb",
+                  "maximumError": "4mb"
                 }
               ],
               "outputHashing": "all"

diff --git a/main/http_server/axe-os/only-gzip.js b/main/http_server/axe-os/only-gzip.js
@@ -4,13 +4,23 @@ const path = require('path');
 const directory = './dist/axe-os';
 
 fs.readdir(directory, (err, files) => {
-  if (err) throw err;
+    if (err) throw err;
 
-  for (const file of files) {
-    if (!file.endsWith('.gz')) {
-      fs.unlink(path.join(directory, file), err => {
-        if (err) throw err;
-      });
+    for (const file of files) {
+        const filePath = path.join(directory, file);
+
+        fs.stat(filePath, (err, stats) => {
+            if (err) throw err;
+
+            if (stats.isDirectory()) {
+                // NOP
+            } else if (!file.endsWith('.gz')) {
+                // If it's a file and doesn't end with .gz, unlink it
+                fs.unlink(filePath, (err) => {
+                    if (err) throw err;
+                    console.log(`Removed file: ${filePath}`);
+                });
+            }
+        });
     }
-  }
-});
+});