Rev 6 #1

Merged
oleksiy merged 37 commits from hardware-rev-4 into main 2024-08-25 12:37:13 +00:00
78 changed files with 20664 additions and 7897 deletions
Showing only changes of commit a179441359 - Show all commits

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 263 KiB

After

Width:  |  Height:  |  Size: 288 KiB

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{ {
"board": { "board": {
"active_layer": 40, "active_layer": 31,
"active_layer_preset": "", "active_layer_preset": "",
"auto_track_width": true, "auto_track_width": true,
"hidden_nets": [], "hidden_nets": [],
@ -61,7 +61,7 @@
35, 35,
36 36
], ],
"visible_layers": "ffffeff_ffffffff", "visible_layers": "fffeedf_ffffffff",
"zone_display_mode": 0 "zone_display_mode": 0
}, },
"meta": { "meta": {

View File

@ -45,7 +45,7 @@
"silk_text_upright": false, "silk_text_upright": false,
"zones": { "zones": {
"45_degree_only": false, "45_degree_only": false,
"min_clearance": 0.508 "min_clearance": 0.0
} }
}, },
"diff_pair_dimensions": [], "diff_pair_dimensions": [],

View File

@ -96,7 +96,7 @@ byte currentStep = 0;
byte stepNumSelected = 0; byte stepNumSelected = 0;
bool *patternToEdit; bool *patternToEdit;
byte memCode = 'B'; //Change to different letter if you changed the data structure byte memCode = 'C'; //Change to different letter if you changed the data structure
unsigned int channelPulseCount[6]; unsigned int channelPulseCount[6];
unsigned int channelPulsesPerCycle[6]; unsigned int channelPulsesPerCycle[6];

View File

@ -9,7 +9,7 @@ void checkInputs() {
encReleasedTime = millis(); encReleasedTime = millis();
if (showDone) { if (showDone) {
showDone = false; showDone = false;
} else if (encReleasedTime - encPressedTime < 500) { // press shorter than .5s is for entering the submenu } else if (encReleasedTime - encPressedTime <= 500) { // press shorter than .5s is for entering the submenu
if (!insideTab && displayScreen == 0) { if (!insideTab && displayScreen == 0) {
insideTab = true; insideTab = true;
} else if (insideTab && channels[displayTab - 1].mode == 2 && menuItem == 2 && displayScreen == 0) { //enter the pattern editor } else if (insideTab && channels[displayTab - 1].mode == 2 && menuItem == 2 && displayScreen == 0) { //enter the pattern editor
@ -65,7 +65,7 @@ void checkInputs() {
EEPROM.put(1023, memCode - 1); EEPROM.put(1023, memCode - 1);
reboot(); reboot();
} }
} else if (encReleasedTime - encPressedTime < 2000) { // longer press (<2s) is for navigating back. longer than 2s presses are ignored } else if (encReleasedTime - encPressedTime > 500) { // longer press is for navigating back. longer than 2s presses are no longer ignored (used do be < 2000)
if (displayScreen != 0) { if (displayScreen != 0) {
displayScreen = 0; displayScreen = 0;
} else if (menuItemSelected == 1) { } else if (menuItemSelected == 1) {
@ -386,7 +386,7 @@ void checkInputs() {
} else if (digitalRead(SHIFT_BTN_PIN) && shiftBtnPushed) { } else if (digitalRead(SHIFT_BTN_PIN) && shiftBtnPushed) {
shiftBtnPushed = false; shiftBtnPushed = false;
shiftReleasedTime = millis(); shiftReleasedTime = millis();
if (shiftReleasedTime - shiftPressedTime > 500 && shiftReleasedTime - shiftPressedTime < 2000 && isRecording) { if (shiftReleasedTime - shiftPressedTime > 500 && isRecording) { //&& shiftReleasedTime - shiftPressedTime < 2000
for (byte i = 0; i < 16; i++) { for (byte i = 0; i < 16; i++) {
patternToEdit[i] = 0; patternToEdit[i] = 0;
} }