radex
/
radmatrix
mirror of https://github.com/radex/radmatrix.git
1
0
Fork 0
Code

Compare commits

base: radex:d86dc2590ee13adbc8f726de344dea05b49cdd3e
Branches Tags
radex:main
radex:sd2
..
compare: radex:2007ba4e6b070f58b31524126bd19f6cbfbd9f7c
Branches Tags
radex:main
radex:sd2

4 Commits
d86dc2590e ... 2007ba4e6b

Author SHA1 Message Date
radex 2007ba4e6b
platformio: upload/debug via picoprobe 2024-06-15 22:20:46 +02:00
radex 7d8a469a32
can: make it work 2024-06-15 22:20:26 +02:00
radex 6d51949123
pcb: KbdShield (wip) 2024-06-10 20:09:46 +02:00
radex 1dfad2e3b3
integration hell 2024-06-10 13:25:38 +02:00
12 changed files with 8921 additions and 36 deletions
Show Stats Expand all files Collapse all files

3
firmware/platformio.ini
View File

@ -14,5 +14,8 @@ board = pico
framework = arduino
board_build.core = earlephilhower
board_build.filesystem_size = 0.5m
; debug_port = /dev/tty.usbmodem1102
upload_protocol = cmsis-dap
debug_tool = cmsis-dap
; lib_deps =

19
firmware/src/can.cpp
View File

