Rudimentary pulse train streaming.

firmware/inc/bsp_app.h

@@ -15,13 +15,7 @@
 
 #include "convenience.h"
 #include "eventqueue.h"
-
-typedef struct {
-    uint8_t elcon[2];
-    uint8_t pulse_width_micros;
-    uint8_t pace_ms;
-    uint8_t nr_of_pulses;
-} Burst;
+#include "burst.h"
 
 
 void BSP_init(void);                            // Get the hardware ready for action.

firmware/inc/burst.h

@@ -0,0 +1,26 @@
+/*
+ * burst.h
+ *
+ *  NOTICE (do not remove):
+ *      This file is part of project NeoDK (https://github.com/Onwrikbaar/NeoDK).
+ *      See https://github.com/Onwrikbaar/NeoDK/blob/main/LICENSE.txt for full license details.
+ *
+ *  Created on: 29 Dec 2024
+ *      Author: mark
+ *   Copyright  2024, 2025 Neostim™
+ */
+
+#ifndef INC_BURST_H_
+#define INC_BURST_H_
+
+#include <stdint.h>
+
+typedef struct {
+    uint8_t elcon[2];
+    uint8_t phase;
+    uint8_t pace_ms;
+    uint16_t nr_of_pulses;
+    uint8_t pulse_width_micros;
+} Burst;
+
+#endif

firmware/inc/datalink.h

@@ -7,7 +7,7 @@
  *
  *  Created on: 24 Feb 2024
  *      Author: mark
- *   Copyright  2024 Neostim™
+ *   Copyright  2024, 2025 Neostim™
  */
 
 #ifndef INC_DATALINK_H_
@@ -25,7 +25,7 @@ DataLink *DataLink_new();
 
 // Instance methods.
 bool DataLink_open(DataLink *, EventQueue *);
-void DataLink_waitForSync(DataLink *);
+void DataLink_awaitSync(DataLink *);
 bool DataLink_sendDebugPacket(DataLink *, uint8_t const *, uint16_t);
 bool DataLink_sendDatagram(DataLink *, uint8_t const *, uint16_t);
 void DataLink_close(DataLink *);

firmware/inc/pulse_train.h

@@ -10,26 +10,25 @@
  *   Copyright  2019..2025 Neostim™
  */
 
-#ifndef INC_BURST_H_
-#define INC_BURST_H_
+#ifndef INC_PULSE_TRAIN_H_
+#define INC_PULSE_TRAIN_H_
 
-#include <stdint.h>
+#include "burst.h"
 
-typedef struct _PulseTrain PulseTrain;                    // Opaque type.
-typedef uint8_t burst_size_t;
-typedef uint8_t burst_phase_t;
+typedef struct _PulseTrain PulseTrain;          // Opaque type.
+typedef uint8_t pulse_train_size_t;
 
 // Class methods.
-burst_size_t PulseTrain_size();
-PulseTrain  *PulseTrain_new(void *addr, burst_size_t);
-PulseTrain  *PulseTrain_copy(void *addr, burst_size_t, PulseTrain const *original);
+pulse_train_size_t PulseTrain_size();
+PulseTrain *PulseTrain_new(void *addr, pulse_train_size_t);
+PulseTrain *PulseTrain_copy(void *addr, pulse_train_size_t, PulseTrain const *original);
 
 // Instance methods.
-PulseTrain   *PulseTrain_init(PulseTrain *, uint8_t electrode_set[2], uint16_t nr_of_pulses);
-void          PulseTrain_setPhase(PulseTrain *, burst_phase_t phase);
-burst_phase_t PulseTrain_phase(PulseTrain const *);
-PulseTrain   *PulseTrain_setStartTimeMicros(PulseTrain *, uint32_t start_time_micros);
-uint16_t      PulseTrain_nrOfPulses(PulseTrain const *);
-void          PulseTrain_print(PulseTrain const *);
+PulseTrain *PulseTrain_init(PulseTrain *, uint8_t electrode_set[2], uint16_t nr_of_pulses);
+PulseTrain *PulseTrain_setStartTimeMicros(PulseTrain *, uint32_t start_time_micros);
+uint16_t    PulseTrain_amplitude(PulseTrain const *);
+uint8_t     PulseTrain_pulseWidth(PulseTrain const *);
+Burst const *PulseTrain_getBurst(PulseTrain const *, Burst *);
+void        PulseTrain_print(PulseTrain const *);
 
 #endif

