rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

manual sync

This commit is contained in:
rusefi 2017-02-20 17:22:21 -05:00
parent e84c812287
commit 22e88dd69e
106 changed files with 27545 additions and 26510 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
java_tools/gcc_map_reader.jar
View File

Binary file not shown.

103
java_tools/gcc_map_reader/src/rusefi/GccMapReader.java
View File

@ -15,6 +15,8 @@ import java.util.regex.Pattern;
* 10/16/13
*/
public class GccMapReader {
private static final Pattern p2 = Pattern.compile(".*0x(\\S*)(.*)");
public static void main(String[] args) throws IOException {
BufferedReader fr = new BufferedReader(new FileReader("rusefi.map"));
@ -47,7 +49,6 @@ public class GccMapReader {
private static List<Record> process(List<String> lines) {
Pattern p1 = Pattern.compile(".*\\.bss\\.(\\S*).*0x.*0x(\\S*)(.*)");
Pattern p2 = Pattern.compile(".*0x(\\S*)(.*)");
List<Record> result = new ArrayList<Record>();
for (int i = 0; i < lines.size(); i++) {
@ -59,50 +60,74 @@ public class GccMapReader {
Matcher m1 = p1.matcher(line);
if (m1.matches()) {
debug("Single-line " + line);
String suffix = m1.group(1);
String sizeString = m1.group(2);
String prefix = m1.group(3);
String name = prefix + "@" + suffix;
int size = Integer.parseInt(sizeString, 16);
debug("Name " + name);
debug("size " + size);
result.add(new Record(size, name));
parseSingleLine(result, line, m1, i);
} else {
debug("Multi-line " + line);
String suffix = line;
line = lines.get(++i);
Matcher m2 = p2.matcher(line);
if (!m2.matches()) {
debug("Skipping " + line);
continue;
}
String sizeString = m2.group(1);
String prefix = m2.group(2);
debug("Next line " + line);
String name = prefix + "@" + suffix;
int size = Integer.parseInt(sizeString, 16);
debug("Name " + name);
debug("size " + size);
result.add(new Record(size, name));
i = parseMultiLine(lines, result, i, line);
}
}
return result;
}
private static int parseMultiLine(List<String> lines, List<Record> result, int lineIndex, String line) {
debug("Multi-line " + line);
String suffix = line;
line = lines.get(++lineIndex);
Matcher m2 = p2.matcher(line);
if (!m2.matches()) {
debug("Skipping " + line);
return lineIndex;
}
String sizeString = m2.group(1);
String prefix = m2.group(2);
debug("Next line " + line);
String name = prefix + "@" + suffix;
if (line.contains("ALIGN")) {
System.out.println("TODO: better handle " + line);
return lineIndex;
}
int size;
try {
size = Integer.parseInt(sizeString, 16);
} catch (NumberFormatException e) {
throw new IllegalStateException("While parsing @ " + lineIndex);
}
debug("Name " + name);
debug("size " + size);
result.add(new Record(size, name));
return lineIndex;
}
private static void parseSingleLine(List<Record> result, String line, Matcher m1, int lineIndex) {
debug("Single-line " + line);
String suffix = m1.group(1);
String sizeString = m1.group(2);
String prefix = m1.group(3);
String name = prefix + "@" + suffix;
int size;
try {
size = Integer.parseInt(sizeString, 16);
} catch (NumberFormatException e) {
throw new IllegalStateException("While parsing @ " + lineIndex);
}
debug("Name " + name);
debug("size " + size);
result.add(new Record(size, name));
}
private static void debug(String s) {
// System.out.println(s);
}

BIN
java_tools/pcb_sync.jar
View File

Binary file not shown.

4
java_tools/pcb_sync/.idea/copyright/profiles_settings.xml
View File

@ -1,5 +1,3 @@
<component name="CopyrightManager">
<settings default="">
<module2copyright />
</settings>
<settings default="" />
</component>

3
java_tools/pcb_sync/.idea/misc.xml
View File

@ -3,11 +3,10 @@
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.7 64b" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="SvnBranchConfigurationManager">
<option name="mySupportsUserInfoFilter" value="true" />
</component>
</project>

1
java_tools/pcb_sync/.idea/runConfigurations/BomBuilder.xml
View File

@ -1,5 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="BomBuilder" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="com.rusefi.bom.BomBuilder" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="in.cmp comp.csv out.csv" />

5
java_tools/pcb_sync/.idea/runConfigurations/Main_move.xml
View File

@ -1,8 +1,9 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Main move" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="com.rusefi.Main" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="pcb_move can_brd_1.kicad_pcb -43.18 58.928" />
<option name="PROGRAM_PARAMETERS" value="pcb_move frankenso_foundation.kicad_pcb frankenso_foundation.kicad_pcb 0 25.4" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
@ -16,7 +17,9 @@
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
</component>

3
java_tools/pcb_sync/.idea/runConfigurations/Main_pcb_merge.xml
View File

@ -1,8 +1,9 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Main pcb_merge" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="com.rusefi.Main" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="pcb_merge frankenstein_foundation.kicad_pcb out.kicad_pcb changes.txt" />
<option name="PROGRAM_PARAMETERS" value="pcb_merge test.kicad_pcb out.kicad_pcb changes.txt" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />

1
java_tools/pcb_sync/.idea/runConfigurations/Main_rename.xml
View File

@ -1,5 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Main rename" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="com.rusefi.Main" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="rename mmc_replace.txt in out" />

1
java_tools/pcb_sync/.idea/runConfigurations/RemoveUnneededTraces.xml
View File

@ -1,5 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="RemoveUnneededTraces" type="Application" factoryName="Application" nameIsGenerated="true">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="com.rusefi.misc.RemoveUnneededTraces" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="test.kicad_pcb test.kicad_pcb" />

1
java_tools/pcb_sync/.idea/runConfigurations/main_cmp_merge.xml
View File

@ -1,5 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="main cmp_merge" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="com.rusefi.Main" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="cmp_merge output\res.cmp 1.cmp 2.cmp" />

1246
java_tools/pcb_sync/.idea/workspace.xml
View File

File diff suppressed because it is too large Load Diff

110
java_tools/pcb_sync/src/com/rusefi/bom/BomBuilder.java
View File

@ -1,5 +1,7 @@
package com.rusefi.bom;
import com.rusefi.pcb.ModuleNode;
import com.rusefi.pcb.PcbNode;
import com.rusefi.util.FileUtils;
import java.io.BufferedWriter;
@ -21,14 +23,37 @@ public class BomBuilder {
private static Map<String, BomRecord> bomDictionary;
private static Set<String> ignoreList = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
private static boolean printQtyInFull = true;
private static boolean printPadCount = false;
private static boolean printReference = false;
private static boolean printUserComment = false;
private static PcbNode pcb;
public static void main(String[] args) throws IOException {
if (args.length != 3) {
System.out.println("bom_builder [FILE_NAME.CMP] COMPONENTS_DICTIONARY.CSV OUTPUT_FILE.CSV");
if (args.length < 3) {
System.out.println("bom_builder FILE_NAME.CMP PCB.kicad_pcb COMPONENTS_DICTIONARY.CSV OUTPUT_FILE.CSV");
return;
}
cmpFileName = args[0];
bomDictionaryName = args[1];
String outputFileName = args[2];
String pcbFileName = args[1];
bomDictionaryName = args[2];
String outputFileName = args[3];
pcb = PcbNode.readFromFile(pcbFileName);
for (int i = 4; i < args.length; i++) {
String option = args[i].trim();
if (option.equalsIgnoreCase("printUserComment")) {
printUserComment = true;
} else if (option.equalsIgnoreCase("printreference")) {
printReference = true;
} else if (option.equalsIgnoreCase("printpadcount")) {
printPadCount = true;
} else if (option.equalsIgnoreCase("skipqtyinfull")) {
printQtyInFull = false;
}
}
allComponents.readCmpFile(FileUtils.readFileToList(cmpFileName));
@ -64,23 +89,46 @@ public class BomBuilder {
writeCommonHeader(bw);
writeMissingElements(bomDictionary, bw, componentsByKey);
StringBuilder notMounted = new StringBuilder();
for (Map.Entry<String, List<BomComponent>> e : componentsByKey.entrySet()) {
String key = e.getKey();
// for instance, SM0805_47pF
String componentName = e.getKey();
List<BomComponent> list = e.getValue();
if (ignoreList.contains(key))
if (ignoreList.contains(componentName))
continue;
BomRecord bomRecord = bomDictionary.get(key);
BomRecord bomRecord = bomDictionary.get(componentName);
if (bomRecord == null)
throw new NullPointerException();
for (BomComponent c : list)
writeLine(bw, bomRecord, 1, c.getReference() + ": ");
for (BomComponent c : list) {
if (!findModule(c.getReference())) {
bw.write("Not mounted: " + c.getReference() + "\r\n");
continue;
}
writeLine(bw, bomRecord, 1, c.getReference() + ": ", c.getReference());
}
}
bw.close();
}
private static boolean findModule(String reference) {
for (PcbNode node : pcb.iterate("module")) {
if (node instanceof ModuleNode) {
ModuleNode mn = (ModuleNode) node;
if (mn.getReference().equalsIgnoreCase(reference))
return true;
}
}
return false;
}
private static void writeCompactPartList(String outputFileName, Map<String, BomRecord> bomDictionary) throws IOException {
BufferedWriter bw = new BufferedWriter(new FileWriter(outputFileName));
Map<String, List<BomComponent>> componentsByKey = new TreeMap<String, List<BomComponent>>(allComponents.componentsByKey);
@ -90,18 +138,19 @@ public class BomBuilder {
writeMissingElements(bomDictionary, bw, componentsByKey);
for (Map.Entry<String, List<BomComponent>> e : componentsByKey.entrySet()) {
String key = e.getKey();
// for instance, SM0805_47pF
String componentName = e.getKey();
if (ignoreList.contains(key))
if (ignoreList.contains(componentName))
continue;
List<BomComponent> list = e.getValue();
log(list.size() + " items of " + key);
log(list.size() + " items of " + componentName);
BomRecord bomRecord = bomDictionary.get(key);
BomRecord bomRecord = bomDictionary.get(componentName);
if (bomRecord == null)
throw new NullPointerException();
writeLine(bw, bomRecord, list.size(), "");
writeLine(bw, bomRecord, list.size(), "", "");
}
bw.close();
}
@ -114,10 +163,15 @@ public class BomBuilder {
bw.write("### " + ignoreList.size() + " entries in ignore list\r\n");
}
private static void writeLine(BufferedWriter bw, BomRecord bomRecord, int quantity, String prefix) throws IOException {
private static void writeLine(BufferedWriter bw, BomRecord bomRecord, int quantity, String prefix, String reference) throws IOException {
bw.write(quantity + DELIMITER +
bomRecord.getStorePart() + DELIMITER +
prefix + bomRecord.getCustomerRef() + "\r\n");
bomRecord.getStorePart() + DELIMITER +
prefix + bomRecord.getCustomerRef() + DELIMITER +
(printReference ? reference + DELIMITER : "") +
(printUserComment ? bomRecord.getUserComment() + DELIMITER : "") +
(printPadCount ? bomRecord.getPadCount() + DELIMITER : "") +
"\r\n"
);
}
private static Map<String, BomRecord> readBomDictionary(List<String> strings) {
@ -134,23 +188,31 @@ public class BomBuilder {
String[] tokens = line.split(",");
if (tokens.length != 4) {
log("Unexpected line: " + line + " Expected 4 tokens but " + tokens.length);
if (tokens.length < 2) {
log("Unexpected line: " + line + " Expected at least two tokens but " + tokens.length);
System.exit(-1);
}
String ref = tokens[0];
String mfgPart = tokens[1];
String storePart = tokens[2];
String customerRef = tokens[3];
if (storePart.equalsIgnoreCase(IGNORE_TAG)) {
log("Ignore entry: " + ref);
if (mfgPart.equalsIgnoreCase(IGNORE_TAG)) {
log("Ignoring entry: " + ref);
ignoreList.add(ref);
continue;
}
result.put(ref, new BomRecord(mfgPart, storePart, customerRef));
if (tokens.length != 6) {
log("Unexpected line: [" + line + "] Expected 6 tokens but " + tokens.length);
System.exit(-1);
}
String storePart = tokens[2];
String componentName = tokens[3];
int padCount = Integer.parseInt(tokens[4]);
String customerRef = tokens[5];
result.put(ref, new BomRecord(mfgPart, storePart, customerRef, padCount, componentName));
log("BOM key: " + ref);
log("mfgPartNo: " + mfgPart);

14
java_tools/pcb_sync/src/com/rusefi/bom/BomRecord.java
View File

@ -8,11 +8,15 @@ public class BomRecord {
private final String mfgPart;
private final String storePart;
private final String customerRef;
private final int padCount;
private final String userComment;
public BomRecord(String mfgPart, String storePart, String customerRef) {
public BomRecord(String mfgPart, String storePart, String customerRef, int padCount, String userComment) {
this.mfgPart = mfgPart;
this.storePart = storePart;
this.customerRef = customerRef;
this.padCount = padCount;
this.userComment = userComment;
}
public String getMfgPart() {
@ -26,4 +30,12 @@ public class BomRecord {
public String getCustomerRef() {
return customerRef;
}
public int getPadCount() {
return padCount;
}
public String getUserComment() {
return userComment;
}
}

16
java_tools/pcb_sync/src/com/rusefi/misc/ChangesModel.java
View File

@ -4,10 +4,7 @@ import com.rusefi.util.FileUtils;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
import java.util.*;
import static com.rusefi.pcb.PcbMergeTool.log;
@ -22,6 +19,7 @@ public class ChangesModel {
private static final String MOVE = "move_module";
private static final String OPTIMIZE = "optimize";
private static final String COPY = "copy";
private static final String MERGE_NET = "merge_net";
public final Set<String> DEL_REQUESTS = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
public final List<NameAndOffset> ADD_REQUESTS = new ArrayList<NameAndOffset>();
@ -29,6 +27,10 @@ public class ChangesModel {
public final List<TwoFileRequest> OPTIMIZE_REQUESTS = new ArrayList<TwoFileRequest>();
public final List<TwoFileRequest> COPY_REQUESTS = new ArrayList<TwoFileRequest>();
/**
* Old net name > New net name
*/
public final Map<String, String> NET_MERGE_REQUESTS = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
public static ChangesModel getInstance() {
return instance;
@ -70,6 +72,11 @@ public class ChangesModel {
} else if (line.toLowerCase().startsWith(COPY)) {
COPY_REQUESTS.add(TwoFileRequest.parseTwoFile(line.substring(COPY.length()).trim(), lineIndex));
continue;
} else if (line.toLowerCase().startsWith(MERGE_NET)) {
TwoFileRequest req = TwoFileRequest.parseTwoFile(line.substring(MERGE_NET.length()).trim(), lineIndex);
NET_MERGE_REQUESTS.put(req.input, req.output);
log("Net " + req.input + " to be merged into " + req.output);
continue;
}
System.err.println("ChangesModel: Ignoring invalid line: " + line);
@ -78,6 +85,7 @@ public class ChangesModel {
log("Got " + DEL_REQUESTS.size() + " remove request(s)");
log("Got " + ADD_REQUESTS.size() + " add request(s)");
log("Got " + OPTIMIZE_REQUESTS.size() + " optimize request(s)");
log("Got " + NET_MERGE_REQUESTS.size() + " merge net request(s)");
}
private void addMoveRequest(String request) {

10
java_tools/pcb_sync/src/com/rusefi/pcb/ModuleNode.java
View File

@ -9,7 +9,7 @@ import java.util.List;
public class ModuleNode extends PcbNode {
final List<PadNode> pads;
public final PointNode at;
public final String name;
private final String reference;
public ModuleNode(String nodeName, int i, List<Object> children) {
super(nodeName, i, children);
@ -17,13 +17,17 @@ public class ModuleNode extends PcbNode {
pads = (List<PadNode>) o;
at = (PointNode) find("at");
name = iterate("fp_text").get(0).getChild(1);
reference = iterate("fp_text").get(0).getChild(1);
}
public String getReference() {
return reference;
}
@Override
public String toString() {
return "ModuleNode{" +
"name=" + name +
"reference=" + reference +
", pads.size=" + pads.size() +
'}';
}

2
java_tools/pcb_sync/src/com/rusefi/pcb/NetNode.java
View File

@ -16,7 +16,7 @@ public class NetNode extends PcbNode {
id = getChild(0);
name = children.size() > 1 ? getChild(1) : null;
if (name != null)
System.out.println(name + " network: " + id);
System.out.println("NetNode(" + name + " network: " + id + ")");
if ("GND".equalsIgnoreCase(name))
GND_NET_ID = Integer.parseInt(id);

4
java_tools/pcb_sync/src/com/rusefi/pcb/PadNode.java
View File

@ -29,7 +29,9 @@ public abstract class PadNode extends PcbNode {
return new RectPadNode(nodeName, i, children);
if ("circle".equals(shape))
return new CirclePadNode(nodeName, i, children);
throw new IllegalStateException(shape.toString());
if ("oval".equals(shape))
return new CirclePadNode(nodeName, i, children); // yes, let's treat oval as circle. good enough
throw new IllegalStateException("Unknown pad shape: " + shape.toString());
}
@Override

82
java_tools/pcb_sync/src/com/rusefi/pcb/PcbMergeTool.java
View File

@ -39,6 +39,13 @@ public class PcbMergeTool {
PcbNode destNode = PcbNode.readFromFile(sourcePcb);
for (PcbNode net : destNode.iterate("net")) {
String netName = net.getChild(1); // todo: nicer method?
if (!Networks.isLocalNetwork(netName))
networks.registerNetworkIfPcbSpecific(netName);
}
log("Running ADD commands");
for (NameAndOffset addRequest : ChangesModel.getInstance().ADD_REQUESTS) {
PcbNode node = PcbMoveTool.readAndMove(addRequest.getName(), addRequest.x, addRequest.y);
@ -69,19 +76,25 @@ public class PcbMergeTool {
private static ModuleNode findModuleByName(PcbNode destNode, String moduleName) {
for (PcbNode node : destNode.iterate("module")) {
ModuleNode mn = (ModuleNode) node;
if (moduleName.toLowerCase().equals(mn.name.toLowerCase()))
if (moduleName.toLowerCase().equals(mn.getReference().toLowerCase()))
return mn;
}
return null;
}
private static void mergePcb(PcbNode destNode, PcbNode source) throws IOException {
Map<String, String> netNameMapping = new HashMap<String, String>();
Map<String, Integer> netIdMapping = new HashMap<String, Integer>();
/**
* original local net name > new net name in combined PCB
*/
Map<String, String> netNameMapping = new HashMap<>();
/**
* original local net ID (as string) > new net ID
*/
Map<String, Integer> netIdMapping = new HashMap<>();
for (PcbNode net : source.iterate("net")) {
String netId = net.getChild(0);
String netName = net.getChild(1);
String netName = net.getChild(1); // todo: nicer method?
String newName = networks.registerNetworkIfPcbSpecific(netName);
netNameMapping.put(netName, newName);
netIdMapping.put(netId, networks.getId(newName));
@ -122,10 +135,11 @@ public class PcbMergeTool {
for (PcbNode pad : module.iterate("pad")) {
if (!pad.hasChild("net"))
continue;
PcbNode net = pad.find("net");
String localName = netNameMapping.get(net.getChild(1));
net.setString(1, localName);
net.setInt(0, networks.getId(localName));
fixNetId(netIdMapping, netNameMapping, pad);
// PcbNode net = pad.find("net");
// String localName = netNameMapping.get(net.getChild(1));
// net.setString(1, localName);
// net.setInt(0, networks.getId(localName));
}
destNode.addChild(module);
}
@ -135,7 +149,7 @@ public class PcbMergeTool {
for (PcbNode segment : segments) {
// if (!segment.hasChild("net"))
// continue;
fixNetId(netIdMapping, segment);
fixNetId(netIdMapping, netNameMapping, segment);
destNode.addChild(segment);
}
@ -143,7 +157,7 @@ public class PcbMergeTool {
List<PcbNode> vias = source.iterate("via");
log("Processing " + vias.size() + " vias");
for (PcbNode via : vias) {
fixNetId(netIdMapping, via);
fixNetId(netIdMapping, netNameMapping, via);
destNode.addChild(via);
}
@ -172,21 +186,44 @@ public class PcbMergeTool {
return false;
}
private static void fixNetId(Map<String, Integer> netIdMapping, PcbNode via) {
PcbNode net = via.find("net");
String originalId = net.getChild(0);
net.setInt(0, netIdMapping.get(originalId));
private static void fixNetId(Map<String, Integer> netIdMapping, Map<String, String> netNameMapping, PcbNode node) {
NetNode net = (NetNode) node.find("net");
String originalId = net.id;
Integer currentNetId = netIdMapping.get(originalId);
String globalName = networks.nameById.get(currentNetId);
// String newName = netNameMapping.get(originalName);
// if (newName == null)
// throw new NullPointerException("?");
if (ChangesModel.getInstance().NET_MERGE_REQUESTS.containsKey(globalName)) {
String newName = ChangesModel.getInstance().NET_MERGE_REQUESTS.get(globalName);
log("Will merge " + globalName + " into " + newName + ". ID was " + currentNetId);
currentNetId = networks.networks.get(newName);
if (currentNetId == null)
throw new NullPointerException("Cannot find net: " + newName);
log("New ID: " + currentNetId);
globalName = newName;
}
net.setInt(0, currentNetId);
if (net.name != null)
net.setString(1, globalName);
}
private static class Networks {
private Map<String, Integer> networks = new HashMap<String, Integer>();
/**
* Net name > Net Id
*/
private Map<String, Integer> networks = new HashMap<>();
private Map<Integer, String> nameById = new HashMap<>();
public String registerNetworkIfPcbSpecific(String name) {
if (name.startsWith("N-00")) {
if (isLocalNetwork(name)) {
String newName = "F-0000" + networks.size();
log("Board-specific net: " + name + " would be " + newName);
networks.put(newName, networks.size());
registerNet(newName);
int newId = networks.get(newName);
log(newName + " is " + newId);
return newName;
} else {
if (networks.containsKey(name)) {
@ -195,11 +232,20 @@ public class PcbMergeTool {
}
log("New global net: " + name);
networks.put(name, networks.size());
registerNet(name);
return name;
}
}
private static boolean isLocalNetwork(String name) {
return name.startsWith("N-00");
}
private void registerNet(String name) {
networks.put(name, networks.size());
nameById.put(networks.get(name), name);
}
public int getId(String localName) {
Integer value = networks.get(localName);
if (value == null)

10
java_tools/pcb_sync/src/com/rusefi/pcb/PcbMoveTool.java
View File

@ -50,6 +50,16 @@ public class PcbMoveTool {
for (PcbNode gr_line : gr_lines)
moveStartEnd(dx, dy, gr_line);
List<PcbNode> gr_arcs = pcbNode.iterate("gr_arc");
System.out.println("Moving " + gr_arcs.size() + " gr_arcs");
for (PcbNode gr_arc : gr_arcs) {
PcbNode start = gr_arc.find("start");
moveCoordinatesInFirstChildren(dx, dy, start);
PcbNode end = gr_arc.find("end");
moveCoordinatesInFirstChildren(dx, dy, end);
}
List<PcbNode> gr_circles = pcbNode.iterate("gr_circle");
System.out.println("Moving " + gr_circles.size() + " gr_circles");
for (PcbNode gr_circle : gr_circles) {

4
java_tools/pcb_sync/src/com/rusefi/pcb/PcbNode.java
View File

@ -76,6 +76,8 @@ public class PcbNode {
return PadNode.parse(nodeName, index + 1, children);
} else if ("net".equals(nodeName)) {
return new NetNode(nodeName, index + 1, children);
} else if ("add_net".equals(nodeName)) {
return new AddNetNode(nodeName, index + 1, children);
} else if ("gr_line".equals(nodeName)) {
return new GrLineNode(nodeName, index + 1, children);
} else if ("layer".equals(nodeName)) {
@ -150,6 +152,8 @@ public class PcbNode {
continue;
}
PcbNode p = (PcbNode) child;
if (p == null)
throw new NullPointerException("Null child node");
sb.append("\r\n");
p.pack(sb, prefix + " ");
}

27
java_tools/pcb_sync/src/com/rusefi/pcb/PointNode.java
View File

@ -30,10 +30,14 @@ public class PointNode extends PcbNode {
}
public PointNode(double x, double y) {
this(x, y, 0);
}
public PointNode(double x, double y, double angle) {
super("", 0, Collections.emptyList());
this.x = x;
this.y = y;
angle = 0;
this.angle = angle;
}
public boolean isConnected(PointNode at, SizeNode size) {
@ -51,22 +55,19 @@ public class PointNode extends PcbNode {
'}';
}
public boolean isSameLocation(PointNode point) {
return x == point.x && y == point.y;
}
// public boolean isSameLocation(PointNode point) {
// return x == point.x && y == point.y;
// }
public PointNode translate(PointNode at) {
double nx = at.x - x;
double ny = at.y - y;
if (angle == 0)
return new PointNode(nx, ny);
if (angle == 270)
return new PointNode(ny, -nx);
if (angle == 90)
return new PointNode(-ny, nx);
if (angle == 180)
return new PointNode(-nx, -ny);
throw new IllegalStateException("Angle not supported: " + angle);
double radian = angle / 180 * Math.PI;
double rx = Math.cos(radian) * nx - Math.sin(radian) * ny;
double ry = Math.sin(radian) * nx + Math.cos(radian) * ny;
return new PointNode(rx, ry);
}
public void setLocation(double x, double y) {

2
java_tools/pcb_sync/src/com/rusefi/pcb/test/PcbNodeTest.java
View File

@ -78,7 +78,7 @@ public class PcbNodeTest {
" (rotate (xyz 0 0 0))\n" +
" )\n" +
" )");
assertEquals("R351", module.name);
assertEquals("R351", module.getReference());
}

10
java_tools/readme.txt
View File

@ -1,2 +1,10 @@
Here we have some tiny utilities
Here we have some tiny dev utilities - average rusEfi user would not need to use any of these!
gcc_map_reader reads the .map file produced by GCC and prints some details on what is RAM used for
ts2c reads a piece of TunerStudio map and produces a matching C language piece of code
version2header creates a C language header containting current SVN version
enum2string

BIN
java_tools/version2header.jar
View File

Binary file not shown.

24
java_tools/version2header/src/com/rusefi/Version2Header.java
View File

@ -1,6 +1,7 @@
package com.rusefi;
import java.io.*;
import java.util.Date;
/**
* Andrey Belomutskiy (c) 2014
@ -8,19 +9,25 @@ import java.io.*;
public class Version2Header {
private static final String COMMAND = "svn info";
private static final String VERSION_MARKER = "Last Changed Rev: ";
private static final String HEADER_TAG = "SVN_VERSION";
private static final String HEADER_TAG = "VCS_VERSION";
public static void main(String[] args) throws IOException {
System.out.println("Hi, it's " + new Date());
Process simulatorProcess = null;
try {
System.out.println("Executing [" + COMMAND + "]");
simulatorProcess = Runtime.getRuntime().exec(COMMAND);
BufferedReader input =
BufferedReader stdout =
new BufferedReader(new InputStreamReader(simulatorProcess.getInputStream()));
BufferedReader stderr =
new BufferedReader(new InputStreamReader(simulatorProcess.getErrorStream()));
int counter = 0;
String line;
while ((line = input.readLine()) != null) {
while ((line = stdout.readLine()) != null) {
System.out.println("from " + COMMAND + ": " + line);
counter++;
if (line.startsWith(VERSION_MARKER)) {
String ver = line.substring(VERSION_MARKER.length());
@ -29,6 +36,14 @@ public class Version2Header {
writeFile(version);
}
}
System.out.println("Got " + counter + " lines of stdout");
while ((line = stdout.readLine()) != null) {
System.out.println("Stderr: " + line);
}
} catch (Throwable e) {
System.err.println("Ops: " + e);
e.printStackTrace();
} finally {
if (simulatorProcess != null)
simulatorProcess.destroy();
@ -38,8 +53,9 @@ public class Version2Header {
private static void writeFile(int version) throws IOException {
BufferedWriter bw = new BufferedWriter(new FileWriter("svnversion.h"));
bw.write("// This file was generated by Version2Header\r\n");
bw.write("// " + new Date() + "\r\n");
bw.write("#ifndef " + HEADER_TAG + "\r\n");
bw.write("#define " + HEADER_TAG + " " + version + "\r\n");
bw.write("#define " + HEADER_TAG + " \"" + version + "\"\r\n");
bw.write("#endif\r\n");
bw.close();
}