signal editor

app update (+7 squashed commits) Squashed commits: [2a8716e] cleanup [74faf58] checkpoint 6 [8f56c78] checkpoint 5 [f132ee5] checkpoint 4 [9c7b802] checkpoint 3 - multisignal [b447347] checkpoint 2 [4111832] checkpoint1
gabonator · Sep 3, 2023 · 2eb49c7 · 2eb49c7
1 parent 27d0eec
commit 2eb49c7
Show file tree

Hide file tree

Showing 32 changed files with 7,030 additions and 205 deletions.
diff --git a/system/apps/79_cc1101osc/source/device/cc1101.h b/system/apps/79_cc1101osc/source/device/cc1101.h
@@ -270,8 +270,8 @@ class CDeviceCC1101 : public CCc1101Spi
 #ifdef __APPLE__
 		return true;
 #endif
-        if (mLoaded)
-            return true;
+//        if (mLoaded)
+//            return true;
         return Load(nullptr);
     }
 

diff --git a/system/apps/79_cc1101osc/source/main.cpp b/system/apps/79_cc1101osc/source/main.cpp
@@ -7,6 +7,11 @@
 #include "evaluator.h"
 #include "webusb/webusb.h"
 
+extern volatile int totalSamples;
+extern volatile int totalPositive;
+int lastSamples = 0;
+int lastPositive = 0;
+
 char command[128] = {0};
 char buffer[128];
 const char anim[] = "|/-\\|/-\\";
@@ -87,7 +92,32 @@ int main(void)
     EVERY(1000)
     {
       BIOS::LCD::Printf(BIOS::LCD::Width-16, BIOS::LCD::Height-14, RGB565(b0b0b0), RGB565(404040), "%c", anim[animphase++&7]);
+//      BIOS::LCD::Printf(100, BIOS::LCD::Height-14, RGB565(ffb0b0), RGB565(404040), " %d %d ", totalSamples, totalPositive);
     }
+    {EVERY(100)
+    {
+      int curSamples = totalSamples - lastSamples;
+      int curPositive = totalPositive - lastPositive;
+      lastSamples = totalSamples;
+      lastPositive = totalPositive;
+
+      uint16_t clr = RGB565(404040);
+      if (curSamples == 0)
+        clr = RGB565(404040);
+      else
+      {
+        if (curPositive >= curSamples/2)
+          clr = RGB565(40ff40);
+        else if (curPositive > 0)
+          clr = RGB565(40b040);
+        else
+          clr = RGB565(808080);
+      }
+      if (BIOS::GPIO::DigitalRead(BIOS::GPIO::P4))
+        clr = RGB565(ffff40);
+      BIOS::LCD::Bar(CRect(BIOS::LCD::Width-4, BIOS::LCD::Height-4, BIOS::LCD::Width, BIOS::LCD::Height), clr);
+    }}
+
     APP::Do();
   }
   APP::End();

diff --git a/system/apps/79_cc1101osc/source/streamer/streamer.cpp b/system/apps/79_cc1101osc/source/streamer/streamer.cpp
@@ -94,6 +94,7 @@ int streamerBufferMaxCounter = 20000; // 1 second @ 50 kHz
 const int streamerPeriodUs = 20;
 volatile int totalSamples = 0;
 volatile int totalPulses = 0;
+volatile int totalPositive = 0;
 
 RingBufCPP<uint16_t, 512> streamerBuffer;
 
@@ -125,6 +126,7 @@ void streamerProcess(const volatile uint16_t *data)
   {   
     totalSamples++;
     int sample = GetLogic(*data++); 
+    totalPositive += sample;
     if (sample == streamerBufferLogic)
     {
       streamerBufferCounter++;

diff --git a/system/apps/79_cc1101osc/web/analyser.js b/system/apps/79_cc1101osc/web/analyser.js
@@ -250,7 +250,7 @@ function onMain()
             }
           })
           .then( () => MODEM.Status())
-          .then( status => { if (status) console.log("Buffer overflow!"); })
+          .then( status => { if (status) { console.log("Buffer overflow!"); level = 1;} })
           .catch(console.log);
         }, 200);
 

diff --git a/system/apps/79_cc1101osc/web/editor/demo.js b/system/apps/79_cc1101osc/web/editor/demo.js