firmware/src/attributes.c

@@ -7,7 +7,7 @@
  *
  *  Created on: 15 Oct 2024
  *      Author: mark
- *   Copyright  2024 Neostim™
+ *   Copyright  2024, 2025 Neostim™
  */
 
 #include "bsp_dbg.h"
@@ -19,7 +19,7 @@
 
 typedef struct {
     AttributeId ai;                             // Key.
-    uint16_t active;
+    uint16_t times;
     AttrNotifier notify;
     void *target;
 } Subscription;
@@ -40,7 +40,7 @@ static Subscription *findSubForId(AttributeId ai)
 }
 
 
-static SubscriptionId setSubForId(AttributeId ai, AttrNotifier notify, void *target, uint16_t count)
+static SubscriptionId setSubForId(AttributeId ai, AttrNotifier notify, void *target, uint16_t times)
 {
     Subscription *sub = findSubForId(ai);
     if (sub == NULL) {                          // Not present, add it if there is room.
@@ -50,7 +50,7 @@ static SubscriptionId setSubForId(AttributeId ai, AttrNotifier notify, void *tar
     }
     sub->notify = notify;
     sub->target = target;
-    sub->active = count;
+    sub->times  = times;
     return 256 + (sub - subscriptions);
 }
 
@@ -76,8 +76,8 @@ void Attribute_changed(AttributeId ai, ElementEncoding enc, uint8_t const *data,
 {
     // BSP_logf("%s(%hu)\n", __func__, ai);
     Subscription *sub = findSubForId(ai);
-    if (sub != NULL && sub->active) {
+    if (sub != NULL && sub->times != 0) {
         sub->notify(sub->target, ai, enc, data, size);
-        sub->active -= 1;
+        sub->times -= 1;
     }
 }

firmware/src/bsp_stm32g071.c

@@ -348,13 +348,6 @@ static void setPinVal(GPIO_TypeDef *GPIOx, uint16_t gpio_pin, uint8_t pin_state)
 }
 
 
-static uint8_t getPhase(uint8_t const elcon[2])
-{
-    M_ASSERT((elcon[0] & elcon[1]) == 0);       // Prevent shorts.
-    return (elcon[0] & 0x5) ? 0 : 1;
-}
-
-
 static void setSwitches(uint16_t pattern)
 {
     // Turn on the LED if at least one triac will be activated.
@@ -645,7 +638,7 @@ void BSP_init()
 
 char const *BSP_firmwareVersion()
 {
-    return "v0.42-beta";
+    return "v0.43-beta";
 }
 
 
@@ -842,11 +835,10 @@ bool BSP_startBurst(Burst const *burst)
     pulse_timer->RCR = burst->nr_of_pulses - 1;
     pulse_timer->CNT = 0;
     pulse_timer->SR &= ~(TIM_SR_CC1IF | TIM_SR_CC2IF);
-    uint8_t phase = getPhase(burst->elcon);
-    if (phase == 0) {
+    if (burst->phase == 0) {
         pulse_timer->CCR1 = burst->pulse_width_micros - 1;
         pulse_timer->DIER |= TIM_DIER_CC1IE;
-    } else if (phase == 1) {
+    } else if (burst->phase == 1) {
         pulse_timer->CCR2 = burst->pulse_width_micros - 1;
         pulse_timer->DIER |= TIM_DIER_CC2IE;
     } else return false;                        // We only have one output stage.

firmware/src/controller.c

@@ -214,13 +214,6 @@ static void handleWriteRequest(Controller *me, AttributeAction const *aa)
 }
 
 
-static void handleSubscribeRequest(Controller *me, AttributeAction const *aa)
-{
-    Attribute_subscribe(aa->attribute_id, (AttrNotifier)&attributeChanged, me);
-    // Do not send a status response here. It will be sent later.
-}
-
-
 static void handleInvokeRequest(Controller *me, AttributeAction const *aa)
 {
     switch (aa->attribute_id)
@@ -253,7 +246,7 @@ static void handleRequest(Controller *me, AttributeAction const *aa)
             break;
         case OC_SUBSCRIBE_REQUEST:
             logTransaction(aa, "subscribe to");
-            handleSubscribeRequest(me, aa);
+            Attribute_subscribe(aa->attribute_id, (AttrNotifier)&attributeChanged, me);
             handleReadRequest(me, aa);
             break;
         case OC_INVOKE_REQUEST:
@@ -338,7 +331,7 @@ void Controller_start(Controller *me)
     me->state = &stateIdle;
     me->state(me, AOEvent_newEntryEvent());
     DataLink_open(me->datalink, &me->event_queue);
-    DataLink_waitForSync(me->datalink);
+    DataLink_awaitSync(me->datalink);
     BSP_logf("Starting NeoDK!\n%s", welcome_msg);
 }
 

firmware/src/datalink.c

@@ -7,7 +7,7 @@
  *
  *  Created on: 24 Feb 2024
  *      Author: mark
- *   Copyright  2024 Neostim™
+ *   Copyright  2024, 2025 Neostim™
  */
 
 #include <stdlib.h>
@@ -50,15 +50,6 @@ static void init(DataLink *me)
     me->tx_seq_nr = 0;
 }
 
-__attribute__((unused))
-static void dumpBuffer(const char *prefix, const uint8_t *bbuf, uint8_t nb)
-{
-    if (prefix != NULL) BSP_logf("%s", prefix);
-    for (uint8_t i = 0; i < nb; i++) {
-        BSP_logf(" 0x%02x", bbuf[i]);
-    }
-}
-
 
 static void makeRoomForNextByte(DataLink *me)
 {
@@ -283,9 +274,8 @@ bool DataLink_open(DataLink *me, EventQueue *dq)
 }
 
 
-void DataLink_waitForSync(DataLink *me)
+void DataLink_awaitSync(DataLink *me)
 {
-    BSP_logf("%s\n", __func__);
     me->synced = false;
 }
 

firmware/src/debug_cli.c

@@ -7,7 +7,7 @@
  *
  *  Created on: 26 Mar 2024
  *      Author: mark
- *   Copyright  2024 Neostim™
+ *   Copyright  2024, 2025 Neostim™
  */
 
 #include <stdio.h>
@@ -66,7 +66,7 @@ static void interpretCommand(CmndInterp *me, char ch)
     switch (ch)
     {
         case '?':
-            CLI_logf("Commands: /? /a /b /d /l /n /q /u /v /w /0 /1../9\n");
+            CLI_logf("Commands: /? /a /b /d /l /n /q /s /u /v /w /0 /1../9\n");
             break;
         case '0':
             BSP_primaryVoltageEnable(false);
@@ -97,14 +97,17 @@ static void interpretCommand(CmndInterp *me, char ch)
             EventQueue_postEvent(me->delegate, ET_POSIX_SIGNAL, (uint8_t const *)&sig, sizeof sig);
             break;
         }
+        case 's':
+            EventQueue_postEvent((EventQueue *)me->sequencer, ET_STOP, NULL, 0);
+            break;
         case 'u':                               // Intensity up.
             changeIntensity(me, +2);
             break;
         case 'v':
             CLI_logf("Firmware %s\n", BSP_firmwareVersion());
             break;
         case 'w':                               // Allow rediscovery by Dweeb.
-            DataLink_waitForSync(me->datalink);
+            DataLink_awaitSync(me->datalink);
             break;
         default:
             CLI_logf("Unknown command '/%c'\n", ch);

firmware/src/pattern_iter.c

@@ -30,7 +30,7 @@ static void nextElconIfLastStep(PatternIterator *me)
 }
 
 
-static uint8_t const *getNextPattern(PatternIterator *me, uint8_t *nr_of_pulses)
+static uint8_t const *getNextPattern(PatternIterator *me, uint16_t *nr_of_pulses)
 {
     PatternDescr const *pd = me->pattern_descr;
     uint8_t elcon_nr = me->elcon_nr;