mirror of
https://github.com/Architeuthis-Flux/Jumperless.git
synced 2024-11-27 17:00:55 +01:00
New Hardware revision
This commit is contained in:
Kevin Santo Cappuccio
parent
3e49008d92
commit
5d9d94d5fe
BIN
Hardware/.DS_Store
vendored
Normal file
BIN
Hardware/.DS_Store
vendored
Normal file
Binary file not shown.
File diff suppressed because it is too large
Load Diff
BIN
Hardware/Custom Breadboard/bbSimple Drawing v3.pdf
Normal file
BIN
Hardware/Custom Breadboard/bbSimple Drawing v3.pdf
Normal file
Binary file not shown.
Binary file not shown.
BIN
Hardware/KiCAD/.DS_Store
vendored
Normal file
BIN
Hardware/KiCAD/.DS_Store
vendored
Normal file
Binary file not shown.
732687
Hardware/KiCAD/Jumperless2.kicad_pcb
Normal file
732687
Hardware/KiCAD/Jumperless2.kicad_pcb
Normal file
File diff suppressed because it is too large
Load Diff
77
Hardware/KiCAD/Jumperless2.kicad_prl
Normal file
77
Hardware/KiCAD/Jumperless2.kicad_prl
Normal file
@ -0,0 +1,77 @@
|
||||
{
|
||||
"board": {
|
||||
"active_layer": 0,
|
||||
"active_layer_preset": "All Layers",
|
||||
"auto_track_width": false,
|
||||
"hidden_netclasses": [],
|
||||
"hidden_nets": [],
|
||||
"high_contrast_mode": 0,
|
||||
"net_color_mode": 1,
|
||||
"opacity": {
|
||||
"images": 0.6,
|
||||
"pads": 1.0,
|
||||
"tracks": 0.1899999976158142,
|
||||
"vias": 0.25,
|
||||
"zones": 0.6
|
||||
},
|
||||
"selection_filter": {
|
||||
"dimensions": true,
|
||||
"footprints": true,
|
||||
"graphics": true,
|
||||
"keepouts": true,
|
||||
"lockedItems": true,
|
||||
"otherItems": true,
|
||||
"pads": true,
|
||||
"text": true,
|
||||
"tracks": true,
|
||||
"vias": true,
|
||||
"zones": true
|
||||
},
|
||||
"visible_items": [
|
||||
0,
|
||||
1,
|
||||
2,
|
||||
3,
|
||||
4,
|
||||
5,
|
||||
8,
|
||||
9,
|
||||
10,
|
||||
11,
|
||||
12,
|
||||
13,
|
||||
15,
|
||||
16,
|
||||
17,
|
||||
18,
|
||||
19,
|
||||
20,
|
||||
21,
|
||||
22,
|
||||
23,
|
||||
24,
|
||||
25,
|
||||
26,
|
||||
27,
|
||||
28,
|
||||
29,
|
||||
30,
|
||||
32,
|
||||
33,
|
||||
34,
|
||||
35,
|
||||
36,
|
||||
39,
|
||||
40
|
||||
],
|
||||
"visible_layers": "fffffff_ffffffff",
|
||||
"zone_display_mode": 1
|
||||
},
|
||||
"meta": {
|
||||
"filename": "Jumperless2.kicad_prl",
|
||||
"version": 3
|
||||
},
|
||||
"project": {
|
||||
"files": []
|
||||
}
|
||||
}
|
||||
@ -35,8 +35,8 @@
|
||||
"other_text_upright": false,
|
||||
"pads": {
|
||||
"drill": 0.0,
|
||||
"height": 1.7,
|
||||
"width": 0.6
|
||||
"height": 0.7,
|
||||
"width": 0.7
|
||||
},
|
||||
"silk_line_width": 0.15,
|
||||
"silk_text_italic": false,
|
||||
@ -55,17 +55,23 @@
|
||||
"width": 0.0
|
||||
}
|
||||
],
|
||||
"drc_exclusions": [],
|
||||
"drc_exclusions": [
|
||||
"items_not_allowed|50372900|114459971|35972f56-bb91-4cc7-ace3-7e14c488a8ae|00000000-0000-0000-0000-000000000000",
|
||||
"via_dangling|100406400|133070600|b0459efe-0ce1-4313-9cef-5c70f2059f59|00000000-0000-0000-0000-000000000000",
|
||||
"via_dangling|103225800|134112000|bee669c0-44b7-4381-985a-775213b73f10|00000000-0000-0000-0000-000000000000",
|
||||
"via_dangling|104437000|130683000|06a211df-edf4-4e12-b95a-ce3ca1970bb6|00000000-0000-0000-0000-000000000000",
|
||||
"via_dangling|99238000|131800600|9a3d2cff-3ea2-4440-a3c8-b9c3269e253c|00000000-0000-0000-0000-000000000000"
|
||||
],
|
||||
"meta": {
|
||||
"version": 2
|
||||
},
|
||||
"rule_severities": {
|
||||
"annular_width": "error",
|
||||
"clearance": "error",
|
||||
"clearance": "warning",
|
||||
"connection_width": "warning",
|
||||
"copper_edge_clearance": "error",
|
||||
"copper_sliver": "warning",
|
||||
"courtyards_overlap": "error",
|
||||
"courtyards_overlap": "ignore",
|
||||
"diff_pair_gap_out_of_range": "error",
|
||||
"diff_pair_uncoupled_length_too_long": "error",
|
||||
"drill_out_of_range": "error",
|
||||
@ -91,14 +97,14 @@
|
||||
"padstack": "warning",
|
||||
"pth_inside_courtyard": "ignore",
|
||||
"shorting_items": "error",
|
||||
"silk_edge_clearance": "warning",
|
||||
"silk_over_copper": "warning",
|
||||
"silk_edge_clearance": "ignore",
|
||||
"silk_over_copper": "ignore",
|
||||
"silk_overlap": "warning",
|
||||
"skew_out_of_range": "error",
|
||||
"solder_mask_bridge": "error",
|
||||
"starved_thermal": "error",
|
||||
"text_height": "warning",
|
||||
"text_thickness": "warning",
|
||||
"text_height": "ignore",
|
||||
"text_thickness": "ignore",
|
||||
"through_hole_pad_without_hole": "error",
|
||||
"too_many_vias": "error",
|
||||
"track_dangling": "warning",
|
||||
@ -113,18 +119,18 @@
|
||||
"max_error": 0.005,
|
||||
"min_clearance": 0.06,
|
||||
"min_connection": 0.0,
|
||||
"min_copper_edge_clearance": 0.0,
|
||||
"min_hole_clearance": 0.25,
|
||||
"min_copper_edge_clearance": 0.25,
|
||||
"min_hole_clearance": 0.15,
|
||||
"min_hole_to_hole": 0.25,
|
||||
"min_microvia_diameter": 0.19999999999999998,
|
||||
"min_microvia_drill": 0.09999999999999999,
|
||||
"min_resolved_spokes": 2,
|
||||
"min_resolved_spokes": 1,
|
||||
"min_silk_clearance": 0.0,
|
||||
"min_text_height": 0.7999999999999999,
|
||||
"min_text_thickness": 0.12,
|
||||
"min_through_hole_diameter": 0.19999999999999998,
|
||||
"min_through_hole_diameter": 0.15,
|
||||
"min_track_width": 0.08,
|
||||
"min_via_annular_width": 0.09999999999999999,
|
||||
"min_via_annular_width": 0.075,
|
||||
"min_via_diameter": 0.19999999999999998,
|
||||
"solder_mask_clearance": 0.0,
|
||||
"solder_mask_min_width": 0.0,
|
||||
@ -173,13 +179,11 @@
|
||||
],
|
||||
"track_widths": [
|
||||
0.0,
|
||||
0.0,
|
||||
0.0,
|
||||
0.1,
|
||||
0.15,
|
||||
0.2,
|
||||
0.25,
|
||||
0.3
|
||||
0.3,
|
||||
0.8
|
||||
],
|
||||
"via_dimensions": [
|
||||
{
|
||||
@ -187,7 +191,15 @@
|
||||
"drill": 0.0
|
||||
},
|
||||
{
|
||||
"diameter": 0.4,
|
||||
"diameter": 0.25,
|
||||
"drill": 0.15
|
||||
},
|
||||
{
|
||||
"diameter": 0.3,
|
||||
"drill": 0.15
|
||||
},
|
||||
{
|
||||
"diameter": 0.3,
|
||||
"drill": 0.2
|
||||
}
|
||||
],
|
||||
@ -416,14 +428,14 @@
|
||||
"pinned_symbol_libs": []
|
||||
},
|
||||
"meta": {
|
||||
"filename": "JumperlessArduino.kicad_pro",
|
||||
"filename": "Jumperless2.kicad_pro",
|
||||
"version": 1
|
||||
},
|
||||
"net_settings": {
|
||||
"classes": [
|
||||
{
|
||||
"bus_width": 12,
|
||||
"clearance": 0.2,
|
||||
"clearance": 0.1,
|
||||
"diff_pair_gap": 0.25,
|
||||
"diff_pair_via_gap": 0.25,
|
||||
"diff_pair_width": 0.2,
|
||||
@ -433,26 +445,26 @@
|
||||
"name": "Default",
|
||||
"pcb_color": "rgba(0, 0, 0, 0.000)",
|
||||
"schematic_color": "rgba(0, 0, 0, 0.000)",
|
||||
"track_width": 0.25,
|
||||
"via_diameter": 0.8,
|
||||
"via_drill": 0.4,
|
||||
"track_width": 0.15,
|
||||
"via_diameter": 0.3,
|
||||
"via_drill": 0.15,
|
||||
"wire_width": 6
|
||||
},
|
||||
{
|
||||
"bus_width": 12,
|
||||
"clearance": 0.15,
|
||||
"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": "Power",
|
||||
"name": "Normal",
|
||||
"pcb_color": "rgba(0, 0, 0, 0.000)",
|
||||
"schematic_color": "rgba(0, 0, 0, 0.000)",
|
||||
"track_width": 0.15,
|
||||
"via_diameter": 0.4,
|
||||
"via_drill": 0.2,
|
||||
"track_width": 0.2,
|
||||
"via_diameter": 0.3,
|
||||
"via_drill": 0.15,
|
||||
"wire_width": 6
|
||||
},
|
||||
{
|
||||
@ -464,12 +476,29 @@
|
||||
"line_style": 0,
|
||||
"microvia_diameter": 0.3,
|
||||
"microvia_drill": 0.1,
|
||||
"name": "Power",
|
||||
"pcb_color": "rgba(0, 0, 0, 0.000)",
|
||||
"schematic_color": "rgba(0, 0, 0, 0.000)",
|
||||
"track_width": 0.2,
|
||||
"via_diameter": 0.35,
|
||||
"via_drill": 0.2,
|
||||
"wire_width": 6
|
||||
},
|
||||
{
|
||||
"bus_width": 12,
|
||||
"clearance": 0.09,
|
||||
"diff_pair_gap": 0.127,
|
||||
"diff_pair_via_gap": 0.25,
|
||||
"diff_pair_width": 0.1,
|
||||
"line_style": 0,
|
||||
"microvia_diameter": 0.25,
|
||||
"microvia_drill": 0.15,
|
||||
"name": "Small",
|
||||
"pcb_color": "rgba(0, 0, 0, 0.000)",
|
||||
"schematic_color": "rgba(0, 0, 0, 0.000)",
|
||||
"track_width": 0.1,
|
||||
"via_diameter": 0.4,
|
||||
"via_drill": 0.2,
|
||||
"via_diameter": 0.25,
|
||||
"via_drill": 0.15,
|
||||
"wire_width": 6
|
||||
}
|
||||
],
|
||||
@ -478,7 +507,104 @@
|
||||
},
|
||||
"net_colors": null,
|
||||
"netclass_assignments": null,
|
||||
"netclass_patterns": []
|
||||
"netclass_patterns": [
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "+3V3"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "+5V"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "GND"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "+8V"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "-8V"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "+9V"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "-9V"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "DAC*"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "CURR*"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "ADC*"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "I*"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "T*"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "BO*"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "1*"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "2*"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "3*"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "4*"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "5*"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "6*"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "7*"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "8*"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": "9*"
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": ""
|
||||
},
|
||||
{
|
||||
"netclass": "Power",
|
||||
"pattern": ""
|
||||
}
|
||||
]
|
||||
},
|
||||
"pcbnew": {
|
||||
"last_paths": {
|
||||
@ -486,8 +612,8 @@
|
||||
"idf": "",
|
||||
"netlist": "",
|
||||
"specctra_dsn": "",
|
||||
"step": "",
|
||||
"vrml": ""
|
||||
"step": "../../Jumperless2.step",
|
||||
"vrml": "../../Jumperless2.wrl"
|
||||
},
|
||||
"page_layout_descr_file": ""
|
||||
},
|
||||
@ -515,6 +641,14 @@
|
||||
"version": 1
|
||||
},
|
||||
"net_format_name": "",
|
||||
"ngspice": {
|
||||
"fix_include_paths": true,
|
||||
"meta": {
|
||||
"version": 0
|
||||
},
|
||||
"model_mode": 0,
|
||||
"workbook_filename": ""
|
||||
},
|
||||
"page_layout_descr_file": "",
|
||||
"plot_directory": "../../",
|
||||
"spice_adjust_passive_values": false,
|
||||
39556
Hardware/KiCAD/Jumperless2.kicad_sch
Normal file
39556
Hardware/KiCAD/Jumperless2.kicad_sch
Normal file
File diff suppressed because it is too large
Load Diff
22942
Hardware/KiCAD/Jumperless2.kicad_sch-bak
Normal file
22942
Hardware/KiCAD/Jumperless2.kicad_sch-bak
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Hardware/PCBpictures/.DS_Store
vendored
Normal file
BIN
Hardware/PCBpictures/.DS_Store
vendored
Normal file
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 4.3 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.3 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.0 MiB |
BIN
Hardware/PCBpictures/Jumperless23177oobuildffsvzdiaingckrdp.png
Normal file
BIN
Hardware/PCBpictures/Jumperless23177oobuildffsvzdiaingckrdp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.7 MiB |
BIN
Hardware/PCBpictures/Jumperless23177oobuildsvzdiaingckrdp.png
Normal file
BIN
Hardware/PCBpictures/Jumperless23177oobuildsvzdiaingckrdp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.2 MiB |
BIN
Hardware/PCBpictures/Jumperless23177oobuildszdiaingckrdp.png
Normal file
BIN
Hardware/PCBpictures/Jumperless23177oobuildszdiaingckrdp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.8 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 902 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.2 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 732 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 703 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 625 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 514 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 506 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 444 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 MiB |
BIN
Hardware/Schematic.pdf
Normal file
BIN
Hardware/Schematic.pdf
Normal file
Binary file not shown.
BIN
JumperlessNano/.DS_Store
vendored
Normal file
BIN
JumperlessNano/.DS_Store
vendored
Normal file
Binary file not shown.
@ -1,143 +0,0 @@
|
||||
|
||||
This is just to make a mental map or how an arduino board
|
||||
plugged into jumperless will communicate what connections
|
||||
to make to the onboard AVR32DD32 controller via I2C or
|
||||
UART. We'll use the Stream library so the calls will be
|
||||
the same either way. There should be a sections for each
|
||||
of these things:
|
||||
|
||||
Data format - different message types/headers to be sent over I2C or UART to the control chip
|
||||
|
||||
Let's start with UART
|
||||
|
||||
|
||||
#Dumb mode# *maybe start with this because it's way easier*
|
||||
Dumb mode where pathfinding is done on the Nano and connections are sent raw
|
||||
Messages will just be: crosspoint chip (A-K), Y connection (0-15), X connection(0-7), connect or disconnect (1/0), reset (y/n), DAC output (0-1023)
|
||||
Storing connections and stuff will be the responsibility of the Nano and
|
||||
DAC could just be included in the same message above for simplicity
|
||||
|
||||
|
||||
@jumperless -dumb <A,12,3,1> <B,2,3,1> @end
|
||||
sentinel mode ch,X ,Y,c
|
||||
|
||||
#Smart mode#
|
||||
Connections/disconnections
|
||||
|
||||
Connect/disconnect from Nano to breadboard (I,J,K chips) this may call the BB connection function below
|
||||
Return number of hops, estimated resistance
|
||||
|
||||
Connect/disconnect within the breadboard (A-H chips) optional priority and redundancy value (make parallel connections)
|
||||
Return number of hops, estimated resistance
|
||||
|
||||
Load an entire state
|
||||
Send @A0, (connection), (connection), @A1, (connection), etc. @row0, (connection), @row1, @row2, (connection), (connection), etc.
|
||||
|
||||
Reset all connections
|
||||
|
||||
Find a path and return it without actually making any connections
|
||||
|
||||
|
||||
|
||||
DAC setting/waveform generation (maybe store some lookup tables for various waves on the controller)
|
||||
|
||||
Send custom waveform lookup table (or equation to make it on the fly - that's distant future shit though)
|
||||
|
||||
Request the voltage setting on DAC
|
||||
|
||||
|
||||
|
||||
Request state of the matrix (Backend or frontend, how many open connections there are left and maybe some sort of "utilization score")
|
||||
|
||||
Low Level request per chip (so send A-K)
|
||||
|
||||
returns X[16] {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, Y[8] {0,0,0,0,0,0,0,0} //0 = free 1 = used for that chip
|
||||
|
||||
|
||||
High level style request for the board
|
||||
|
||||
returns breadboardRows{0-60} @row0,(if no connections send nothing after it), @row1, (send comma seprated rows it's connected to, and nano header labels), @row3, etc. $end
|
||||
This is a tricky one, because there shouldn't reall be a maximum number of connections per row if we use all the tricks to get more connections
|
||||
I guess there's some theoretical maximum that I should figure out (probably like ~40ish idk), but we don't want to allocate memory locations for the theoretical maximum
|
||||
number of connections 60 times. It feels wasteful considering the reasonable maximum will be like ~5.
|
||||
I recently redid this as a linked list where each connection is a new entry so it's only storing connections. So maybe that's fine.
|
||||
|
||||
I think these should be human readable, so maybe send something like @row1,(connections) so the values following aren't confused with moving onto the next row
|
||||
and we can do this for the nano connections as text too, so @A0, (connection), (connection), @A1, (connection), @A2, @A3, etc.
|
||||
So the @prefix will say "we're listing connnections for the following row/nano connection" and things following without the @ will be interpreted as connections
|
||||
|
||||
|
||||
High level style request for the nano (same data as above but from the nano's POV instead)
|
||||
|
||||
returns nanoHeaderPins{0-30} @A0,(if no connections send nothing after it), @A1, (send comma seprated rows it's connected to, and other nano header labels), @A3, etc. $end
|
||||
We should probably keep the linked list containing the connections in order so we don't have to search the whole thing every time
|
||||
or maybe initialize it with an empty connection for every row so things can be easily found and placed into the list?
|
||||
|
||||
|
||||
High level style request for a single row/nano pin
|
||||
|
||||
send @row/nano pin
|
||||
returns @row/nano pin, (connection (without the @ prefix)), (connection), etc. then some sort of EOF signal, maybe $end or something like that
|
||||
|
||||
|
||||
Request for which UNCONNECTED_(A-H) are free (send whether you want yes/no or what they're connected to) this will be used a lot in hop finding
|
||||
|
||||
if you just want free/used
|
||||
returns UNCONNECTED[8] {0,0,0,0,0,0,0,0} // 0 for free, 1 for used
|
||||
|
||||
if you want what they're connected to it will be similar to above
|
||||
returns @UNCONNECTED_A, (connection), (connection), (connection), @UNCONNECTED_B, (connection), @UNCONNECTED_C, etc. , $end
|
||||
|
||||
|
||||
|
||||
Change jumper settings
|
||||
|
||||
State of the solder jumpers that decide whether the unconnected BB rows are on both sides or the far right
|
||||
|
||||
Whether to disable the op amp (cause the power supply jumpers are cut) or not and and not worry about it
|
||||
|
||||
Voltage setting jumpers on the top and bottom rails (+3.3V, 5V, DAC+-9V, disconnected/external)
|
||||
|
||||
Maybe UPDI programming jumper but I'm not sure that even matters
|
||||
|
||||
|
||||
|
||||
Change I2C address, speed or UART baud setting
|
||||
|
||||
|
||||
|
||||
Storage of the state (on the controller chip or Nano? probably the controller with an option for the nano)
|
||||
|
||||
TODO: this isn't fully thought out but I need to go fix a water heater right now
|
||||
|
||||
I think we should keep a sorted linked list with an entry for each new connection like I've already done
|
||||
|
||||
Here's the struct from the current Jumperless code (it may need to be reworked to account for the nano headers, or have a separate one for them)
|
||||
|
||||
struct connection { //I can't decide whether to store both hops in the same struct but for now I will
|
||||
|
||||
bool used; //I guess if there's an entry for it, used will always be true
|
||||
|
||||
int row1; //this needs to be changed to account for the nano pins now
|
||||
int row2;
|
||||
|
||||
int chip1;
|
||||
int chip2;
|
||||
|
||||
int chip1Xaddr;
|
||||
int chip1Yaddr;
|
||||
|
||||
int chip2Xaddr;
|
||||
int chip2Yaddr;
|
||||
|
||||
int lane; //each chip has 2 connections to every other chip (almost, I took out one of the lanes for chips that are directly across
|
||||
//from each other to make room for the K special function chip) values are 0 or 1 so it could be a bool
|
||||
|
||||
int hop; //also could be a bool unless we allow double hops in which case we need more hopChip entries below
|
||||
|
||||
int hopChip;
|
||||
int hopChipXaddr1; //we know the Y address will be 0 because UNCONNECTED_(A-H) are all at Yaddr 0, but maybe it should be added for clarity
|
||||
int hopChipXaddr2;
|
||||
|
||||
|
||||
};
|
||||
@ -1,234 +0,0 @@
|
||||
#include <Arduino.h>
|
||||
#include "JumperlessDefines.h"
|
||||
#include "jMatrixControl.h"
|
||||
#include "MatrixState.h"
|
||||
|
||||
|
||||
jMatrixControl j;
|
||||
|
||||
//I would do this in PlatformIO but dxCore is outdated there and doesn't support DD series chips. And I spent some time on a workaround but gave up
|
||||
|
||||
|
||||
nanoStatus nano;
|
||||
|
||||
void setup() {
|
||||
|
||||
//DAC0.CTRLA |= (DAC_OUTEN_bm | DAC_ENABLE_bm); // make sure the DAC is outputting 2.5V at rest so it doesn't heat the op amp trying to if it's unused
|
||||
//DAC0.DATA = (1023 << 6);
|
||||
//DAC0.DATA = (500 << 6);
|
||||
|
||||
//pinMode(PIN_PA2, OUTPUT);
|
||||
// pinMode(PIN_PA3, OUTPUT);
|
||||
//digitalWrite(PIN_PA2,LOW);
|
||||
|
||||
Serial.pins(PIN_PA2, PIN_PA3);
|
||||
Serial.begin(115200);
|
||||
|
||||
pinMode(AY0, OUTPUT);
|
||||
digitalWrite(AY0, LOW);
|
||||
pinMode(AY1, OUTPUT);
|
||||
digitalWrite(AY1, LOW);
|
||||
pinMode(AY2, OUTPUT);
|
||||
digitalWrite(AY2, LOW);
|
||||
|
||||
pinMode(AX0, OUTPUT);
|
||||
digitalWrite(AX0, LOW);
|
||||
pinMode(AX1, OUTPUT);
|
||||
digitalWrite(AX1, LOW);
|
||||
pinMode(AX2, OUTPUT);
|
||||
digitalWrite(AX2, LOW);
|
||||
pinMode(AX3, OUTPUT);
|
||||
digitalWrite(AX3, LOW);
|
||||
|
||||
pinMode(CS_A, OUTPUT);
|
||||
digitalWrite(CS_A, LOW);
|
||||
|
||||
pinMode(CS_B, OUTPUT);
|
||||
digitalWrite(CS_B, LOW);
|
||||
|
||||
pinMode(CS_C, OUTPUT);
|
||||
digitalWrite(CS_C, LOW);
|
||||
|
||||
pinMode(CS_D, OUTPUT);
|
||||
digitalWrite(CS_D, LOW);
|
||||
|
||||
pinMode(CS_E, OUTPUT);
|
||||
digitalWrite(CS_E, LOW);
|
||||
|
||||
pinMode(CS_F, OUTPUT);
|
||||
digitalWrite(CS_F, LOW);
|
||||
|
||||
pinMode(CS_G, OUTPUT);
|
||||
digitalWrite(CS_G, LOW);
|
||||
|
||||
pinMode(CS_H, OUTPUT);
|
||||
digitalWrite(CS_H, LOW);
|
||||
|
||||
pinMode(CS_I, OUTPUT);
|
||||
digitalWrite(CS_I, LOW);
|
||||
|
||||
pinMode(CS_J, OUTPUT);
|
||||
digitalWrite(CS_J, LOW);
|
||||
|
||||
pinMode(CS_K, OUTPUT);
|
||||
digitalWrite(CS_K, LOW);
|
||||
|
||||
pinMode(DATAPIN, OUTPUT);
|
||||
pinMode(STROBE, OUTPUT);
|
||||
|
||||
pinMode(RESET, OUTPUT); // all of this just sets up all these pins as outputs and drives them LOW
|
||||
// digitalWrite(RESET, HIGH); // I'm pretty sure Arduino IDE does this automatically but I wouldn't count on it
|
||||
// delayMicroseconds(380);
|
||||
digitalWrite(RESET, LOW);
|
||||
j.clearAllConnections();
|
||||
// j.connectDumbMode(1,5,'A',1);
|
||||
}
|
||||
|
||||
int outVoltage = 0;
|
||||
|
||||
void loop() {
|
||||
|
||||
j.connectDumbMode(8, 1, 'E', 1); //right now all we have is dumb mode, there's a pathfinging function in the old repo but it needs to be redone in a more understandable way
|
||||
j.connectDumbMode(14, 4, 'I', 1);
|
||||
|
||||
j.connectDumbMode(7, 6, 'D', 1);
|
||||
j.connectDumbMode(12, 3, 'J', 1);
|
||||
|
||||
|
||||
j.connectDumbMode(8, 2, 'D', 1);
|
||||
j.connectDumbMode(6, 2, 'E', 1);
|
||||
|
||||
|
||||
|
||||
delay(1000);
|
||||
|
||||
j.connectDumbMode(6, 2, 'E', 0);
|
||||
|
||||
delay(1000);
|
||||
|
||||
|
||||
printConnections();
|
||||
delay(1000);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
void printConnections(void) {
|
||||
|
||||
Serial.println("\n");
|
||||
|
||||
Serial.printf("Pin Name\tSF Chip Connections\n\r");
|
||||
for (int i = 0; i < 24; i++) //just checking if I run out of space
|
||||
{
|
||||
|
||||
Serial.print(nano.pinNames[i]);
|
||||
Serial.print("\t\t");
|
||||
|
||||
if (nano.mapI[i] >= 0) {
|
||||
Serial.print(j.chipIntToChar(nano.mapI[i]));
|
||||
Serial.print(" x");
|
||||
Serial.print(nano.xMapI[i]);
|
||||
Serial.print("\t");
|
||||
}
|
||||
if (nano.mapJ[i] >= 0) {
|
||||
Serial.print(j.chipIntToChar(nano.mapJ[i]));
|
||||
Serial.print(" x");
|
||||
Serial.print(nano.xMapJ[i]);
|
||||
Serial.print("\t");
|
||||
}
|
||||
if (nano.mapK[i] >= 0) {
|
||||
Serial.print(j.chipIntToChar(nano.mapK[i]));
|
||||
Serial.print(" x");
|
||||
Serial.print(nano.xMapK[i]);
|
||||
Serial.print("\t");
|
||||
}
|
||||
|
||||
Serial.println(" ");
|
||||
}
|
||||
Serial.println("\n\n");
|
||||
|
||||
|
||||
Serial.println("\tX connections \t\t\t\t\t\t Y connections");
|
||||
for (int i = 0; i < 11; i++) //just checking if I run out of space
|
||||
{
|
||||
|
||||
if (i == 8) Serial.println(' ');
|
||||
|
||||
Serial.print(mt[i].chipChar);
|
||||
Serial.print("\t ");
|
||||
|
||||
for (int j = 0; j < 16; j++) {
|
||||
//mt[i].xStatus[j] = -1;
|
||||
|
||||
///int ch = (int) mt[i].xMap[j];
|
||||
if (i < 8) {
|
||||
Serial.print(mt[mt[i].xMap[j]].chipChar); //here we're using the value of yMap as the index to return chipChar on that chipStatus struct
|
||||
} else {
|
||||
|
||||
switch (mt[i].xMap[j]) {
|
||||
case GND:
|
||||
Serial.print("GND");
|
||||
break;
|
||||
|
||||
case TOP_RAIL:
|
||||
Serial.print("TOP");
|
||||
break;
|
||||
|
||||
case BOTTOM_RAIL:
|
||||
Serial.print("BOT");
|
||||
break;
|
||||
|
||||
case DAC0TO5V:
|
||||
Serial.print("05V");
|
||||
break;
|
||||
|
||||
case DACPLUSMINUS9V:
|
||||
Serial.print("D9V");
|
||||
break;
|
||||
|
||||
default:
|
||||
//Serial.print(mt[i].xMap[j]);
|
||||
Serial.print(nano.pinNames[nano.reversePinMap[mt[i].xMap[j]]]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (j < 15) Serial.print(", ");
|
||||
}
|
||||
Serial.print("\t\t");
|
||||
if (i > 7) Serial.print(" ");
|
||||
|
||||
for (int j = 0; j < 8; j++) {
|
||||
//chips[i].yStatus[j] = j;
|
||||
|
||||
|
||||
if (mt[i].yMap[j] > 0 && mt[i].yMap[j] < 10) Serial.print(' '); //padding
|
||||
if (i > 7) {
|
||||
Serial.print(mt[mt[i].yMap[j]].chipChar);
|
||||
} else {
|
||||
Serial.print(mt[i].yMap[j]);
|
||||
}
|
||||
if (j < 7) Serial.print(',');
|
||||
}
|
||||
Serial.println("\t <- Map");
|
||||
Serial.print("\t");
|
||||
|
||||
for (int j = 0; j < 16; j++) {
|
||||
//mt[i].xStatus[j] = -1;
|
||||
if (i > 7) Serial.print(" ");
|
||||
Serial.print(mt[i].xStatus[j]);
|
||||
if (mt[i].xStatus[j] > 0 && mt[i].xStatus[j] < 10) Serial.print(' '); //padding
|
||||
if (i > 7) Serial.print(" ");
|
||||
if (j < 15) Serial.print(',');
|
||||
}
|
||||
Serial.print("\t\t");
|
||||
for (int j = 0; j < 8; j++) {
|
||||
//chips[i].yStatus[j] = j;
|
||||
Serial.print(mt[i].yStatus[j]);
|
||||
if (mt[i].yStatus[j] > 0 && mt[i].yStatus[j] < 10) Serial.print(' '); //padding
|
||||
if (j < 7) Serial.print(',');
|
||||
}
|
||||
|
||||
Serial.println("\t <- Status\n");
|
||||
}
|
||||
}
|
||||
@ -1,202 +0,0 @@
|
||||
#ifndef MATRIXSTATE_H
|
||||
#define MATRIXSTATE_H
|
||||
|
||||
#include <Arduino.h>
|
||||
#include "JumperlessDefines.h"
|
||||
|
||||
|
||||
//see the comments at the end for a more nicely formatted version that's not in struct initalizers
|
||||
|
||||
|
||||
struct chipStatus{
|
||||
|
||||
int chipNumber;
|
||||
char chipChar;
|
||||
int8_t xStatus[16]; //store the bb row or nano conn this is eventually connected to so they can be stacked if conns are redundant
|
||||
int8_t yStatus[8]; //store the row/nano it's connected to
|
||||
const int8_t xMap[16];
|
||||
const int8_t yMap[8];
|
||||
|
||||
};
|
||||
|
||||
|
||||
struct chipStatus mt[11] = {
|
||||
{0,'A',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{CHIP_I, CHIP_J, CHIP_B, CHIP_B, CHIP_C, CHIP_C, CHIP_D, CHIP_D, CHIP_E, CHIP_K, CHIP_F, CHIP_F, CHIP_G, CHIP_G, CHIP_H, CHIP_H},//X MAP constant
|
||||
{-1, t2,t3, t4, t5, t6, t7, t8}}, // Y MAP constant
|
||||
|
||||
{1,'B',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{CHIP_A, CHIP_A, CHIP_I, CHIP_J, CHIP_C, CHIP_C, CHIP_D, CHIP_D, CHIP_E, CHIP_E, CHIP_F, CHIP_K, CHIP_G, CHIP_G, CHIP_H, CHIP_H},
|
||||
{-1, t9,t10,t11,t12,t13,t14,t15}},
|
||||
|
||||
{2,'C',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{CHIP_A, CHIP_A, CHIP_B, CHIP_B, CHIP_I, CHIP_J, CHIP_D, CHIP_D, CHIP_E, CHIP_E, CHIP_F, CHIP_F, CHIP_G, CHIP_K, CHIP_H, CHIP_H},
|
||||
{-1, t16,t17,t18,t19,t20,t21,t22}},
|
||||
|
||||
{3,'D',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{CHIP_A, CHIP_A, CHIP_B, CHIP_B, CHIP_C, CHIP_C, CHIP_I, CHIP_J, CHIP_E, CHIP_E, CHIP_F, CHIP_F, CHIP_G, CHIP_G, CHIP_H, CHIP_K},
|
||||
{-1, t23,t24,t25,t26,t27,t28,t29}},
|
||||
|
||||
{4,'E',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{CHIP_A, CHIP_K, CHIP_B, CHIP_B, CHIP_C, CHIP_C, CHIP_D, CHIP_D, CHIP_I, CHIP_J, CHIP_F, CHIP_F, CHIP_G, CHIP_G, CHIP_H, CHIP_H},
|
||||
{-1, b2, b3, b4, b5, b6, b7, b8}},
|
||||
|
||||
{5,'F',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{CHIP_A, CHIP_A, CHIP_B, CHIP_K, CHIP_C, CHIP_C, CHIP_D, CHIP_D, CHIP_E, CHIP_E, CHIP_I, CHIP_J, CHIP_G, CHIP_G, CHIP_H, CHIP_H},
|
||||
{-1, b9, b10,b11,b12,b13,b14,b15}},
|
||||
|
||||
{6,'G',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{CHIP_A, CHIP_A, CHIP_B, CHIP_B, CHIP_C, CHIP_K, CHIP_D, CHIP_D, CHIP_E, CHIP_E, CHIP_F, CHIP_F, CHIP_I, CHIP_J, CHIP_H, CHIP_H},
|
||||
{-1, b16,b17,b18,b19,b20,b21,b22}},
|
||||
|
||||
{7,'H',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{CHIP_A, CHIP_A, CHIP_B, CHIP_B, CHIP_C, CHIP_C, CHIP_D, CHIP_K, CHIP_E, CHIP_E, CHIP_F, CHIP_F, CHIP_G, CHIP_G, CHIP_I, CHIP_J},
|
||||
{-1, b23,b24,b25,b26,b27,b28,b29}},
|
||||
|
||||
{8,'I',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{NANO_A0, NANO_D1, NANO_A2, NANO_D3, NANO_A4, NANO_D5, NANO_A6, NANO_D7, NANO_D11, NANO_D9, NANO_D13, NANO_RESET, TOP_RAIL, BOTTOM_RAIL, GND, DAC0TO5V},
|
||||
{CHIP_A,CHIP_B,CHIP_C,CHIP_D,CHIP_E,CHIP_F,CHIP_G,CHIP_H}},
|
||||
|
||||
{9,'J',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{NANO_D0, NANO_A1, NANO_D2, NANO_A3, NANO_D4, NANO_A5, NANO_D6, NANO_A7, NANO_D8, NANO_D10, NANO_D12, NANO_AREF, TOP_RAIL, BOTTOM_RAIL, GND, DACPLUSMINUS9V},
|
||||
{CHIP_A,CHIP_B,CHIP_C,CHIP_D,CHIP_E,CHIP_F,CHIP_G,CHIP_H}},
|
||||
|
||||
{10,'K',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{NANO_A0, NANO_A1, NANO_A2, NANO_A3, NANO_A4, NANO_A5, NANO_A6, NANO_A7, NANO_D2, NANO_D3, NANO_D4, NANO_D5, NANO_D6, NANO_D7, NANO_D8, NANO_D9},
|
||||
{CHIP_A,CHIP_B,CHIP_C,CHIP_D,CHIP_E,CHIP_F,CHIP_G,CHIP_H}}
|
||||
|
||||
};
|
||||
|
||||
|
||||
struct nanoStatus{ //there's only one of these so ill declare and initalize together unlike above
|
||||
|
||||
//all these arrays should line up so one index will give you all this data
|
||||
|
||||
const char *pinNames[24]={ "D0 ", "D1 ", "D2 ", "D3 ", "D4 ", "D5 ", "D6 ", "D7 ", "D8 ", "D9 ", "D10", "D11", "D12", "D13", "RST", "REF", "A0 ", "A1 ", "A2 ", "A3 ", "A4 ", "A5 ", "A6 ", "A7 "};
|
||||
|
||||
const int8_t pinMap[24] ={NANO_D0, NANO_D1, NANO_D2, NANO_D3, NANO_D4, NANO_D5, NANO_D6, NANO_D7, NANO_D8, NANO_D9, NANO_D10, NANO_D11, NANO_D12, NANO_D13, NANO_RESET, NANO_AREF, NANO_A0, NANO_A1, NANO_A2, NANO_A3, NANO_A4, NANO_A5, NANO_A6, NANO_A7};
|
||||
|
||||
//this shows what sf chip each nano pin connects to
|
||||
const int8_t mapI[24] = {-1 , CHIP_I , -1 , CHIP_I , -1 , CHIP_I , -1 , CHIP_I , -1 , CHIP_I , -1 , CHIP_I , -1 , CHIP_I , CHIP_I , -1 , CHIP_I , -1 , CHIP_I , -1 , CHIP_I , -1 , CHIP_I , -1 };
|
||||
const int8_t xMapI[24] = {-1 , 1 , -1 , 3 , -1 , 5 , -1 , 7 , -1 , 9 , -1 , 8 , -1 , 10 , 11 , -1 , 0 , -1 , 2 , -1 , 4 , -1 , 6 , -1 };
|
||||
int8_t xStatusI[24] = {-1 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , -1 }; //-1 for not connected to that chip, 0 for available
|
||||
|
||||
|
||||
const int8_t mapJ[24] = {CHIP_J , -1 , CHIP_J , -1 , CHIP_J , -1 , CHIP_J , -1 , CHIP_J , -1 , CHIP_J , -1 , CHIP_J , -1 , -1 , CHIP_J , -1 , CHIP_J , -1 , CHIP_J , -1 , CHIP_J , -1 , CHIP_J };
|
||||
const int8_t xMapJ[24] = {0 , -1 , 2 , -1 , 4 , -1 , 6 , -1 , 8 , -1 , 9 , -1 , 10 , -1 , -1 , 11 , -1 , 1 , -1 , 3 , -1 , 5 , -1 , 7 };
|
||||
int8_t xStatusJ[24] = {0 , -1 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , -1 , 0 }; //-1 for not connected to that chip, 0 for available
|
||||
|
||||
|
||||
const int8_t mapK[24] = {-1 , -1 , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , -1 , -1 , -1 , -1 , -1 , -1 , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K };
|
||||
const int8_t xMapK[24] = {-1 , -1 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 , -1 , -1 , -1 , -1 , -1 , -1 , 0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 };
|
||||
int8_t xStatusK[24] = {-1 , -1 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , -1 , -1 , -1 , -1 , -1 , -1 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 }; //-1 for not connected to that chip, 0 for available
|
||||
|
||||
// mapIJK[] will tell you whethher there's a connection from that nano pin to the corresponding special function chip
|
||||
// xMapIJK[] will tell you the X pin that it's connected to on that sf chip
|
||||
// xStatusIJK[] says whether that x pin is being used (this should be the same as mt[8-10].xMap[] if theyre all stacked on top of each other)
|
||||
// I haven't decided whether to make this just a flag, or store that signal's destination
|
||||
const int8_t reversePinMap[108] = {NANO_D0, NANO_D1, NANO_D2, NANO_D3, NANO_D4, NANO_D5, NANO_D6, NANO_D7, NANO_D8, NANO_D9, NANO_D10, NANO_D11, NANO_D12, NANO_D13, NANO_RESET, NANO_AREF, NANO_A0, NANO_A1, NANO_A2, NANO_A3, NANO_A4, NANO_A5, NANO_A6, NANO_A7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,GND,TOP_RAIL,BOTTOM_RAIL,DAC0TO5V,DACPLUSMINUS9V,105};
|
||||
|
||||
};
|
||||
|
||||
/*
|
||||
|
||||
uint8_t connectionsMatrix[85][85];
|
||||
|
||||
connectionsMatrix [1-60][1-60] are breadboard connections
|
||||
connectionsMatrix [60-85][60-85] are Nano connections
|
||||
|
||||
value stored is row it's connected to, so we can use the value as the index for the next connection to see which nets are connected
|
||||
|
||||
or we can do a 64 bit number for the breadboard and just store a 1 or 0 in that bit location
|
||||
|
||||
uint64_t bbConns[64];
|
||||
|
||||
uint64_t nanoConns[25];
|
||||
|
||||
each set bit in the 64bit value correspond to which bb rows that nano pin is connected to
|
||||
|
||||
should nano conns be handled separately?
|
||||
|
||||
the problem with all this is that it says nothing about the path taken
|
||||
|
||||
*/
|
||||
/*
|
||||
//this is all defined in the struct initalizer now but leaving this here for reference
|
||||
|
||||
const int8_t sfyConnectionMap[8] = {CHIP_A,CHIP_B,CHIP_C,CHIP_D,CHIP_E,CHIP_F,CHIP_G,CHIP_H}; //chips
|
||||
|
||||
|
||||
const int8_t xConnectionMapA[16] = {CHIP_I, CHIP_J, CHIP_B, CHIP_B, CHIP_C, CHIP_C, CHIP_D, CHIP_D, CHIP_E, CHIP_K, CHIP_F, CHIP_F, CHIP_G, CHIP_G, CHIP_H, CHIP_H};
|
||||
const int8_t xConnectionMapB[16] = {CHIP_A, CHIP_A, CHIP_I, CHIP_J, CHIP_C, CHIP_C, CHIP_D, CHIP_D, CHIP_E, CHIP_E, CHIP_F, CHIP_K, CHIP_G, CHIP_G, CHIP_H, CHIP_H};
|
||||
const int8_t xConnectionMapC[16] = {CHIP_A, CHIP_A, CHIP_B, CHIP_B, CHIP_I, CHIP_J, CHIP_D, CHIP_D, CHIP_E, CHIP_E, CHIP_F, CHIP_F, CHIP_G, CHIP_K, CHIP_H, CHIP_H};
|
||||
const int8_t xConnectionMapD[16] = {CHIP_A, CHIP_A, CHIP_B, CHIP_B, CHIP_C, CHIP_C, CHIP_I, CHIP_J, CHIP_E, CHIP_E, CHIP_F, CHIP_F, CHIP_G, CHIP_G, CHIP_H, CHIP_K};
|
||||
const int8_t xConnectionMapE[16] = {CHIP_A, CHIP_K, CHIP_B, CHIP_B, CHIP_C, CHIP_C, CHIP_D, CHIP_D, CHIP_I, CHIP_J, CHIP_F, CHIP_F, CHIP_G, CHIP_G, CHIP_H, CHIP_H};
|
||||
const int8_t xConnectionMapF[16] = {CHIP_A, CHIP_A, CHIP_B, CHIP_K, CHIP_C, CHIP_C, CHIP_D, CHIP_D, CHIP_E, CHIP_E, CHIP_I, CHIP_J, CHIP_G, CHIP_G, CHIP_H, CHIP_H};
|
||||
const int8_t xConnectionMapG[16] = {CHIP_A, CHIP_A, CHIP_B, CHIP_B, CHIP_C, CHIP_K, CHIP_D, CHIP_D, CHIP_E, CHIP_E, CHIP_F, CHIP_F, CHIP_I, CHIP_J, CHIP_H, CHIP_H};
|
||||
const int8_t xConnectionMapH[16] = {CHIP_A, CHIP_A, CHIP_B, CHIP_B, CHIP_C, CHIP_C, CHIP_D, CHIP_K, CHIP_E, CHIP_E, CHIP_F, CHIP_F, CHIP_G, CHIP_G, CHIP_I, CHIP_J};
|
||||
|
||||
const int8_t yConnectionMapA[8] = {-1, t2,t3, t4, t5, t6, t7, t8};
|
||||
const int8_t yConnectionMapB[8] = {-1, t9,t10,t11,t12,t13,t14,t15};
|
||||
const int8_t yConnectionMapC[8] = {-1, t16,t17,t18,t19,t20,t21,t22};
|
||||
const int8_t yConnectionMapD[8] = {-1, t23,t24,t25,t26,t27,t28,t29}; //make an alt_jumper version later
|
||||
|
||||
const int8_t yConnectionMapE[8] = {-1, b2, b3, b4, b5, b6, b7, b8};
|
||||
const int8_t yConnectionMapF[8] = {-1, b9, b10,b11,b12,b13,b14,b15};
|
||||
const int8_t yConnectionMapG[8] = {-1, b16,b17,b18,b19,b20,b21,b22};
|
||||
const int8_t yConnectionMapH[8] = {-1, b23,b24,b25,b26,b27,b28,b29}; //make an alt_jumper version later
|
||||
|
||||
|
||||
const int8_t yConnectionMapE[8] = {-1, 33, 34, 35, 36, 37, 38, 39}; // if you want to match them up with the schematic
|
||||
const int8_t yConnectionMapF[8] = {-1, 40, 41, 42, 43, 44, 45, 46}; // use this for reference (it's the same thing as above)
|
||||
const int8_t yConnectionMapG[8] = {-1, 47, 48, 49, 50, 51, 52, 53}; //
|
||||
const int8_t yConnectionMapH[8] = {-1, 54, 55, 56, 57, 58, 59, 60}; //
|
||||
|
||||
|
||||
const int8_t xConnectionMapI[16] = {NANO_A0, NANO_D1, NANO_A2, NANO_D3, NANO_A4, NANO_D5, NANO_A6, NANO_D7, NANO_D11, NANO_D9, NANO_D13, NANO_RESET, TOP_RAIL, BOTTOM_RAIL, GND, DAC0TO5V};
|
||||
const int8_t xConnectionMapJ[16] = {NANO_D0, NANO_A1, NANO_D2, NANO_A3, NANO_D4, NANO_A5, NANO_D6, NANO_A7, NANO_D8, NANO_D10, NANO_D12, NANO_AREF, TOP_RAIL, BOTTOM_RAIL, GND, DACPLUSMINUS9V};
|
||||
const int8_t xConnectionMapK[16] = {NANO_A0, NANO_A1, NANO_A2, NANO_A3, NANO_A4, NANO_A5, NANO_A6, NANO_A7, NANO_D2, NANO_D3, NANO_D4, NANO_D5, NANO_D6, NANO_D7, NANO_D8, NANO_D9};
|
||||
|
||||
//nanoConnectionMap[0] is the list of pin numbers, [1] and [3] are which special function chips they're connected to, [2] and [4] is the X pin on that chip, -1 for none
|
||||
|
||||
const char *pinNames[] ={ "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "D8", "D9", "D10", "D11", "D12", "D13", "RESET", "AREF", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7"};
|
||||
const char nanoPinMap[] ={NANO_D0, NANO_D1, NANO_D2, NANO_D3, NANO_D4, NANO_D5, NANO_D6, NANO_D7, NANO_D8, NANO_D9, NANO_D10, NANO_D11, NANO_D12, NANO_D13, NANO_RESET, NANO_AREF, NANO_A0, NANO_A1, NANO_A2, NANO_A3, NANO_A4, NANO_A5, NANO_A6, NANO_A7};
|
||||
|
||||
const int8_t nanoConnectionMap[5][24] = {{NANO_D0, NANO_D1, NANO_D2, NANO_D3, NANO_D4, NANO_D5, NANO_D6, NANO_D7, NANO_D8, NANO_D9, NANO_D10, NANO_D11, NANO_D12, NANO_D13, NANO_RESET, NANO_AREF, NANO_A0, NANO_A1, NANO_A2, NANO_A3, NANO_A4, NANO_A5, NANO_A6, NANO_A7},
|
||||
|
||||
{CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J },
|
||||
{0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 9 , 8 , 10 , 10 , 11 , 11 , 0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 },
|
||||
|
||||
{-1 , -1 , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , -1 , -1 , -1 , -1 , -1 , -1 , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K },
|
||||
{-1 , -1 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 , -1 , -1 , -1 , -1 , -1 , -1 , 0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 }};
|
||||
|
||||
// so for example nanoConnectionMap
|
||||
|
||||
*/
|
||||
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
39
JumperlessNano/include/README
Normal file
39
JumperlessNano/include/README
Normal file
@ -0,0 +1,39 @@
|
||||
|
||||
This directory is intended for project header files.
|
||||
|
||||
A header file is a file containing C declarations and macro definitions
|
||||
to be shared between several project source files. You request the use of a
|
||||
header file in your project source file (C, C++, etc) located in `src` folder
|
||||
by including it, with the C preprocessing directive `#include'.
|
||||
|
||||
```src/main.c
|
||||
|
||||
#include "header.h"
|
||||
|
||||
int main (void)
|
||||
{
|
||||
...
|
||||
}
|
||||
```
|
||||
|
||||
Including a header file produces the same results as copying the header file
|
||||
into each source file that needs it. Such copying would be time-consuming
|
||||
and error-prone. With a header file, the related declarations appear
|
||||
in only one place. If they need to be changed, they can be changed in one
|
||||
place, and programs that include the header file will automatically use the
|
||||
new version when next recompiled. The header file eliminates the labor of
|
||||
finding and changing all the copies as well as the risk that a failure to
|
||||
find one copy will result in inconsistencies within a program.
|
||||
|
||||
In C, the usual convention is to give header files names that end with `.h'.
|
||||
It is most portable to use only letters, digits, dashes, and underscores in
|
||||
header file names, and at most one dot.
|
||||
|
||||
Read more about using header files in official GCC documentation:
|
||||
|
||||
* Include Syntax
|
||||
* Include Operation
|
||||
* Once-Only Headers
|
||||
* Computed Includes
|
||||
|
||||
https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html
|
||||
@ -1,460 +0,0 @@
|
||||
|
||||
#include "JumperlessDefines.h"
|
||||
#include "jMatrixControl.h"
|
||||
|
||||
|
||||
//This is basically copied from the old code and is working well so this can be taken for granted
|
||||
|
||||
|
||||
|
||||
jMatrixControl::jMatrixControl(void)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
int jMatrixControl::connectDumbMode(int x,int y, int chip, int connectDisconnect) //overloaded to accept char, int or ascii ints as the chip selection
|
||||
{
|
||||
//digitalWriteFast(RESET, LOW);
|
||||
char charChip = chipIntToChar(chip); //this converts the chip into a char and back to allow it to accept ascii number values and stuff
|
||||
|
||||
if (charChip == ' ') //if the chip sent was invalid (chipIntToChar returns a space), return 0
|
||||
{
|
||||
Serial.println("Bad Chip!");
|
||||
return 0;
|
||||
}
|
||||
int intChipSanitized = chipCharToInt(charChip);
|
||||
Serial.println(intChipSanitized);
|
||||
|
||||
setAddress(x,y);
|
||||
selectChip(intChipSanitized);
|
||||
|
||||
|
||||
|
||||
strobeItIn(connectDisconnect);
|
||||
|
||||
deselectChip();
|
||||
//Serial.printf("connected X %d to Y %d on chip %c\n\n\r", x,y,chipIntToChar(chip));
|
||||
return 1;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
int jMatrixControl::connectDumbMode(int x,int y, char chip, int connectDisconnect)
|
||||
{
|
||||
//digitalWriteFast(RESET, LOW);
|
||||
int intChipSanitized = chipCharToInt(chip); //converts to an int and allows upper or lower case
|
||||
|
||||
if (intChipSanitized == -1) // returns 0 if the chip is invalid
|
||||
{
|
||||
Serial.println("Bad Chip!");
|
||||
return 0;
|
||||
}
|
||||
|
||||
setAddress(x,y);
|
||||
selectChip(intChipSanitized);
|
||||
strobeItIn(connectDisconnect);
|
||||
|
||||
deselectChip();
|
||||
//Serial.printf("connected X %d to Y %d on chip %c\n\n\r", x,y,chipIntToChar(chip));
|
||||
return 1;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
void jMatrixControl::setAddress(int Xaddr, int Yaddr)
|
||||
{
|
||||
|
||||
const byte MTfuckedUpTruthTable [16] = {0,1,2,3,4,5,8,9,10,11,12,13,6,7,14,15}; //apparently X12 and X13 needed to be crammed in between X5 and X6
|
||||
|
||||
byte XaddrFixed = MTfuckedUpTruthTable[Xaddr];
|
||||
|
||||
|
||||
digitalWrite(AX3, LOW);
|
||||
digitalWrite(AX2, LOW);
|
||||
digitalWrite(AX1, LOW);
|
||||
digitalWrite(AX0, LOW);
|
||||
|
||||
digitalWrite(AY2, LOW);
|
||||
digitalWrite(AY1, LOW);
|
||||
digitalWrite(AY0, LOW);
|
||||
|
||||
|
||||
delayMicroseconds(310);
|
||||
|
||||
int tempAX3 = (XaddrFixed & B00001000);
|
||||
tempAX3 = tempAX3 >> 3;
|
||||
int tempAX2 = (XaddrFixed & B00000100);
|
||||
tempAX2 = tempAX2 >> 2;
|
||||
int tempAX1 = (XaddrFixed & B00000010);
|
||||
tempAX1 = tempAX1 >> 1;
|
||||
int tempAX0 = (XaddrFixed & B00000001);
|
||||
|
||||
|
||||
digitalWrite(AX3, tempAX3); //this only writes the line high if that bit is set in binary value of Xaddr
|
||||
|
||||
digitalWrite(AX2, tempAX2); //for example Xaddr = 6 or B00000110 //note: && is logical AND, and & is bitwise AND
|
||||
|
||||
digitalWrite(AX1, tempAX1); //this bitwise ANDs Xaddr and a binary value with just one bit set
|
||||
|
||||
digitalWrite(AX0, tempAX0); //so we get Xaddr 00000110
|
||||
/*
|
||||
Serial.print ("X ");
|
||||
Serial.print (tempAX3);
|
||||
Serial.print (tempAX2);
|
||||
Serial.print (tempAX1);
|
||||
Serial.println (tempAX0);
|
||||
*/
|
||||
int tempAY2 = Yaddr & B00000100;
|
||||
tempAY2 = tempAY2 >> 2;
|
||||
int tempAY1 = Yaddr & B00000010;
|
||||
tempAY1 = tempAY1 >> 1;
|
||||
int tempAY0 = Yaddr & B00000001;
|
||||
|
||||
|
||||
// AND bit selector 00001000 = 0
|
||||
digitalWrite(AY2, tempAY2); //then we AND that again with HIGH (which is just interpreted as 1)
|
||||
|
||||
digitalWrite(AY1, tempAY1); //to get 1(HIGH) && 0(the result from above) = 0 (which is LOW)
|
||||
|
||||
digitalWrite(AY0, tempAY0); //we do that for each bit to end up with the address lines LLLLLHHL
|
||||
/*
|
||||
Serial.print ("\nY ");
|
||||
Serial.print (tempAY2);
|
||||
Serial.print (tempAY1);
|
||||
Serial.println (tempAY0);
|
||||
*/
|
||||
delayMicroseconds(925);
|
||||
|
||||
}
|
||||
|
||||
void jMatrixControl::strobeItIn(int connectDisconnect)
|
||||
{
|
||||
|
||||
if (connectDisconnect == 0)
|
||||
{
|
||||
digitalWrite(DATAPIN, LOW);
|
||||
}
|
||||
else
|
||||
{
|
||||
digitalWrite(DATAPIN, HIGH);
|
||||
}
|
||||
|
||||
//pinMode(STROBE, OUTPUT);
|
||||
//delayMicroseconds(2); //Hold time in the datasheet for the MT8816 says this only needs to be 10 nanoseconds
|
||||
digitalWrite(STROBE, HIGH); //but we're not super concerned with speed so I'll give it 1000X more just to be safe
|
||||
delayMicroseconds(250); //Strobe has to be a minimum of 20 nanoseconds, but I dont want to think about the
|
||||
//Serial.println("!!!!!!!!!!!!");
|
||||
digitalWrite(STROBE, LOW); //fact that light only travels like 4 meters in that time through copper
|
||||
//pinMode(STROBE, OUTPUT);
|
||||
delayMicroseconds(250);
|
||||
digitalWrite(DATAPIN, LOW);
|
||||
//delayMicroseconds(30);
|
||||
}
|
||||
|
||||
int jMatrixControl::selectChip(int chipInt)
|
||||
{ //asserts whichever chip select line we send it
|
||||
|
||||
digitalWrite(CS_A, LOW); //Chip Selects are Active High on the MT8816
|
||||
digitalWrite(CS_B, LOW); //make sure they're all deselected first
|
||||
digitalWrite(CS_C, LOW);
|
||||
digitalWrite(CS_D, LOW);
|
||||
digitalWrite(CS_E, LOW);
|
||||
digitalWrite(CS_F, LOW);
|
||||
digitalWrite(CS_G, LOW);
|
||||
digitalWrite(CS_H, LOW);
|
||||
digitalWrite(CS_I, LOW);
|
||||
digitalWrite(CS_J, LOW);
|
||||
digitalWrite(CS_K, LOW);
|
||||
|
||||
delayMicroseconds(200);
|
||||
//Serial.print(chipToChar(chip));
|
||||
|
||||
switch(chipInt)
|
||||
{
|
||||
case 0:
|
||||
digitalWrite(CS_A, HIGH);
|
||||
return 1;
|
||||
break;
|
||||
|
||||
case 1:
|
||||
digitalWrite(CS_B, HIGH);
|
||||
return 1;
|
||||
break;
|
||||
|
||||
case 2:
|
||||
digitalWrite(CS_C, HIGH);
|
||||
return 1;
|
||||
break;
|
||||
|
||||
case 3:
|
||||
digitalWrite(CS_D, HIGH);
|
||||
return 1;
|
||||
break;
|
||||
|
||||
case 4:
|
||||
digitalWrite(CS_E, HIGH);
|
||||
return 1;
|
||||
break;
|
||||
|
||||
case 5:
|
||||
digitalWrite(CS_F, HIGH);
|
||||
return 1;
|
||||
break;
|
||||
|
||||
case 6:
|
||||
digitalWrite(CS_G, HIGH);
|
||||
return 1;
|
||||
break;
|
||||
|
||||
case 7:
|
||||
digitalWrite(CS_H, HIGH);
|
||||
return 1;
|
||||
break;
|
||||
|
||||
case 8:
|
||||
digitalWrite(CS_I, HIGH);
|
||||
return 1;
|
||||
break;
|
||||
|
||||
case 9:
|
||||
digitalWrite(CS_J, HIGH);
|
||||
return 1;
|
||||
break;
|
||||
|
||||
case 10:
|
||||
digitalWrite(CS_K, HIGH);
|
||||
return 1;
|
||||
break;
|
||||
|
||||
default:
|
||||
return 0;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
void jMatrixControl::deselectChip(void)
|
||||
{ //this should be fairly obvious
|
||||
|
||||
digitalWrite(CS_A, LOW);
|
||||
digitalWrite(CS_B, LOW);
|
||||
digitalWrite(CS_C, LOW);
|
||||
digitalWrite(CS_D, LOW);
|
||||
digitalWrite(CS_E, LOW);
|
||||
digitalWrite(CS_F, LOW);
|
||||
digitalWrite(CS_G, LOW);
|
||||
digitalWrite(CS_H, LOW);
|
||||
digitalWrite(CS_I, LOW);
|
||||
digitalWrite(CS_J, LOW);
|
||||
digitalWrite(CS_K, LOW);
|
||||
|
||||
digitalWrite(AX3, LOW);
|
||||
digitalWrite(AX2, LOW);
|
||||
digitalWrite(AX1, LOW);
|
||||
digitalWrite(AX0, LOW);
|
||||
|
||||
digitalWrite(AY2, LOW);
|
||||
digitalWrite(AY1, LOW);
|
||||
digitalWrite(AY0, LOW);
|
||||
|
||||
digitalWrite(DATAPIN, LOW);
|
||||
digitalWrite(STROBE, LOW);
|
||||
digitalWriteFast(RESET, LOW);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
void jMatrixControl::clearAllConnections(void)
|
||||
{ //when you send a reset pulse, all previous connections are cleared on whichever chip is CS_ed but we'll do both for now
|
||||
/*
|
||||
digitalWriteFast(CS_A, HIGH);
|
||||
digitalWriteFast(CS_B, HIGH);
|
||||
digitalWriteFast(CS_C, HIGH);
|
||||
digitalWriteFast(CS_D, HIGH);
|
||||
digitalWriteFast(CS_E, HIGH);
|
||||
digitalWriteFast(CS_F, HIGH);
|
||||
digitalWriteFast(CS_G, HIGH);
|
||||
digitalWriteFast(CS_H, HIGH);
|
||||
digitalWriteFast(CS_I, HIGH);
|
||||
digitalWriteFast(CS_J, HIGH);
|
||||
digitalWriteFast(CS_K, HIGH);
|
||||
*/
|
||||
digitalWriteFast(RESET, HIGH);
|
||||
delayMicroseconds(2000); //datasheet says 40 nanoseconds minimum, this is a lot more than that
|
||||
digitalWriteFast(RESET, LOW);
|
||||
delayMicroseconds(925);
|
||||
|
||||
digitalWriteFast(CS_A, LOW);
|
||||
digitalWriteFast(CS_B, LOW);
|
||||
digitalWriteFast(CS_C, LOW);
|
||||
digitalWriteFast(CS_D, LOW);
|
||||
digitalWriteFast(CS_E, LOW);
|
||||
digitalWriteFast(CS_F, LOW);
|
||||
digitalWriteFast(CS_G, LOW);
|
||||
digitalWriteFast(CS_H, LOW);
|
||||
digitalWriteFast(CS_I, LOW);
|
||||
digitalWriteFast(CS_J, LOW);
|
||||
digitalWriteFast(CS_K, LOW);
|
||||
}
|
||||
|
||||
|
||||
|
||||
char jMatrixControl::chipIntToChar(int chipInt)//also accepts the raw ascii values (65=A, 97=a, 66=B, 98=b...)
|
||||
{
|
||||
|
||||
switch (chipInt)
|
||||
{
|
||||
case 0: //fall through
|
||||
case 65:
|
||||
case 97:
|
||||
return 'A';
|
||||
break;
|
||||
|
||||
case 1:
|
||||
case 66:
|
||||
case 98:
|
||||
return 'B';
|
||||
break;
|
||||
|
||||
case 2:
|
||||
case 67:
|
||||
case 99:
|
||||
return 'C';
|
||||
break;
|
||||
|
||||
case 3:
|
||||
case 68:
|
||||
case 100:
|
||||
return 'D';
|
||||
break;
|
||||
|
||||
case 4:
|
||||
case 69:
|
||||
case 101:
|
||||
return 'E';
|
||||
break;
|
||||
|
||||
case 5:
|
||||
case 70:
|
||||
case 102:
|
||||
return 'F';
|
||||
break;
|
||||
|
||||
case 6:
|
||||
case 71:
|
||||
case 103:
|
||||
return 'G';
|
||||
break;
|
||||
|
||||
case 7:
|
||||
case 72:
|
||||
case 104:
|
||||
return 'H';
|
||||
break;
|
||||
|
||||
case 8:
|
||||
case 73:
|
||||
case 105:
|
||||
return 'I';
|
||||
break;
|
||||
|
||||
case 9:
|
||||
case 74:
|
||||
case 106:
|
||||
return 'J';
|
||||
break;
|
||||
|
||||
case 10:
|
||||
case 75:
|
||||
case 107:
|
||||
return 'K';
|
||||
break;
|
||||
|
||||
default:
|
||||
return ' ';
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
int jMatrixControl::chipCharToInt(char chipChar)
|
||||
{
|
||||
|
||||
switch (chipChar)
|
||||
{
|
||||
case 'A':
|
||||
case 'a':
|
||||
return 0;
|
||||
break;
|
||||
|
||||
case 'B':
|
||||
case 'b':
|
||||
return 1;
|
||||
break;
|
||||
|
||||
case 'C':
|
||||
case 'c':
|
||||
return 2;
|
||||
break;
|
||||
|
||||
case 'D':
|
||||
case 'd':
|
||||
return 3;
|
||||
break;
|
||||
|
||||
case 'E':
|
||||
case 'e':
|
||||
return 4;
|
||||
break;
|
||||
|
||||
case 'F':
|
||||
case 'f':
|
||||
return 5;
|
||||
break;
|
||||
|
||||
case 'G':
|
||||
case 'g':
|
||||
return 6;
|
||||
break;
|
||||
|
||||
case 'H':
|
||||
case 'h':
|
||||
return 7;
|
||||
break;
|
||||
|
||||
case 'I':
|
||||
case 'i':
|
||||
return 8;
|
||||
break;
|
||||
|
||||
case 'J':
|
||||
case 'j':
|
||||
return 9;
|
||||
break;
|
||||
|
||||
case 'K':
|
||||
case 'k':
|
||||
return 10;
|
||||
break;
|
||||
|
||||
default:
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int8_t bottomRowTranslation (int8_t rowToTranslate)
|
||||
{
|
||||
if(rowToTranslate <= 30)
|
||||
{
|
||||
return rowToTranslate + 31;
|
||||
} else if (rowToTranslate > 30 && rowToTranslate <= 60){
|
||||
return rowToTranslate - 31;
|
||||
} else {
|
||||
Serial.println("Invalid Row!");
|
||||
return -1;
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
#ifndef JMATRIXCONTROL_H // so this doesnt get defined twice
|
||||
#define JMATRIXCONTROL_H
|
||||
|
||||
#include <Arduino.h> //move this eventually
|
||||
|
||||
|
||||
class jMatrixControl{
|
||||
|
||||
public:
|
||||
jMatrixControl();
|
||||
|
||||
int connectDumbMode(int x,int y, int chip, int connectDisconnect = 1); //X address, Y Address, Chip (Char,Int, or Int ascii), connect (1) or disconnect (0)
|
||||
int connectDumbMode(int x,int y, char chip, int connectDisconnect = 1); //X address, Y Address, Chip (Char,Int, or Int ascii), connect (1) or disconnect (0)
|
||||
void clearAllConnections(void);
|
||||
char chipIntToChar(int chipChar); //returns ' ' (space) if invalid
|
||||
int chipCharToInt(char); //returns -1 if invalid
|
||||
int8_t bottomRowTranslation (int8_t rowToTranslate);//returns -1 if invalid - works both ways
|
||||
|
||||
private:
|
||||
|
||||
void setAddress(int, int);
|
||||
void strobeItIn(int connectDisconnect);
|
||||
int selectChip(int); //returns 1 if it's a valid chip number
|
||||
void deselectChip(void);
|
||||
|
||||
};
|
||||
|
||||
|
||||
#endif
|
||||
46
JumperlessNano/lib/README
Normal file
46
JumperlessNano/lib/README
Normal file
@ -0,0 +1,46 @@
|
||||
|
||||
This directory is intended for project specific (private) libraries.
|
||||
PlatformIO will compile them to static libraries and link into executable file.
|
||||
|
||||
The source code of each library should be placed in a an own separate directory
|
||||
("lib/your_library_name/[here are source files]").
|
||||
|
||||
For example, see a structure of the following two libraries `Foo` and `Bar`:
|
||||
|
||||
|--lib
|
||||
| |
|
||||
| |--Bar
|
||||
| | |--docs
|
||||
| | |--examples
|
||||
| | |--src
|
||||
| | |- Bar.c
|
||||
| | |- Bar.h
|
||||
| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html
|
||||
| |
|
||||
| |--Foo
|
||||
| | |- Foo.c
|
||||
| | |- Foo.h
|
||||
| |
|
||||
| |- README --> THIS FILE
|
||||
|
|
||||
|- platformio.ini
|
||||
|--src
|
||||
|- main.c
|
||||
|
||||
and a contents of `src/main.c`:
|
||||
```
|
||||
#include <Foo.h>
|
||||
#include <Bar.h>
|
||||
|
||||
int main (void)
|
||||
{
|
||||
...
|
||||
}
|
||||
|
||||
```
|
||||
|
||||
PlatformIO Library Dependency Finder will find automatically dependent
|
||||
libraries scanning project source files.
|
||||
|
||||
More information about PlatformIO Library Dependency Finder
|
||||
- https://docs.platformio.org/page/librarymanager/ldf.html
|
||||
26
JumperlessNano/platformio.ini
Normal file
26
JumperlessNano/platformio.ini
Normal file
@ -0,0 +1,26 @@
|
||||
; PlatformIO Project Configuration File
|
||||
;
|
||||
; Build options: build flags, source filter
|
||||
; Upload options: custom upload port, speed and extra flags
|
||||
; Library options: dependencies, extra library storages
|
||||
; Advanced options: extra scripting
|
||||
;
|
||||
; Please visit documentation for the other options and examples
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
|
||||
|
||||
[env]
|
||||
platform = https://github.com/maxgerhardt/platform-raspberrypi.git
|
||||
framework = arduino
|
||||
board_build.core = earlephilhower
|
||||
board_build.filesystem_size = 0.5m
|
||||
|
||||
[env:pico]
|
||||
board = pico
|
||||
; if using picoprobe SWD upload / debugging
|
||||
;upload_protocol = picoprobe
|
||||
;debug_tool = picoprobe
|
||||
; note: newer PicoProbe firmwares emulate a CMSIS-DAP, so you
|
||||
; use "cmsis-dap" as upload_protocol and debug_tool.
|
||||
; for more info see docs https://arduino-pico.readthedocs.io/en/latest/platformio.html
|
||||
@ -1,4 +1,11 @@
|
||||
|
||||
|
||||
#define MAX_NETS 64
|
||||
#define MAX_BRIDGES 255
|
||||
#define MAX_NODES 64
|
||||
|
||||
|
||||
|
||||
#define CHIP_A 0
|
||||
#define CHIP_B 1
|
||||
#define CHIP_C 2
|
||||
@ -10,37 +17,44 @@
|
||||
#define CHIP_I 8
|
||||
#define CHIP_J 9
|
||||
#define CHIP_K 10
|
||||
#define CHIP_L 11
|
||||
|
||||
#define CS_A PIN_PA4
|
||||
#define CS_B PIN_PA5
|
||||
#define CS_C PIN_PA6
|
||||
#define CS_D PIN_PA7
|
||||
#define CS_E PIN_PF3
|
||||
#define CS_F PIN_PF4
|
||||
#define CS_G PIN_PF5
|
||||
#define CS_H PIN_PD1
|
||||
#define CS_I PIN_PD2
|
||||
#define CS_J PIN_PD3
|
||||
#define CS_K PIN_PD4
|
||||
|
||||
#define DATAPIN PIN_PA0
|
||||
#define RESET PIN_PD7
|
||||
#define STROBE PIN_PA1
|
||||
#define CS_A 6
|
||||
#define CS_B 7
|
||||
#define CS_C 8
|
||||
#define CS_D 9
|
||||
#define CS_E 10
|
||||
#define CS_F 11
|
||||
#define CS_G 12
|
||||
#define CS_H 13
|
||||
#define CS_I 20
|
||||
#define CS_J 21
|
||||
#define CS_K 22
|
||||
#define CS_L 23
|
||||
|
||||
#define AX0 PIN_PC0
|
||||
#define AX1 PIN_PC1
|
||||
#define AX2 PIN_PC2
|
||||
#define AX3 PIN_PC3
|
||||
#define DATAPIN 14
|
||||
#define RESETPIN 24
|
||||
#define CLKPIN 15
|
||||
|
||||
#define UART0_TX 0
|
||||
#define UART0_RX 1
|
||||
|
||||
#define NANO_I2C1_SCL 2 //These might be flipped on the RP2040, fuck
|
||||
#define NANO_I2C1_SDA 3
|
||||
|
||||
#define I2C0_SDA 4
|
||||
#define I2C0_SCL 5
|
||||
|
||||
#define LED_DATA_OUT 25
|
||||
|
||||
#define ADC0_5V 26
|
||||
#define ADC1_5V 27
|
||||
#define ADC2_5V 28
|
||||
#define ADC3_8V 29
|
||||
|
||||
#define AY0 PIN_PF0
|
||||
#define AY1 PIN_PF1
|
||||
#define AY2 PIN_PF2
|
||||
|
||||
#define DAC_OUT PIN_PD6
|
||||
//#define I2C_UART_SELECTION_IN PIN_PD7
|
||||
|
||||
#define IN_TX_SDA PIN_PA2
|
||||
#define IN_RX_SCL PIN_PA3
|
||||
|
||||
#define t1 1
|
||||
#define t2 2
|
||||
@ -106,8 +120,6 @@
|
||||
#define b30 61
|
||||
|
||||
|
||||
|
||||
|
||||
#define NANO_D0 70 //these are completely arbitrary but they should come in handy
|
||||
#define NANO_D1 71
|
||||
#define NANO_D2 72
|
||||
@ -135,9 +147,14 @@
|
||||
|
||||
|
||||
#define GND 100
|
||||
#define TOP_RAIL 101
|
||||
#define BOTTOM_RAIL 102
|
||||
#define DAC0TO5V 103
|
||||
#define DACPLUSMINUS9V 104
|
||||
#define SUPPLY_3V3 103
|
||||
#define SUPPLY_5V 105
|
||||
|
||||
#define DAC0_5V 106
|
||||
#define DAC1_8V 107
|
||||
|
||||
#define CURRENT_SENSE_PLUS 108
|
||||
#define CURRENT_SENSE_MINUS 109
|
||||
|
||||
|
||||
#define EMPTY_NET 127
|
||||
402
JumperlessNano/src/MatrixStateRP2040.h
Normal file
402
JumperlessNano/src/MatrixStateRP2040.h
Normal file
@ -0,0 +1,402 @@
|
||||
#ifndef MATRIXSTATE_H
|
||||
#define MATRIXSTATE_H
|
||||
|
||||
#include <Arduino.h>
|
||||
#include "JumperlessDefinesRP2040.h"
|
||||
|
||||
|
||||
/*
|
||||
functions needed to deal with nets ( Now we're doing Nets > Bridges > Nodes)
|
||||
|
||||
getNodesToConnect() //read in the nodes you'd like to connect
|
||||
|
||||
searchExistingNets() //search through existing nets for all nodes that match either one of the new nodes (so it will be added to that net)
|
||||
{
|
||||
if (no nets share a node)
|
||||
|
||||
findFirstUnusedNet() //search for a free net[]
|
||||
|
||||
createNewNet() //add those nodes to a new net
|
||||
|
||||
|
||||
if (exactly 1 existing net shares a node)
|
||||
|
||||
addNodesToNet() //just add those nodes to the net
|
||||
|
||||
|
||||
if (nodes touch separate nets (and priority matches))
|
||||
|
||||
checkDoNotIntersects() //make sure none of the nodes on the net violate doNotIntersect rules, exit and warn
|
||||
|
||||
combineNets() //combine those 2 nets into a single net, probably call addNodesToNet and deleteNet and just expand the lower numbered one. Should we shift nets down? or just reuse the newly emply space for the next net
|
||||
}
|
||||
|
||||
|
||||
deleteNet() //make sure to check special function nets and clear connections to it
|
||||
|
||||
|
||||
deleteBridge()
|
||||
{
|
||||
checkIfNodesAreABridge() //if both of those nodes make up a memberBridge[][] pair. if not, warn and exit
|
||||
|
||||
deleteBridgeAndShift() //shift the remaining bridges over so they're left justified and we don't need to search the entire memberBridges[] every time
|
||||
|
||||
deleteNodesAndShift() //shift the remaining nodes over so they're left justified and we don't need to search the entire memberNodes[MAX_NODES] every time
|
||||
|
||||
}
|
||||
|
||||
|
||||
deleteNode() //disconnects everything connected to that one node
|
||||
{
|
||||
searchExistingNets() //find where that node is
|
||||
|
||||
if (it's one of only 2 nodes in a net)
|
||||
|
||||
deleteNet()
|
||||
|
||||
else
|
||||
|
||||
deleteAllBridgesConnectedToNode() //search bridges for node and delete any that contain it
|
||||
|
||||
deleteNodesAndShift() //shift the remaining nodes over so they're left justified and we don't need to search the entire memberNodes[MAX_NODES] every time
|
||||
|
||||
}
|
||||
|
||||
|
||||
checkForSplitNets() //if the newly deleted nodes wold split a net into 2 or more non-intersecting nets, we'll need to split them up. return numberOfNewNets check memberBridges[][] https://www.geeksforgeeks.org/check-removing-given-edge-disconnects-given-graph/#
|
||||
{
|
||||
while (numberOfNewNets > 0)
|
||||
|
||||
findFirstUnusedNet() //search for a free net[]
|
||||
|
||||
createNewNet() //add those nodes to a new net
|
||||
|
||||
copySplitNetIntoNewNet() //find which nodes and bridges belong in a new net
|
||||
|
||||
deleteNodesAndShift() //delete the nodes and bridges that were copied from the original net
|
||||
|
||||
numberOfNewNets--;
|
||||
|
||||
}
|
||||
|
||||
eventually send data to crosspoints (after we convert the net data into actual X Y CHIP data)
|
||||
|
||||
Now that we're recalculating nets at every step,
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
|
||||
int netIndex = 8; //either search for the next available empty net or keep an index?
|
||||
|
||||
int8_t bridges[MAX_BRIDGES][3];//{{netNumber,node1,node2}, ...} //should bridges be stored inside or outside the net structs?
|
||||
|
||||
|
||||
struct netStruct{
|
||||
|
||||
uint8_t number; //nets are uint8_t, nodes are int8_t
|
||||
|
||||
const char *name; // human readable "Net 3"
|
||||
|
||||
int8_t nodes[MAX_NODES] = {};//maybe make this smaller and allow nets to just stay connected currently 64x64 is 4 Kb
|
||||
|
||||
int8_t bridges[MAX_NODES/2][2]; //either store them here or in one long array that references the net
|
||||
|
||||
int8_t specialFunction = -1; // store #defined number for that special function -1 for regular net
|
||||
|
||||
uint8_t intersections[8]; //if this net shares a node with another net, store this here. If it's a regular net, we'll need a function to just merge them into one new net. special functions can intersect though (except Power and Ground), 0x7f is a reserved empty net that nothing and intersect
|
||||
|
||||
int8_t doNotIntersectNodes[8]; //if the net tries to share a node with a net that contains any #defined nodes here, it won't connect and throw an error (SUPPLY to GND)
|
||||
|
||||
uint8_t priority = 0; //priority = 1 means it will move connections to take the most direct path, priority = 2 means connections will be doubled up when possible, priority = 3 means both
|
||||
|
||||
|
||||
};
|
||||
|
||||
struct netStruct net[MAX_NETS] = { //these are the special function nets that will always be made
|
||||
//netNumber, ,netName ,memberNodes[] ,memberBridges[][2] ,specialFunction ,intsctNet[] ,doNotIntersectNodes[] ,priority
|
||||
{ 0 ,"Empty Net" ,{EMPTY_NET} ,{{}} ,EMPTY_NET ,{} ,{EMPTY_NET,EMPTY_NET,EMPTY_NET,EMPTY_NET,EMPTY_NET,EMPTY_NET,EMPTY_NET} , 0},
|
||||
{ 1 ,"GND\t" ,{GND} ,{{}} ,GND ,{} ,{SUPPLY_3V3,SUPPLY_5V,DAC0_5V,DAC1_8V} , 1},
|
||||
{ 2 ,"+5V\t" ,{SUPPLY_5V} ,{{}} ,SUPPLY_5V ,{} ,{GND,SUPPLY_3V3,DAC0_5V,DAC1_8V} , 1},
|
||||
{ 3 ,"+3.3V\t" ,{SUPPLY_3V3} ,{{}} ,SUPPLY_3V3 ,{} ,{GND,SUPPLY_5V,DAC0_5V,DAC1_8V} , 1},
|
||||
{ 4 ,"DAC 0\t" ,{DAC0_5V} ,{{}} ,DAC0_5V ,{} ,{GND,SUPPLY_5V,SUPPLY_3V3,DAC1_8V} , 1},
|
||||
{ 5 ,"DAC 1\t" ,{DAC1_8V} ,{{}} ,DAC1_8V ,{} ,{GND,SUPPLY_5V,SUPPLY_3V3,DAC0_5V} , 1},
|
||||
{ 6 ,"I Sense +" ,{CURRENT_SENSE_PLUS} ,{{}} ,CURRENT_SENSE_PLUS ,{} ,{CURRENT_SENSE_MINUS} , 2},
|
||||
{ 7 ,"I Sense -" ,{CURRENT_SENSE_MINUS} ,{{}} ,CURRENT_SENSE_MINUS ,{} ,{CURRENT_SENSE_PLUS} , 2},
|
||||
};
|
||||
|
||||
struct chipStatus{
|
||||
|
||||
int chipNumber;
|
||||
char chipChar;
|
||||
int8_t xStatus[16]; //store the bb row or nano conn this is eventually connected to so they can be stacked if conns are redundant
|
||||
int8_t yStatus[8]; //store the row/nano it's connected to
|
||||
const int8_t xMap[16];
|
||||
const int8_t yMap[8];
|
||||
|
||||
};
|
||||
|
||||
|
||||
struct chipStatus ch[12] = {
|
||||
{0,'A',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{CHIP_I, CHIP_J, CHIP_B, CHIP_B, CHIP_C, CHIP_C, CHIP_D, CHIP_D, CHIP_E, CHIP_K, CHIP_F, CHIP_F, CHIP_G, CHIP_G, CHIP_H, CHIP_H},//X MAP constant
|
||||
{CHIP_L, t2,t3, t4, t5, t6, t7, t8}}, // Y MAP constant
|
||||
|
||||
{1,'B',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{CHIP_A, CHIP_A, CHIP_I, CHIP_J, CHIP_C, CHIP_C, CHIP_D, CHIP_D, CHIP_E, CHIP_E, CHIP_F, CHIP_K, CHIP_G, CHIP_G, CHIP_H, CHIP_H},
|
||||
{CHIP_L, t9,t10,t11,t12,t13,t14,t15}},
|
||||
|
||||
{2,'C',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{CHIP_A, CHIP_A, CHIP_B, CHIP_B, CHIP_I, CHIP_J, CHIP_D, CHIP_D, CHIP_E, CHIP_E, CHIP_F, CHIP_F, CHIP_G, CHIP_K, CHIP_H, CHIP_H},
|
||||
{CHIP_L, t16,t17,t18,t19,t20,t21,t22}},
|
||||
|
||||
{3,'D',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{CHIP_A, CHIP_A, CHIP_B, CHIP_B, CHIP_C, CHIP_C, CHIP_I, CHIP_J, CHIP_E, CHIP_E, CHIP_F, CHIP_F, CHIP_G, CHIP_G, CHIP_H, CHIP_K},
|
||||
{CHIP_L, t23,t24,t25,t26,t27,t28,t29}},
|
||||
|
||||
{4,'E',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{CHIP_A, CHIP_K, CHIP_B, CHIP_B, CHIP_C, CHIP_C, CHIP_D, CHIP_D, CHIP_I, CHIP_J, CHIP_F, CHIP_F, CHIP_G, CHIP_G, CHIP_H, CHIP_H},
|
||||
{CHIP_L, b2, b3, b4, b5, b6, b7, b8}},
|
||||
|
||||
{5,'F',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{CHIP_A, CHIP_A, CHIP_B, CHIP_K, CHIP_C, CHIP_C, CHIP_D, CHIP_D, CHIP_E, CHIP_E, CHIP_I, CHIP_J, CHIP_G, CHIP_G, CHIP_H, CHIP_H},
|
||||
{CHIP_L, b9, b10,b11,b12,b13,b14,b15}},
|
||||
|
||||
{6,'G',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{CHIP_A, CHIP_A, CHIP_B, CHIP_B, CHIP_C, CHIP_K, CHIP_D, CHIP_D, CHIP_E, CHIP_E, CHIP_F, CHIP_F, CHIP_I, CHIP_J, CHIP_H, CHIP_H},
|
||||
{CHIP_L, b16,b17,b18,b19,b20,b21,b22}},
|
||||
|
||||
{7,'H',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{CHIP_A, CHIP_A, CHIP_B, CHIP_B, CHIP_C, CHIP_C, CHIP_D, CHIP_K, CHIP_E, CHIP_E, CHIP_F, CHIP_F, CHIP_G, CHIP_G, CHIP_I, CHIP_J},
|
||||
{CHIP_L, b23,b24,b25,b26,b27,b28,b29}},
|
||||
|
||||
{8,'I',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{NANO_A0, NANO_D1, NANO_A2, NANO_D3, NANO_A4, NANO_D5, NANO_A6, NANO_D7, NANO_D11, NANO_D9, NANO_D13, NANO_RESET, DAC0_5V, ADC0_5V, SUPPLY_3V3, GND},
|
||||
{CHIP_A,CHIP_B,CHIP_C,CHIP_D,CHIP_E,CHIP_F,CHIP_G,CHIP_H}},
|
||||
|
||||
{9,'J',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{NANO_D0, NANO_A1, NANO_D2, NANO_A3, NANO_D4, NANO_A5, NANO_D6, NANO_A7, NANO_D8, NANO_D10, NANO_D12, NANO_AREF, DAC1_8V, ADC1_5V, SUPPLY_5V, GND},
|
||||
{CHIP_A,CHIP_B,CHIP_C,CHIP_D,CHIP_E,CHIP_F,CHIP_G,CHIP_H}},
|
||||
|
||||
{10,'K',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{NANO_A0, NANO_A1, NANO_A2, NANO_A3, NANO_A4, NANO_A5, NANO_A6, NANO_A7, NANO_D2, NANO_D3, NANO_D4, NANO_D5, NANO_D6, NANO_D7, NANO_D8, NANO_D9},
|
||||
{CHIP_A,CHIP_B,CHIP_C,CHIP_D,CHIP_E,CHIP_F,CHIP_G,CHIP_H}},
|
||||
|
||||
{11,'L',
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
|
||||
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
|
||||
{CURRENT_SENSE_MINUS, CURRENT_SENSE_PLUS, ADC0_5V, ADC1_5V, ADC2_5V, ADC3_8V, DAC1_8V, DAC0_5V, t1, t30, b1, b30, NANO_A4, NANO_A5, SUPPLY_5V, GND},
|
||||
{CHIP_A,CHIP_B,CHIP_C,CHIP_D,CHIP_E,CHIP_F,CHIP_G,CHIP_H}}
|
||||
};
|
||||
|
||||
enum nanoPinsToIndex { NANO_PIN_D0 , NANO_PIN_D1 , NANO_PIN_D2 , NANO_PIN_D3 , NANO_PIN_D4 , NANO_PIN_D5 , NANO_PIN_D6 , NANO_PIN_D7 , NANO_PIN_D8 , NANO_PIN_D9 , NANO_PIN_D10 , NANO_PIN_D11 , NANO_PIN_D12 , NANO_PIN_D13 , NANO_PIN_RST , NANO_PIN_REF , NANO_PIN_A0 , NANO_PIN_A1 , NANO_PIN_A2 , NANO_PIN_A3 , NANO_PIN_A4 , NANO_PIN_A5 , NANO_PIN_A6 , NANO_PIN_A7 };
|
||||
struct nanoStatus{ //there's only one of these so ill declare and initalize together unlike above
|
||||
|
||||
//all these arrays should line up (both by index and visually) so one index will give you all this data
|
||||
|
||||
// | | | | | | | | | | | | | | | | | | | | | | | | |
|
||||
const char *pinNames[24]= { " D0", " D1", " D2", " D3", " D4", " D5", " D6", " D7", " D8", " D9", "D10", "D11", "D12", "D13", "RST", "REF", " A0", " A1", " A2", " A3", " A4", " A5", " A6", " A7"};// String with readable name //padded to 3 chars (space comes before chars)
|
||||
// | | | | | | | | | | | | | | | | | | | | | | | | |
|
||||
const int8_t pinMap[24] = { NANO_D0, NANO_D1, NANO_D2, NANO_D3, NANO_D4, NANO_D5, NANO_D6, NANO_D7, NANO_D8, NANO_D9, NANO_D10, NANO_D11, NANO_D12, NANO_D13, NANO_RESET, NANO_AREF, NANO_A0, NANO_A1, NANO_A2, NANO_A3, NANO_A4, NANO_A5, NANO_A6, NANO_A7};//Array index to internal arbitrary #defined number
|
||||
// | | | | | | | | | | | | | | | | | | | | | | | | |
|
||||
const int8_t numConns[24]= { 1 , 1 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 1 , 1 , 2 , 2 , 2 , 2 , 2 , 2 , 1 , 1 };//Whether this pin has 1 or 2 connections to special function chips (OR maybe have it be a map like i = 2 j = 3 k = 4 l = 5 if there's 2 it's the product of them ij = 6 ik = 8 il = 10 jk = 12 jl = 15 kl = 20 we're trading minuscule amounts of CPU for RAM)
|
||||
// | | | | | | | | | | | | | | | | | | | | | | | | |
|
||||
const int8_t mapIJ[24] = { CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J };//Since there's no overlapping connections between Chip I and J, this holds which of those 2 chips has a connection at that index, if numConns is 1, you only need to check this one
|
||||
const int8_t mapKL[24] = { -1 , -1 , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , -1 , -1 , -1 , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_L , CHIP_L , -1 , -1 };//Since there's no overlapping connections between Chip K and L, this holds which of those 2 chips has a connection at that index, -1 for no connection
|
||||
// | | | | | | | | | | | | | | | | | | | | | | | | |
|
||||
const int8_t xMapI[24] = { -1 , 1 , -1 , 3 , -1 , 5 , -1 , 7 , -1 , 9 , -1 , 8 , -1 , 10 , 11 , -1 , 0 , -1 , 2 , -1 , 4 , -1 , 6 , -1 };//holds which X pin is connected to the index on Chip I, -1 for none
|
||||
int8_t xStatusI[24] = { -1 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , -1 };//-1 for not connected to that chip, 0 for available, >0 means it's connected and the netNumber is stored here
|
||||
// | | | | | | | | | | | | | | | | | | | | | | | | |
|
||||
const int8_t xMapJ[24] = { 0 , -1 , 2 , -1 , 4 , -1 , 6 , -1 , 8 , -1 , 9 , -1 , 10 , -1 , -1 , 11 , -1 , 1 , -1 , 3 , -1 , 5 , -1 , 7 };//holds which X pin is connected to the index on Chip J, -1 for none
|
||||
int8_t xStatusJ[24] = { 0 , -1 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , -1 , 0 , -1 , 0 };//-1 for not connected to that chip, 0 for available, >0 means it's connected and the netNumber is stored here
|
||||
// | | | | | | | | | | | | | | | | | | | | | | | | |
|
||||
const int8_t xMapK[24] = { -1 , -1 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , -1 , -1 , -1 , 0 , 1 , 2 , 3 , -1 , -1 , -1 , -1 };//holds which X pin is connected to the index on Chip K, -1 for none
|
||||
int8_t xStatusK[24] = { -1 , -1 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , -1 , -1 , -1 , 0 , 0 , 0 , 0 , -1 , -1 , -1 , -1 };//-1 for not connected to that chip, 0 for available, >0 means it's connected and the netNumber is stored here
|
||||
// | | | | | | | | | | | | | | | | | | | | | | | | |
|
||||
const int8_t xMapL[24] = { -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , 12 , 13 , -1 , -1 };//holds which X pin is connected to the index on Chip L, -1 for none
|
||||
int8_t xStatusL[24] = { -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , 0 , 0 , -1 , -1 };//-1 for not connected to that chip, 0 for available, >0 means it's connected and the netNumber is stored here
|
||||
|
||||
// mapIJKL[] will tell you whethher there's a connection from that nano pin to the corresponding special function chip
|
||||
// xMapIJKL[] will tell you the X pin that it's connected to on that sf chip
|
||||
// xStatusIJKL[] says whether that x pin is being used (this should be the same as mt[8-10].xMap[] if theyre all stacked on top of each other)
|
||||
// I haven't decided whether to make this just a flag, or store that signal's destination
|
||||
const int8_t reversePinMap[110] = {NANO_D0, NANO_D1, NANO_D2, NANO_D3, NANO_D4, NANO_D5, NANO_D6, NANO_D7, NANO_D8, NANO_D9, NANO_D10, NANO_D11, NANO_D12, NANO_D13, NANO_RESET, NANO_AREF, NANO_A0, NANO_A1, NANO_A2, NANO_A3, NANO_A4, NANO_A5, NANO_A6, NANO_A7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,GND,101,102,SUPPLY_3V3,104,SUPPLY_5V,DAC0_5V,DAC1_8V,CURRENT_SENSE_PLUS,CURRENT_SENSE_MINUS};
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
//see the comments at the end for a more nicely formatted version that's not in struct initalizers
|
||||
|
||||
struct xy8_t {
|
||||
uint8_t x : 4;
|
||||
uint8_t y : 4;
|
||||
};
|
||||
|
||||
|
||||
struct pathStruct{
|
||||
|
||||
int8_t node1 = 0; //these are the rows or nano header pins to connect
|
||||
int8_t node2 = 0;
|
||||
int pathNumber = 0; // this is just a number to refer to the path by
|
||||
|
||||
uint8_t firstChip = 0xff;
|
||||
uint8_t firstXY = 0b11101111;
|
||||
//int8_t firstY = -1;
|
||||
|
||||
uint8_t secondChip = 0xff;
|
||||
|
||||
uint8_t secondXY = 0b00000000;
|
||||
//int8_t secondY = -1;
|
||||
|
||||
|
||||
int redundantConnection = 0; // if the paths are redundant (for lower resistance) this is the pathNumber of the other one(s)
|
||||
|
||||
};
|
||||
|
||||
/*
|
||||
uint8_t connectionsMatrix[85][85];
|
||||
|
||||
connectionsMatrix [1-60][1-60] are breadboard connections
|
||||
connectionsMatrix [60-85][60-85] are Nano connections
|
||||
|
||||
value stored is row it's connected to, so we can use the value as the index for the next connection to see which nets are connected
|
||||
|
||||
or we can do a 64 bit number for the breadboard and just store a 1 or 0 in that bit location
|
||||
|
||||
uint64_t bbConns[64];
|
||||
|
||||
uint64_t nanoConns[25];
|
||||
|
||||
each set bit in the 64bit value correspond to which bb rows that nano pin is connected to
|
||||
|
||||
should nano conns be handled separately?
|
||||
|
||||
the problem with all this is that it says nothing about the path taken
|
||||
|
||||
*/
|
||||
/*
|
||||
//this is all defined in the struct initalizer now but leaving this here for reference
|
||||
|
||||
const int8_t sfyConnectionMap[8] = {CHIP_A,CHIP_B,CHIP_C,CHIP_D,CHIP_E,CHIP_F,CHIP_G,CHIP_H}; //chips
|
||||
|
||||
|
||||
const int8_t xConnectionMapA[16] = {CHIP_I, CHIP_J, CHIP_B, CHIP_B, CHIP_C, CHIP_C, CHIP_D, CHIP_D, CHIP_E, CHIP_K, CHIP_F, CHIP_F, CHIP_G, CHIP_G, CHIP_H, CHIP_H};
|
||||
const int8_t xConnectionMapB[16] = {CHIP_A, CHIP_A, CHIP_I, CHIP_J, CHIP_C, CHIP_C, CHIP_D, CHIP_D, CHIP_E, CHIP_E, CHIP_F, CHIP_K, CHIP_G, CHIP_G, CHIP_H, CHIP_H};
|
||||
const int8_t xConnectionMapC[16] = {CHIP_A, CHIP_A, CHIP_B, CHIP_B, CHIP_I, CHIP_J, CHIP_D, CHIP_D, CHIP_E, CHIP_E, CHIP_F, CHIP_F, CHIP_G, CHIP_K, CHIP_H, CHIP_H};
|
||||
const int8_t xConnectionMapD[16] = {CHIP_A, CHIP_A, CHIP_B, CHIP_B, CHIP_C, CHIP_C, CHIP_I, CHIP_J, CHIP_E, CHIP_E, CHIP_F, CHIP_F, CHIP_G, CHIP_G, CHIP_H, CHIP_K};
|
||||
const int8_t xConnectionMapE[16] = {CHIP_A, CHIP_K, CHIP_B, CHIP_B, CHIP_C, CHIP_C, CHIP_D, CHIP_D, CHIP_I, CHIP_J, CHIP_F, CHIP_F, CHIP_G, CHIP_G, CHIP_H, CHIP_H};
|
||||
const int8_t xConnectionMapF[16] = {CHIP_A, CHIP_A, CHIP_B, CHIP_K, CHIP_C, CHIP_C, CHIP_D, CHIP_D, CHIP_E, CHIP_E, CHIP_I, CHIP_J, CHIP_G, CHIP_G, CHIP_H, CHIP_H};
|
||||
const int8_t xConnectionMapG[16] = {CHIP_A, CHIP_A, CHIP_B, CHIP_B, CHIP_C, CHIP_K, CHIP_D, CHIP_D, CHIP_E, CHIP_E, CHIP_F, CHIP_F, CHIP_I, CHIP_J, CHIP_H, CHIP_H};
|
||||
const int8_t xConnectionMapH[16] = {CHIP_A, CHIP_A, CHIP_B, CHIP_B, CHIP_C, CHIP_C, CHIP_D, CHIP_K, CHIP_E, CHIP_E, CHIP_F, CHIP_F, CHIP_G, CHIP_G, CHIP_I, CHIP_J};
|
||||
|
||||
const int8_t yConnectionMapA[8] = {-1, t2,t3, t4, t5, t6, t7, t8};
|
||||
const int8_t yConnectionMapB[8] = {-1, t9,t10,t11,t12,t13,t14,t15};
|
||||
const int8_t yConnectionMapC[8] = {-1, t16,t17,t18,t19,t20,t21,t22};
|
||||
const int8_t yConnectionMapD[8] = {-1, t23,t24,t25,t26,t27,t28,t29}; //make an alt_jumper version later
|
||||
|
||||
const int8_t yConnectionMapE[8] = {-1, b2, b3, b4, b5, b6, b7, b8};
|
||||
const int8_t yConnectionMapF[8] = {-1, b9, b10,b11,b12,b13,b14,b15};
|
||||
const int8_t yConnectionMapG[8] = {-1, b16,b17,b18,b19,b20,b21,b22};
|
||||
const int8_t yConnectionMapH[8] = {-1, b23,b24,b25,b26,b27,b28,b29}; //make an alt_jumper version later
|
||||
|
||||
|
||||
const int8_t yConnectionMapE[8] = {-1, 33, 34, 35, 36, 37, 38, 39}; // if you want to match them up with the schematic
|
||||
const int8_t yConnectionMapF[8] = {-1, 40, 41, 42, 43, 44, 45, 46}; // use this for reference (it's the same thing as above)
|
||||
const int8_t yConnectionMapG[8] = {-1, 47, 48, 49, 50, 51, 52, 53}; //
|
||||
const int8_t yConnectionMapH[8] = {-1, 54, 55, 56, 57, 58, 59, 60}; //
|
||||
|
||||
|
||||
const int8_t xConnectionMapI[16] = {NANO_A0, NANO_D1, NANO_A2, NANO_D3, NANO_A4, NANO_D5, NANO_A6, NANO_D7, NANO_D11, NANO_D9, NANO_D13, NANO_RESET, DAC0_5V, ADC0_5V, SUPPLY_3V3, GND};
|
||||
const int8_t xConnectionMapJ[16] = {NANO_D0, NANO_A1, NANO_D2, NANO_A3, NANO_D4, NANO_A5, NANO_D6, NANO_A7, NANO_D8, NANO_D10, NANO_D12, NANO_AREF, DAC1_8V, ADC1_5V, SUPPLY_5V, GND};
|
||||
const int8_t xConnectionMapK[16] = {NANO_A0, NANO_A1, NANO_A2, NANO_A3, NANO_A4, NANO_A5, NANO_A6, NANO_A7, NANO_D2, NANO_D3, NANO_D4, NANO_D5, NANO_D6, NANO_D7, NANO_D8, NANO_D9};
|
||||
const int8_t xConnectionMapK[16] = {CURRENT_SENSE_MINUS, CURRENT_SENSE_PLUS, ADC0_5V, ADC1_5V, ADC2_5V, ADC3_8V, DAC1_8V, DAC0_5V, t1, t30, b1, b30, NANO_A4, NANO_A5, SUPPLY_5V, GND};
|
||||
|
||||
//nanoConnectionMap[0] is the list of pin numbers, [1] and [3] are which special function chips they're connected to, [2] and [4] is the X pin on that chip, -1 for none
|
||||
|
||||
const char *pinNames[] ={ "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "D8", "D9", "D10", "D11", "D12", "D13", "RESET", "AREF", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7"};
|
||||
const char nanoPinMap[] ={NANO_D0, NANO_D1, NANO_D2, NANO_D3, NANO_D4, NANO_D5, NANO_D6, NANO_D7, NANO_D8, NANO_D9, NANO_D10, NANO_D11, NANO_D12, NANO_D13, NANO_RESET, NANO_AREF, NANO_A0, NANO_A1, NANO_A2, NANO_A3, NANO_A4, NANO_A5, NANO_A6, NANO_A7};
|
||||
|
||||
const int8_t nanoConnectionMap[5][24] = {{NANO_D0, NANO_D1, NANO_D2, NANO_D3, NANO_D4, NANO_D5, NANO_D6, NANO_D7, NANO_D8, NANO_D9, NANO_D10, NANO_D11, NANO_D12, NANO_D13, NANO_RESET, NANO_AREF, NANO_A0, NANO_A1, NANO_A2, NANO_A3, NANO_A4, NANO_A5, NANO_A6, NANO_A7},
|
||||
|
||||
{CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J , CHIP_I , CHIP_J },
|
||||
{0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 9 , 8 , 10 , 10 , 11 , 11 , 0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 },
|
||||
|
||||
{-1 , -1 , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , -1 , -1 , -1 , -1 , -1 , -1 , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K , CHIP_K },
|
||||
{-1 , -1 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 , -1 , -1 , -1 , -1 , -1 , -1 , 0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 }};
|
||||
|
||||
// so for example nanoConnectionMap
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
_________________________________________________________________
|
||||
/ \
|
||||
| 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 |
|
||||
| |
|
||||
| 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 |
|
||||
| |
|
||||
| ------------------------------0--31-------------------------- |
|
||||
| ------------------------------0---0-------------------------- |
|
||||
| |
|
||||
| |
|
||||
| 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 |
|
||||
| |
|
||||
| 1 2 3 4 5 6 7 8 9 1 1 1 1 1 1 1 1 1 1 2 2 2 2 2 2 2 2 2 2 3 |
|
||||
| 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 |
|
||||
| |
|
||||
| |
|
||||
| |
|
||||
| 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 |
|
||||
| |
|
||||
| 3 3 3 3 3 3 3 3 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5 5 6 6 |
|
||||
| 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 |
|
||||
| |
|
||||
| ------------------------------0--63-------------------------- |
|
||||
| ------------------------------0--32-------------------------- |
|
||||
| |
|
||||
|___________________________________________________________________|
|
||||
|
||||
|
||||
we have ~2MB on the pico se we don't need as much fuckery to store a map like we did with 32Kb
|
||||
|
||||
connections[90][90]? 8Kb
|
||||
|
||||
chip[A-L][8][16]? 1.5Kb
|
||||
+ const chip[A-L][8][16] 1.5Kb for the map
|
||||
|
||||
|
||||
|
||||
use the littleFS to make a text file with connections and just update it
|
||||
|
||||
maybe copy kicad's schematic format
|
||||
*/
|
||||
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
275
JumperlessNano/src/main.cpp
Normal file
275
JumperlessNano/src/main.cpp
Normal file
@ -0,0 +1,275 @@
|
||||
#include <Arduino.h>
|
||||
#include "JumperlessDefinesRP2040.h"
|
||||
#include "MatrixStateRP2040.h"
|
||||
|
||||
|
||||
nanoStatus nano;
|
||||
const char* definesToChar (int); //i really need to find a way to not need to forward declare fuctions with this setup, i hate it
|
||||
|
||||
//void printConnections();
|
||||
|
||||
void setup() {
|
||||
|
||||
Serial.begin(115200);
|
||||
pinMode(LED_BUILTIN, OUTPUT_12MA);
|
||||
|
||||
|
||||
}
|
||||
|
||||
void loop() {
|
||||
|
||||
digitalWrite(LED_BUILTIN,HIGH);
|
||||
delay(millis()/100);
|
||||
digitalWrite(LED_BUILTIN,LOW);
|
||||
delay(millis()/100);
|
||||
|
||||
|
||||
for (int i = 0; i < 9; i++) //this is just to check that the structs are being set up correctly
|
||||
{
|
||||
Serial.print("\n\r");
|
||||
Serial.print (net[i].name);
|
||||
Serial.print ("\t");
|
||||
Serial.print (net[i].number);
|
||||
Serial.print ("\t");
|
||||
Serial.print (definesToChar(net[i].specialFunction));
|
||||
if (i == 1) Serial.print ("\t"); //padding for "GND"
|
||||
Serial.print ("\t{");
|
||||
|
||||
|
||||
for (int k = 0; k < 8; k++)
|
||||
{
|
||||
if (net[i].doNotIntersectNodes[k] != 0)
|
||||
{
|
||||
|
||||
Serial.print (definesToChar(net[i].doNotIntersectNodes[k]));
|
||||
Serial.print (",");
|
||||
}
|
||||
|
||||
}
|
||||
Serial.print ("}\t");
|
||||
|
||||
for (int j = 0 ; j < MAX_NODES; j++)
|
||||
{
|
||||
if (net[i].nodes[j] != 0)
|
||||
{
|
||||
|
||||
Serial.print (definesToChar(net[i].nodes[j]));
|
||||
Serial.print (",");
|
||||
}
|
||||
|
||||
}
|
||||
Serial.println("\n\n\n\n\r");
|
||||
|
||||
|
||||
}
|
||||
delay(10000);
|
||||
|
||||
}
|
||||
|
||||
const char* definesToChar (int defined) //converts the internally used #defined numbers into human readable strings
|
||||
{
|
||||
|
||||
const char *defNanoToChar[26] = {"NANO_D0", "NANO_D1", "NANO_D2", "NANO_D3", "NANO_D4", "NANO_D5", "NANO_D6", "NANO_D7", "NANO_D8", "NANO_D9", "NANO_D10", "NANO_D11", "NANO_D12", "NANO_D13", "NANO_RESET", "NANO_AREF", "NANO_A0", "NANO_A1", "NANO_A2", "NANO_A3", "NANO_A4", "NANO_A5", "NANO_A6", "NANO_A7"};
|
||||
const char *defSpecialToChar[12] = {"GND","NOT_DEFINED","NOT_DEFINED","SUPPLY_3V3","NOT_DEFINED","SUPPLY_5V","DAC_0_+5V","DAC_1_+-8V","CURRENT_SENSE +","CURRENT_SENSE -"};
|
||||
const char *emptyNet[] = {"EMPTY_NET", "?"};
|
||||
|
||||
if (defined >= 70 && defined <= 93)
|
||||
{
|
||||
return defNanoToChar[defined-70];
|
||||
} else if (defined >= 100 && defined <= 110)
|
||||
{
|
||||
return defSpecialToChar[defined-100];
|
||||
} else if (defined == EMPTY_NET)
|
||||
{
|
||||
return emptyNet[0];
|
||||
}else {
|
||||
return emptyNet[1];
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
void printConnections(void) {
|
||||
|
||||
Serial.println("\n");
|
||||
|
||||
Serial.printf("Pin Name\tSF Chip Connections\n\r");
|
||||
for (int i = NANO_PIN_D0; i <= NANO_PIN_A7; i++) //just checking if I run out of space
|
||||
{
|
||||
Serial.print(nano.pinNames[i]);
|
||||
Serial.print(" \t");
|
||||
}
|
||||
|
||||
Serial.println(" ");
|
||||
for (int i = NANO_PIN_D0; i <= NANO_PIN_A7; i++) //just checking if I run out of space
|
||||
{
|
||||
Serial.print(nano.pinMap[i]);
|
||||
Serial.print(" \t");
|
||||
}
|
||||
|
||||
Serial.println(" ");
|
||||
for (int i = NANO_PIN_D0; i <= NANO_PIN_A7; i++) //just checking if I run out of space
|
||||
{
|
||||
Serial.print(nano.numConns[i]);
|
||||
Serial.print(" \t");
|
||||
}
|
||||
|
||||
Serial.println(" ");
|
||||
for (int i = NANO_PIN_D0; i <= NANO_PIN_A7; i++) //just checking if I run out of space
|
||||
{
|
||||
Serial.print(nano.mapI[i]);
|
||||
Serial.print(" \t");
|
||||
}
|
||||
|
||||
Serial.println(" ");
|
||||
for (int i = NANO_PIN_D0; i <= NANO_PIN_A7; i++) //just checking if I run out of space
|
||||
{
|
||||
Serial.print(nano.xMapI[i]);
|
||||
Serial.print(" \t");
|
||||
}
|
||||
|
||||
Serial.println(" ");
|
||||
for (int i = NANO_PIN_D0; i <= NANO_PIN_A7; i++) //just checking if I run out of space
|
||||
{
|
||||
Serial.print(nano.xStatusI[i]);
|
||||
Serial.print(" \t");
|
||||
}
|
||||
|
||||
Serial.println(" ");
|
||||
for (int i = NANO_PIN_D0; i <= NANO_PIN_A7; i++) //just checking if I run out of space
|
||||
{
|
||||
Serial.print(nano.mapJ[i]);
|
||||
Serial.print(" \t");
|
||||
}
|
||||
|
||||
Serial.println(" ");
|
||||
for (int i = NANO_PIN_D0; i <= NANO_PIN_A7; i++) //just checking if I run out of space
|
||||
{
|
||||
Serial.print(nano.xMapJ[i]);
|
||||
Serial.print(" \t");
|
||||
}
|
||||
|
||||
Serial.println(" ");
|
||||
for (int i = NANO_PIN_D0; i <= NANO_PIN_A7; i++) //just checking if I run out of space
|
||||
{
|
||||
Serial.print(nano.xStatusJ[i]);
|
||||
Serial.print(" \t");
|
||||
}
|
||||
|
||||
Serial.println(" ");
|
||||
for (int i = NANO_PIN_D0; i <= NANO_PIN_A7; i++) //just checking if I run out of space
|
||||
{
|
||||
Serial.print(nano.mapK[i]);
|
||||
Serial.print(" \t");
|
||||
}
|
||||
|
||||
Serial.println(" ");
|
||||
for (int i = NANO_PIN_D0; i <= NANO_PIN_A7; i++) //just checking if I run out of space
|
||||
{
|
||||
Serial.print(nano.xMapK[i]);
|
||||
Serial.print(" \t");
|
||||
}
|
||||
|
||||
Serial.println(" ");
|
||||
for (int i = NANO_PIN_D0; i <= NANO_PIN_A7; i++) //just checking if I run out of space
|
||||
{
|
||||
Serial.print(nano.xStatusK[i]);
|
||||
Serial.print(" \t");
|
||||
}
|
||||
|
||||
Serial.println(" ");
|
||||
for (int i = NANO_PIN_D0; i <= NANO_PIN_A7; i++) //just checking if I run out of space
|
||||
{
|
||||
Serial.print(nano.mapL[i]);
|
||||
Serial.print(" \t");
|
||||
}
|
||||
|
||||
Serial.println(" ");
|
||||
for (int i = NANO_PIN_D0; i <= NANO_PIN_A7; i++) //just checking if I run out of space
|
||||
{
|
||||
Serial.print(nano.xMapL[i]);
|
||||
Serial.print(" \t");
|
||||
}
|
||||
|
||||
Serial.println(" ");
|
||||
for (int i = NANO_PIN_D0; i <= NANO_PIN_A7; i++) //just checking if I run out of space
|
||||
{
|
||||
Serial.print(nano.xStatusL[i]);
|
||||
Serial.print(" \t");
|
||||
}
|
||||
|
||||
Serial.println(" ");
|
||||
|
||||
Serial.println("\n\n");
|
||||
*/
|
||||
/*
|
||||
Serial.println("\tX connections \t\t\t\t\t\t Y connections");
|
||||
for (int i = 0; i < 11; i++) //just checking if I run out of space
|
||||
{
|
||||
|
||||
if (i == 8) Serial.println(' ');
|
||||
|
||||
Serial.print(mt[i].chipChar);
|
||||
Serial.print("\t ");
|
||||
|
||||
for (int j = 0; j < 16; j++) {
|
||||
//mt[i].xStatus[j] = -1;
|
||||
|
||||
///int ch = (int) mt[i].xMap[j];
|
||||
if (i < 8) {
|
||||
Serial.print(mt[mt[i].xMap[j]].chipChar); //here we're using the value of yMap as the index to return chipChar on that chipStatus struct
|
||||
} else {
|
||||
|
||||
switch (mt[i].xMap[j]) {
|
||||
case GND:
|
||||
Serial.print("GND");
|
||||
break;
|
||||
|
||||
|
||||
default:
|
||||
//Serial.print(mt[i].xMap[j]);
|
||||
Serial.print(nano.pinNames[nano.reversePinMap[mt[i].xMap[j]]]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (j < 15) Serial.print(", ");
|
||||
}
|
||||
Serial.print("\t\t");
|
||||
if (i > 7) Serial.print(" ");
|
||||
|
||||
for (int j = 0; j < 8; j++) {
|
||||
//chips[i].yStatus[j] = j;
|
||||
|
||||
|
||||
if (mt[i].yMap[j] > 0 && mt[i].yMap[j] < 10) Serial.print(' '); //padding
|
||||
if (i > 7) {
|
||||
Serial.print(mt[mt[i].yMap[j]].chipChar);
|
||||
} else {
|
||||
Serial.print(mt[i].yMap[j]);
|
||||
}
|
||||
if (j < 7) Serial.print(',');
|
||||
}
|
||||
Serial.println("\t <- Map");
|
||||
Serial.print("\t");
|
||||
|
||||
for (int j = 0; j < 16; j++) {
|
||||
//mt[i].xStatus[j] = -1;
|
||||
if (i > 7) Serial.print(" ");
|
||||
Serial.print(mt[i].xStatus[j]);
|
||||
if (mt[i].xStatus[j] > 0 && mt[i].xStatus[j] < 10) Serial.print(' '); //padding
|
||||
if (i > 7) Serial.print(" ");
|
||||
if (j < 15) Serial.print(',');
|
||||
}
|
||||
Serial.print("\t\t");
|
||||
for (int j = 0; j < 8; j++) {
|
||||
//chips[i].yStatus[j] = j;
|
||||
Serial.print(mt[i].yStatus[j]);
|
||||
if (mt[i].yStatus[j] > 0 && mt[i].yStatus[j] < 10) Serial.print(' '); //padding
|
||||
if (j < 7) Serial.print(',');
|
||||
}
|
||||
|
||||
Serial.println("\t <- Status\n");
|
||||
}
|
||||
}*/
|
||||
Loading…
Reference in New Issue
Block a user