Skip to content

Fix regressions introduced by #9 #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix regressions introduced by #9 #22

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eaebfc5
Fix bug where manual updates cache the previous command after a seque…
dihm Nov 17, 2025
c9f811a
Fix bug where software starts required hardware triggers.
dihm Nov 17, 2025
d33c378
Add debug output for `set` command.
dihm Nov 17, 2025
64b766c
Bump firmware version to 1.3.1
dihm Nov 17, 2025
6fdaf32
Enforce that `hwstart` to be 0 or 1.
dihm Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions prawn_do/prawn_do.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,16 @@
#include "fast_serial.h"

#define LED_PIN 25
// output pins to use, much match pio
// output pins to use, must match pio
#define OUTPUT_PIN_BASE 0
#define OUTPUT_WIDTH 16
// mask which bits we are using
uint32_t output_mask = ((1 << OUTPUT_WIDTH) - 1) << OUTPUT_PIN_BASE;
// command type enum
enum COMMAND {
BUFFERED_HWSTART = 3 << OUTPUT_WIDTH,
BUFFERED = 1 << OUTPUT_WIDTH,
HWSTART = 2 << OUTPUT_WIDTH,
BUFFERED_HWSTART = BUFFERED | HWSTART,
MANUAL = 0
};

Expand Down Expand Up @@ -54,7 +55,7 @@ int status;
#define EXTERNAL 1
int clk_status = INTERNAL;
unsigned short debug = 0;
const char ver[6] = "1.3.0";
const char ver[6] = "1.3.1";

// Mutex for status
static mutex_t status_mutex;
Expand Down Expand Up @@ -200,7 +201,7 @@ void core1_entry() {

if(command & BUFFERED){
// buffered execution
uint32_t hwstart = (command & BUFFERED_HWSTART);
uint32_t hwstart = (command & HWSTART);

set_status(TRANSITION_TO_RUNNING);
if(debug){
Expand Down Expand Up @@ -253,10 +254,7 @@ void core1_entry() {
else{
// manual update
uint32_t manual_state = command;
// put new state into the TX FIFO
pio_sm_put_blocking(pio, sm, manual_state);
// pull FIFO into scratch register and update pins
pio_sm_exec_wait_blocking(pio, sm, pio_encode_out(pio_pins, 32));
pio_sm_set_pins_with_mask(pio, sm, manual_state, output_mask);
if(debug){
fast_serial_printf("Output commanded: %x\r\n", manual_state);
}
Expand Down Expand Up @@ -419,6 +417,10 @@ int main(){
// reset if we just set a stop command (two reps=0 commands in a row)
do_cmd_count = do_cmd_addr + 2;
}
if (debug){
fast_serial_printf("NumNZ: %x, Arr Idx: %x, Output: %x, Reps: %x\r\n",
do_cmd_count, do_cmd_addr, output, reps);
}
fast_serial_printf("ok\r\n");
}
}
Expand Down