Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Support multiple ODs #221

Open
wants to merge 11 commits into
base: xdd
Choose a base branch
from
Open

Support multiple ODs #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
63c85ff
Merge libedssharp as mir/robot/embedded/libedssharp-repo
cfr-mir Jul 10, 2020
7bb7605
Add support for prefix to all variables/types/defines - to enable mul…
cfr-mir Jul 10, 2020
b2c9a0b
Change code generation to fit multible OD's
cfr-mir Jul 30, 2020
ba519a8
Get rid of internal readme file
cfr-mir Jul 30, 2020
3d57bb1
Merge branch 'xdd' into multi-ODs
cfr-mir Jul 30, 2020
31ad494
Change export code to accomodate new CANopenNode directory structure
cfr-mir Aug 10, 2020
bf710a4
Merge branch 'xdd' into Support_Multiple_ODs
cfr-mir Aug 11, 2020
96fb0ce
Add file
cfr-mir Aug 11, 2020
c7c5d8c
Include order changed
cfr-mir Aug 12, 2020
26a64e5
Load chrome if on a linux platform
cfr-mir Aug 12, 2020
0eb4785
Fix wrong initialization of const struct
cfr-mir Aug 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
/EDSTest/obj
/EDSTest/bin
/Cia306Tester/obj
/libEDSsharp/bin
/*.suo
/libEDSsharp/obj
/EDSTest/obj/Release
/EDSTest/bin/Release
/.vs/EDSTest/v14/*.suo
Expand All @@ -23,3 +21,4 @@ edseditor-Setup.exe
/Backup
/SourceGrid_4.21
/packages/

2 changes: 1 addition & 1 deletion EDSTest/DevicePDOView.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion EDSTest/DeviceView.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<root>
<!--
Microsoft ResX Schema

Version 2.0

The primary goals of this format is to allow a simple XML format
Expand Down
16 changes: 12 additions & 4 deletions EDSTest/Form1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,10 @@ private void networkPDOToolStripMenuItem_Click(object sender, EventArgs e)

if (IsRunningOnMono())
{
System.Diagnostics.Process.Start("file://"+temp);
if (System.IO.File.Exists("/usr/bin/google-chrome"))
System.Diagnostics.Process.Start("/usr/bin/google-chrome","file://"+temp);
else
System.Diagnostics.Process.Start("file://"+temp);
}
else
{
Expand Down Expand Up @@ -920,7 +923,6 @@ private void documentationToolStripMenuItem_Click(object sender, EventArgs e)
{
try
{

Warnings.warning_list.Clear();

if (tabControl1.SelectedTab != null)
Expand Down Expand Up @@ -952,10 +954,16 @@ private void documentationToolStripMenuItem_Click(object sender, EventArgs e)
DocumentationGen docgen = new DocumentationGen();
docgen.genhtmldoc(temp, dv.eds);
docgen.genmddoc(temp2, dv.eds);
System.Diagnostics.Process.Start("file://" + temp2);
if (System.IO.File.Exists("/usr/bin/google-chrome"))
System.Diagnostics.Process.Start("/usr/bin/google-chrome", "file://" + temp2);
else
System.Diagnostics.Process.Start("file://" + temp2);
if (IsRunningOnMono())
{
System.Diagnostics.Process.Start("file://" + temp);
if (System.IO.File.Exists("/usr/bin/google-chrome"))
System.Diagnostics.Process.Start("/usr/bin/google-chrome","file://" + temp);
else
System.Diagnostics.Process.Start("file://" + temp);
}
else
{
Expand Down
Loading