@ -10,13 +10,18 @@ static void canbus_pio_irq_handler() {
}
void canbus_setup() {
Serial.println("Setting up CAN...");
uint32_t pio_num = 1;
can2040_setup(&canbus, pio_num);
can2040_callback_config(&canbus, can2040_callback);
irq_set_exclusive_handler(PIO1_IRQ_0, canbus_pio_irq_handler);
irq_set_priority(PIO1_IRQ_0, 1);
irq_set_enabled(PIO1_IRQ_0, true);
irq_set_exclusive_handler(PIO1_IRQ_0_IRQn, canbus_pio_irq_handler);
irq_set_priority(PIO1_IRQ_0_IRQn, 1);
irq_set_enabled(PIO1_IRQ_0_IRQn, true);
pinMode(CAN_PIN_SILENT, OUTPUT);
digitalWrite(CAN_PIN_SILENT, LOW); // set to active mode
can2040_start(&canbus, CPU_CLOCK_HZ, CAN_BITRATE, CAN_PIN_RX, CAN_PIN_TX);
}
@ -41,12 +46,14 @@ void canbus_heartbeat() {
int msg_type = 31;
// {kind:5}{device:8}{type:5}{reserved:11}
uint32_t id = CAN2040_ID_EFF | ((msg_kind << (8 + 5)) | (device_id << 5) | msg_type) << 11;
// uint32_t id = CAN2040_ID_EFF | ((msg_kind << (8 + 5)) | (device_id << 5) | msg_type) << 11;
can2040_msg msg = {
.id = id,
.dlc = 0,
.id = 0x35,
.dlc = 8,
.data = {'P', 'A', 'P', 'I', 'E', 'S', 'Z', '!'},
};
auto result = can2040_transmit(&canbus, &msg);
if (result != 0) {
Serial.println("CAN: heartbeat failed");

12
firmware/src/config.h
View File

@ -14,7 +14,7 @@
#define SD_HAS_DETECTION true
#define SD_DET_PIN 4
#define CAN_ENABLED false
#define CAN_ENABLED true
#define CAN_PIN_RX 5
#define CAN_PIN_TX 7
#define CAN_PIN_SILENT 6
@ -32,23 +32,23 @@
// --- pinout - screen ---
#define COMMON_SER 21
// #define COMMON_SER 21
// #define COMMON_RCLK 23
#define COMMON_SRCLR 25
// #define COL_SER 21
#define COL_SER 21
#define COL_OE 22
#define COL_RCLK 23
#define COL_SRCLK 24
// #define COL_SRCLR 25
// #define ROW_SER 14
#define ROW_SER 14
#define ROW_OE 19
#define ROW_RCLK 20
#define ROW_SRCLK 18
// #define ROW_SRCLR 15
#define COL_SER_INVERTED false
#define COL_SER_INVERTED true
#define COL_OE_INVERTED true
#define COL_RCLK_INVERTED true
#define COL_SRCLK_INVERTED true
@ -74,7 +74,7 @@
// --- other settings ---
#define CPU_CLOCK_HZ 125000000.0f
#define CPU_CLOCK_HZ 133000000.0f
#define SD_CARD_BAUD_RATE 12 * 1000 * 1000
#define REFERENCE_VOLTAGE 3.3f // for ADC
#define CAN_BITRATE 500000

12
firmware/src/leds.cpp
View File

@ -15,6 +15,8 @@ uint row_sm = 255; // invalid
inline void pulsePin(uint8_t pin) {
gpio_put(pin, HIGH);
asm volatile("nop \n nop \n nop");
asm volatile("nop \n nop \n nop");
asm volatile("nop \n nop \n nop");
gpio_put(pin, LOW);
}
@ -142,9 +144,6 @@ void leds_init() {
pinMode(ROW_SRCLR, OUTPUT);
// set pin inversion
#if COL_SER_INVERTED
gpio_set_outover(COL_SER, GPIO_OVERRIDE_INVERT);
#endif
#if COL_OE_INVERTED
gpio_set_outover(COL_OE, GPIO_OVERRIDE_INVERT);
#endif
@ -249,6 +248,9 @@ void leds_initPusher() {
sm_config_set_out_pins(&config, COL_SER, 1);
pio_gpio_init(pio, COL_SER);
pio_sm_set_consecutive_pindirs(pio, sm, COL_SER, 1, true);
#if COL_SER_INVERTED
gpio_set_outover(COL_SER, GPIO_OVERRIDE_INVERT);
#endif
// Set sideset (SRCLK) pin, connect to pad, set as output
sm_config_set_sideset_pins(&config, COL_SRCLK);
@ -257,6 +259,7 @@ void leds_initPusher() {
#if COL_SRCLK_INVERTED
gpio_set_outover(COL_SRCLK, GPIO_OVERRIDE_INVERT);
#endif
gpio_set_drive_strength(COL_SRCLK, GPIO_DRIVE_STRENGTH_12MA);
// Set SET (RCLK) pin, connect to pad, set as output
sm_config_set_set_pins(&config, COL_RCLK, 1);
@ -265,6 +268,7 @@ void leds_initPusher() {
#if COL_RCLK_INVERTED
gpio_set_outover(COL_RCLK, GPIO_OVERRIDE_INVERT);
#endif
gpio_set_drive_strength(COL_RCLK, GPIO_DRIVE_STRENGTH_12MA);
// Load our configuration, and jump to the start of the program
pio_sm_init(pio, sm, offset, &config);
@ -329,6 +333,6 @@ void leds_initDelay() {
void leds_initPIO() {
leds_initPusher();
leds_initRowSelector();
leds_initDelay();
leds_initRowSelector();
}

12
firmware/src/leds.pio
View File

@ -3,12 +3,12 @@
.define public irq_rclk_sync 2
.define public irq_did_latch 3
.define public rclk_1_delay 3
.define public rclk_1_delay 6
.program leds_px_pusher
.side_set 1 opt
.define public srclk_0_delay 1
.define public srclk_1_delay 2
.define public srclk_0_delay 3
.define public srclk_1_delay 5
entry_point:
.wrap_target
; get 32 bits from fifo (not required with autopull, useful for debug)
@ -44,8 +44,8 @@ end_of_row:
.program leds_row_selector
.side_set 1 opt
.define public srclk_0_delay 1
.define public srclk_1_delay 2
.define public srclk_0_delay 0
.define public srclk_1_delay 1
entry_point:
.wrap_target
; wait until pixels are pushed
@ -66,9 +66,9 @@ end:
irq wait irq_rclk_sync
; clock RCLK (latch onto register output stage)
set pins, 1 [rclk_1_delay]
set pins, 0
; signal that rclk had latched (delay/oe can begin)
irq set irq_did_latch
set pins, 0
.wrap
.program leds_delay

28
firmware/src/leds.pio.h
View File

@ -12,7 +12,7 @@
#define irq_px_pushed 1
#define irq_rclk_sync 2
#define irq_did_latch 3
#define rclk_1_delay 3
#define rclk_1_delay 6
// -------------- //
// leds_px_pusher //
@ -21,20 +21,20 @@
#define leds_px_pusher_wrap_target 0
#define leds_px_pusher_wrap 9
#define leds_px_pusher_srclk_0_delay 1
#define leds_px_pusher_srclk_1_delay 2
#define leds_px_pusher_srclk_0_delay 3
#define leds_px_pusher_srclk_1_delay 5
static const uint16_t leds_px_pusher_program_instructions[] = {
// .wrap_target
0xf037, // 0: set x, 23 side 0
0x7101, // 1: out pins, 1 side 0 [1]
0x1a41, // 2: jmp x--, 1 side 1 [2]
0x7301, // 1: out pins, 1 side 0 [3]
0x1d41, // 2: jmp x--, 1 side 1 [5]
0x7028, // 3: out x, 8 side 0
0x0020, // 4: jmp !x, 0
0xc001, // 5: irq nowait 1
0x2040, // 6: wait 0 irq, 0
0x20c2, // 7: wait 1 irq, 2
0xe301, // 8: set pins, 1 [3]
0xe601, // 8: set pins, 1 [6]
0xe000, // 9: set pins, 0
// .wrap
};
@ -61,21 +61,21 @@ static inline pio_sm_config leds_px_pusher_program_get_default_config(uint offse
#define leds_row_selector_wrap_target 0
#define leds_row_selector_wrap 9
#define leds_row_selector_srclk_0_delay 1
#define leds_row_selector_srclk_1_delay 2
#define leds_row_selector_srclk_0_delay 0
#define leds_row_selector_srclk_1_delay 1
static const uint16_t leds_row_selector_program_instructions[] = {
// .wrap_target
0x20c1, // 0: wait 1 irq, 1
0x7101, // 1: out pins, 1 side 0 [1]
0x7001, // 1: out pins, 1 side 0
0x603f, // 2: out x, 31
0xba42, // 3: nop side 1 [2]
0xb103, // 4: mov pins, null side 0 [1]
0xb942, // 3: nop side 1 [1]
0xb003, // 4: mov pins, null side 0
0x0043, // 5: jmp x--, 3
0xc022, // 6: irq wait 2
0xe301, // 7: set pins, 1 [3]
0xc003, // 8: irq nowait 3
0xe000, // 9: set pins, 0
0xe601, // 7: set pins, 1 [6]
0xe000, // 8: set pins, 0
0xc003, // 9: irq nowait 3
// .wrap
};

5
firmware/src/main.cpp
View File

@ -3,6 +3,7 @@
#include "audio.h"
#include "sd.h"
#include "leds.h"
#include "can.h"
#include "gfx_decoder.h"
#include "can2040.h"
#include "config.h"
@ -19,6 +20,10 @@ void setup() {
init_audio();
leds_initRenderer();
if (CPU_CLOCK_HZ != rp2040.f_cpu()) {
Serial.println("CPU clock speed is not set correctly!");
while (true) {}
}
#if CAN_ENABLED
canbus_setup();

4961
pcb/KbdShield/KbdShield.kicad_pcb Normal file
View File

File diff suppressed because it is too large Load Diff

582
pcb/KbdShield/KbdShield.kicad_pro Normal file
View File

@ -0,0 +1,582 @@
{
"board": {
"3dviewports": [],
"design_settings": {
"defaults": {
"apply_defaults_to_fp_fields": false,
"apply_defaults_to_fp_shapes": false,
"apply_defaults_to_fp_text": false,
"board_outline_line_width": 0.049999999999999996,
"copper_line_width": 0.19999999999999998,
"copper_text_italic": false,
"copper_text_size_h": 1.5,
"copper_text_size_v": 1.5,
"copper_text_thickness": 0.3,
"copper_text_upright": false,
"courtyard_line_width": 0.049999999999999996,
"dimension_precision": 4,
"dimension_units": 3,
"dimensions": {
"arrow_length": 1270000,
"extension_offset": 500000,
"keep_text_aligned": true,
"suppress_zeroes": false,
"text_position": 0,
"units_format": 1
},
"fab_line_width": 0.09999999999999999,
"fab_text_italic": false,
"fab_text_size_h": 1.0,
"fab_text_size_v": 1.0,
"fab_text_thickness": 0.15,
"fab_text_upright": false,
"other_line_width": 0.09999999999999999,
"other_text_italic": false,
"other_text_size_h": 1.0,
"other_text_size_v": 1.0,
"other_text_thickness": 0.15,
"other_text_upright": false,
"pads": {
"drill": 0.762,
"height": 1.524,
"width": 1.524
},
"silk_line_width": 0.09999999999999999,
"silk_text_italic": false,
"silk_text_size_h": 1.0,
"silk_text_size_v": 1.0,
"silk_text_thickness": 0.09999999999999999,
"silk_text_upright": false,
"zones": {
"min_clearance": 0.5
}
},
"diff_pair_dimensions": [],
"drc_exclusions": [],
"meta": {
"version": 2
},
"rule_severities": {
"annular_width": "error",
"clearance": "error",
"connection_width": "warning",
"copper_edge_clearance": "error",
"copper_sliver": "warning",
"courtyards_overlap": "error",
"diff_pair_gap_out_of_range": "error",
"diff_pair_uncoupled_length_too_long": "error",
"drill_out_of_range": "error",
"duplicate_footprints": "warning",
"extra_footprint": "warning",
"footprint": "error",
"footprint_symbol_mismatch": "warning",
"footprint_type_mismatch": "ignore",
"hole_clearance": "error",
"hole_near_hole": "error",
"invalid_outline": "error",
"isolated_copper": "warning",
"item_on_disabled_layer": "error",
"items_not_allowed": "error",
"length_out_of_range": "error",
"lib_footprint_issues": "warning",
"lib_footprint_mismatch": "warning",
"malformed_courtyard": "error",
"microvia_drill_out_of_range": "error",
"missing_courtyard": "ignore",
"missing_footprint": "warning",
"net_conflict": "warning",
"npth_inside_courtyard": "ignore",
"padstack": "warning",
"pth_inside_courtyard": "ignore",
"shorting_items": "error",
"silk_edge_clearance": "warning",
"silk_over_copper": "warning",
"silk_overlap": "warning",
"skew_out_of_range": "error",
"solder_mask_bridge": "error",
"starved_thermal": "error",
"text_height": "warning",
"text_thickness": "warning",
"through_hole_pad_without_hole": "error",
"too_many_vias": "error",
"track_dangling": "warning",
"track_width": "error",
"tracks_crossing": "error",
"unconnected_items": "error",
"unresolved_variable": "error",
"via_dangling": "warning",
"zones_intersect": "error"
},
"rules": {
"max_error": 0.005,
"min_clearance": 0.0,
"min_connection": 0.0,
"min_copper_edge_clearance": 0.5,
"min_hole_clearance": 0.25,
"min_hole_to_hole": 0.25,
"min_microvia_diameter": 0.19999999999999998,
"min_microvia_drill": 0.09999999999999999,
"min_resolved_spokes": 2,
"min_silk_clearance": 0.0,
"min_text_height": 0.7999999999999999,
"min_text_thickness": 0.08,
"min_through_hole_diameter": 0.3,
"min_track_width": 0.0,
"min_via_annular_width": 0.09999999999999999,
"min_via_diameter": 0.5,
"solder_mask_to_copper_clearance": 0.0,
"use_height_for_length_calcs": true
},
"teardrop_options": [
{
"td_onpadsmd": true,
"td_onroundshapesonly": false,
"td_ontrackend": false,
"td_onviapad": true
}
],
"teardrop_parameters": [
{
"td_allow_use_two_tracks": true,
"td_curve_segcount": 0,
"td_height_ratio": 1.0,
"td_length_ratio": 0.5,
"td_maxheight": 2.0,
"td_maxlen": 1.0,
"td_on_pad_in_zone": false,
"td_target_name": "td_round_shape",
"td_width_to_size_filter_ratio": 0.9
},
{
"td_allow_use_two_tracks": true,
"td_curve_segcount": 0,
"td_height_ratio": 1.0,
"td_length_ratio": 0.5,
"td_maxheight": 2.0,
"td_maxlen": 1.0,
"td_on_pad_in_zone": false,
"td_target_name": "td_rect_shape",
"td_width_to_size_filter_ratio": 0.9
},
{
"td_allow_use_two_tracks": true,
"td_curve_segcount": 0,
"td_height_ratio": 1.0,
"td_length_ratio": 0.5,
"td_maxheight": 2.0,
"td_maxlen": 1.0,
"td_on_pad_in_zone": false,
"td_target_name": "td_track_end",
"td_width_to_size_filter_ratio": 0.9
}
],
"track_widths": [],
"tuning_pattern_settings": {
"diff_pair_defaults": {
"corner_radius_percentage": 80,
"corner_style": 1,
"max_amplitude": 1.0,
"min_amplitude": 0.2,
"single_sided": false,
"spacing": 1.0
},
"diff_pair_skew_defaults": {
"corner_radius_percentage": 80,
"corner_style": 1,
"max_amplitude": 1.0,
"min_amplitude": 0.2,
"single_sided": false,
"spacing": 0.6
},
"single_track_defaults": {
"corner_radius_percentage": 80,
"corner_style": 1,
"max_amplitude": 1.0,
"min_amplitude": 0.2,
"single_sided": false,
"spacing": 0.6
}
},
"via_dimensions": [],
"zones_allow_external_fillets": false
},
"ipc2581": {
"dist": "",
"distpn": "",
"internal_id": "",
"mfg": "",
"mpn": ""
},
"layer_presets": [],
"viewports": []
},
"boards": [],
"cvpcb": {
"equivalence_files": []
},
"erc": {
"erc_exclusions": [],
"meta": {
"version": 0
},
"pin_map": [
[
0,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
2
],
[
0,
2,
0,
1,
0,
0,
1,
0,
2,
2,
2,
2
],
[
0,
0,
0,
0,
0,
0,
1,
0,
1,
0,
1,
2
],
[
0,
1,
0,
0,
0,
0,
1,
1,
2,
1,
1,
2
],
[
0,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
2
],
[
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
2
],
[
1,
1,
1,
1,
1,
0,
1,
1,
1,
1,
1,
2
],
[
0,
0,
0,
1,
0,
0,
1,
0,
0,
0,
0,
2
],
[
0,
2,
1,
2,
0,
0,
1,
0,
2,
2,
2,
2
],
[
0,
2,
0,
1,
0,
0,
1,
0,
2,
0,
0,
2
],
[
0,
2,
1,
1,
0,
0,
1,
0,
2,
0,
0,
2
],
[
2,
2,
2,
2,
2,
2,
2,
2,
2,
2,
2,
2
]
],
"rule_severities": {
"bus_definition_conflict": "error",
"bus_entry_needed": "error",
"bus_to_bus_conflict": "error",
"bus_to_net_conflict": "error",
"conflicting_netclasses": "error",
"different_unit_footprint": "error",
"different_unit_net": "error",
"duplicate_reference": "error",
"duplicate_sheet_names": "error",
"endpoint_off_grid": "warning",
"extra_units": "error",
"global_label_dangling": "warning",
"hier_label_mismatch": "error",
"label_dangling": "error",
"lib_symbol_issues": "warning",
"missing_bidi_pin": "warning",
"missing_input_pin": "warning",
"missing_power_pin": "error",
"missing_unit": "warning",
"multiple_net_names": "warning",
"net_not_bus_member": "warning",
"no_connect_connected": "warning",
"no_connect_dangling": "warning",
"pin_not_connected": "error",
"pin_not_driven": "error",
"pin_to_pin": "warning",
"power_pin_not_driven": "error",
"similar_labels": "warning",
"simulation_model_issue": "ignore",
"unannotated": "error",
"unit_value_mismatch": "error",
"unresolved_variable": "error",
"wire_dangling": "error"
}
},
"libraries": {
"pinned_footprint_libs": [],
"pinned_symbol_libs": []
},
"meta": {
"filename": "KbdShield.kicad_pro",
"version": 1
},
"net_settings": {
"classes": [
{
"bus_width": 12,
"clearance": 0.2,
"diff_pair_gap": 0.25,
"diff_pair_via_gap": 0.25,
"diff_pair_width": 0.2,
"line_style": 0,
"microvia_diameter": 0.3,
"microvia_drill": 0.1,
"name": "Default",
"pcb_color": "rgba(0, 0, 0, 0.000)",
"schematic_color": "rgba(0, 0, 0, 0.000)",
"track_width": 0.2,
"via_diameter": 0.6,
"via_drill": 0.3,
"wire_width": 6
}
],
"meta": {
"version": 3
},
"net_colors": null,
"netclass_assignments": null,
"netclass_patterns": []
},
"pcbnew": {
"last_paths": {
"gencad": "",
"idf": "",
"netlist": "",
"plot": "",
"pos_files": "",
"specctra_dsn": "",
"step": "",
"svg": "",
"vrml": ""
},
"page_layout_descr_file": ""
},
"schematic": {
"annotate_start_num": 0,
"bom_fmt_presets": [],
"bom_fmt_settings": {
"field_delimiter": ",",
"keep_line_breaks": false,
"keep_tabs": false,
"name": "CSV",
"ref_delimiter": ",",
"ref_range_delimiter": "",
"string_delimiter": "\""
},
"bom_presets": [],
"bom_settings": {
"exclude_dnp": false,
"fields_ordered": [
{
"group_by": false,
"label": "Reference",
"name": "Reference",
"show": true
},
{
"group_by": true,
"label": "Value",
"name": "Value",
"show": true
},
{
"group_by": false,
"label": "Datasheet",
"name": "Datasheet",
"show": true
},
{
"group_by": false,
"label": "Footprint",
"name": "Footprint",
"show": true
},
{
"group_by": false,
"label": "Qty",
"name": "${QUANTITY}",
"show": true
},
{
"group_by": true,
"label": "DNP",
"name": "${DNP}",
"show": true
}
],
"filter_string": "",
"group_symbols": true,
"name": "Grouped By Value",
"sort_asc": true,
"sort_field": "Reference"
},
"connection_grid_size": 50.0,
"drawing": {
"dashed_lines_dash_length_ratio": 12.0,
"dashed_lines_gap_length_ratio": 3.0,
"default_line_thickness": 6.0,
"default_text_size": 50.0,
"field_names": [],
"intersheets_ref_own_page": false,
"intersheets_ref_prefix": "",
"intersheets_ref_short": false,
"intersheets_ref_show": false,
"intersheets_ref_suffix": "",
"junction_size_choice": 3,
"label_size_ratio": 0.375,
"operating_point_overlay_i_precision": 3,
"operating_point_overlay_i_range": "~A",
"operating_point_overlay_v_precision": 3,
"operating_point_overlay_v_range": "~V",
"overbar_offset_ratio": 1.23,
"pin_symbol_size": 25.0,
"text_offset_ratio": 0.15
},
"legacy_lib_dir": "",
"legacy_lib_list": [],
"meta": {
"version": 1
},
"net_format_name": "",
"page_layout_descr_file": "",
"plot_directory": "",
"spice_current_sheet_as_root": false,
"spice_external_command": "spice \"%I\"",
"spice_model_current_sheet_as_root": true,
"spice_save_all_currents": false,
"spice_save_all_dissipations": false,
"spice_save_all_voltages": false,
"subpart_first_id": 65,
"subpart_id_separator": 0
},
"sheets": [
[
"5edc5019-4956-4a5c-b513-6c95258d44cc",
"Root"
]
],
"text_variables": {}
}

3315
pcb/KbdShield/KbdShield.kicad_sch Normal file
View File

File diff suppressed because it is too large Load Diff

4
pcb/KbdShield/fp-lib-table Normal file
View File

@ -0,0 +1,4 @@
(fp_lib_table
(version 7)
(lib (name "led-matrix")(type "KiCad")(uri "/Users/radex/Documents/Hackerspace/pico-led-matrix/pcb/led-matrix.pretty")(options "")(descr ""))
)

4
pcb/KbdShield/sym-lib-table Normal file
View File

@ -0,0 +1,4 @@
(sym_lib_table
(version 7)
(lib (name "led-matrix")(type "KiCad")(uri "/Users/radex/Documents/Hackerspace/pico-led-matrix/pcb/led-matrix.kicad_sym")(options "")(descr ""))
)