Skip to content

Commit eb05c5d

Browse files
committed
update lost plugin description settings
1 parent f3b1f93 commit eb05c5d

12 files changed

+45
-35
lines changed

.idea/markdown-navigator-enh.xml

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/markdown-navigator.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/markdown-navigator/Plugin_Description.xml

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules/CLionArduinoPlugin.iml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules/CLionArduinoPlugin.main.iml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules/CLionArduinoPlugin.test.iml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/scopes/plugin_description.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

VERSION.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
### Version History
66
- [CLionArduinoPlugin Version Notes](#clionarduinoplugin-version-notes)
77
- [TO DO](#to-do)
8+
- [1.6.0](#160)
89
- [1.5.39](#1539)
910
- [1.5.37](#1537)
1011
- [1.5.35](#1535)
@@ -58,6 +59,8 @@
5859
* Add: inspection to check that `CMakeLists.txt` is out of sync, especially if missing the
5960
toolchain file.
6061

62+
### 1.6.0
63+
6164
### 1.5.39
6265

6366
* Change: to use `SerialPortOwnerAccess` instance for writing to port
@@ -354,4 +357,3 @@
354357
[arduino-cmake]: https://github.com/queezythegreat/arduino-cmake
355358
[java-simple-serial-connector]: https://github.com/scream3r/java-simple-serial-connector
356359

357-

assets/docs/plugin-description.html

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,16 @@
2828
<p>Use bundled <code>ArduinoToolchain</code> or your own version.</p>
2929
</li>
3030
</ul>
31-
<h3>** <code>Serial Port Monitor</code> plugin cannot be used with <code>Arduino Support</code></h3>
32-
<p>Both plugins use <a href="https://github.com/scream3r/java-simple-serial-connector">jSSC-2.8.0</a> serial library and only one plugin can load the native libraries.
33-
Please uninstall or disable <code>Serial Port Monitor</code> plugin before installing <code>Arduino Support</code>.</p>
31+
<p>** <code>Serial Port Monitor</code> plugin may conflict with <code>Arduino Support</code></p>
32+
<p>This plugin uses <a href="https://plugins.jetbrains.com/plugin/21550-simpleserialconnectorservice">Simple Serial Connector Service</a> plugin, which uses
33+
<a href="https://github.com/java-native/jssc">jscc - Java Simple Serial Connector</a> serial library, as does <code>Serial Port Monitor</code> plugin. Only
34+
one plugin can load the native libraries. If you encounter conflicts please uninstall or disable
35+
<code>Serial Port Monitor</code> plugin, or this plugin.</p>
3436
<p>| <a href="https://github.com/vsch/CLionArduinoPlugin/issues">Issues</a> | <a href="https://github.com/vsch/CLionArduinoPlugin">Plugin Source</a> |</p>
3537
<hr>
36-
<p><img src="https://github.com/vsch/CLionArduinoPlugin/raw/master/assets/images/Screenshot_NewProject.png" alt="Screenshot_NewProject.png" />{height=248px width=400px}<br />
37-
<img src="https://github.com/vsch/CLionArduinoPlugin/raw/master/assets/images/Screenshot_SerialMonitor.png" alt="Screenshot_SerialMonitor" />{height=191px width=400px}<br />
38-
<img src="https://github.com/vsch/CLionArduinoPlugin/raw/master/assets/images/Screenshot_ChangeBuildSettings.png" alt="Screenshot_ChangeBuildSettings" />{height=281px width=400px}</p>
38+
<p><img src="https://github.com/vsch/CLionArduinoPlugin/raw/master/assets/images/Screenshot_NewProject.png" alt="Screenshot_NewProject.png" height="248px" width="400px" /><br />
39+
<img src="https://github.com/vsch/CLionArduinoPlugin/raw/master/assets/images/Screenshot_SerialMonitor.png" alt="Screenshot_SerialMonitor" height="191px" width="400px" /><br />
40+
<img src="https://github.com/vsch/CLionArduinoPlugin/raw/master/assets/images/Screenshot_ChangeBuildSettings.png" alt="Screenshot_ChangeBuildSettings" height="281px" width="400px" /></p>
3941
<hr>
4042
<p><strong>*</strong> This plugin is a fork of <a href="https://github.com/francoiscampbell/CLionArduinoPlugin">Original CLionArduinoPlugin</a> written by Francois Campbell.</p>
4143

assets/docs/plugin-description.md

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,32 @@ communications with the integrated serial monitor tool window.
2121

2222
* Use bundled `ArduinoToolchain` or your own version.
2323

24-
### ** `Serial Port Monitor` plugin cannot be used with `Arduino Support`
24+
** `Serial Port Monitor` plugin may conflict with `Arduino Support`
2525

26-
Both plugins use [jSSC-2.8.0] serial library and only one plugin can load the native libraries.
27-
Please uninstall or disable `Serial Port Monitor` plugin before installing `Arduino Support`.
26+
This plugin uses [Simple Serial Connector Service] plugin, which uses
27+
[jscc - Java Simple Serial Connector] serial library, as does `Serial Port Monitor` plugin. Only
28+
one plugin can load the native libraries. If you encounter conflicts please uninstall or disable
29+
`Serial Port Monitor` plugin, or this plugin.
2830

2931
| [Issues][] | [Plugin Source][] |
3032

3133
<hr>
3234

33-
![Screenshot_NewProject.png](https://github.com/vsch/CLionArduinoPlugin/raw/master/assets/images/Screenshot_NewProject.png){height=248px width=400px}
34-
![Screenshot_SerialMonitor](https://github.com/vsch/CLionArduinoPlugin/raw/master/assets/images/Screenshot_SerialMonitor.png){height=191px width=400px}
35-
![Screenshot_ChangeBuildSettings](https://github.com/vsch/CLionArduinoPlugin/raw/master/assets/images/Screenshot_ChangeBuildSettings.png){height=281px width=400px}
35+
![Screenshot_NewProject.png](https://github.com/vsch/CLionArduinoPlugin/raw/master/assets/images/Screenshot_NewProject.png){height=248px
36+
width=400px}
37+
![Screenshot_SerialMonitor](https://github.com/vsch/CLionArduinoPlugin/raw/master/assets/images/Screenshot_SerialMonitor.png){height=191px
38+
width=400px}
39+
![Screenshot_ChangeBuildSettings](https://github.com/vsch/CLionArduinoPlugin/raw/master/assets/images/Screenshot_ChangeBuildSettings.png){height=281px
40+
width=400px}
3641

3742
<hr>
3843

3944
**\*** This plugin is a fork of [Original CLionArduinoPlugin] written by Francois Campbell.
4045

4146
[Arduino CMake]: https://github.com/francoiscampbell/arduino-cmake
4247
[Issues]: https://github.com/vsch/CLionArduinoPlugin/issues
43-
[jSSC-2.8.0]: https://github.com/scream3r/java-simple-serial-connector
4448
[Original CLionArduinoPlugin]: https://github.com/francoiscampbell/CLionArduinoPlugin
4549
[Plugin Source]: https://github.com/vsch/CLionArduinoPlugin
46-
[rjuang/CLionArduinoPlugin]: https://github.com/rjuang/CLionArduinoPlugin
50+
[Simple Serial Connector Service]: https://plugins.jetbrains.com/plugin/21550-simpleserialconnectorservice
51+
[jscc - Java Simple Serial Connector]: https://github.com/java-native/jssc
4752

0 commit comments

Comments
 (0)