resolved merge conflict

This commit is contained in:
saad 2023-10-04 01:25:33 -04:00
commit b4867dad48

View File

@ -1,18 +1,3 @@
DmxSimple
---------
# DmxMaster
Simple DMX master library for Arduino (TM)
Originally written by Tinker.it Ltd
DmxSimple v3 release:
Changes from v2 to v3:
Optimised interrupt routine now supports serial baud rates up to 115200.
DMX output pin can be changed with the DmxMaster.usePin() function.
Automatic support for future clock rates and pin mappings.
Syntax highlighting in Arduino editor fixed.
More comments added to FadeUp and SerialToDmx examples
FadeUp example now demonstrates all DmxMaster functions.
Release notes file added. (For older revisions, see SVN log on Google Code)
An archive of the DmxMaster library for the Arduino DMX shield by Tinkerkit