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

Add RDM Personality support #39

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Add RDM Personality support #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6cdfbfc
Fix a minor typo nit
peternewman Jul 6, 2021
71cfd3c
Ensure we don't get or set labels that are too long
peternewman Jul 13, 2021
2977f7f
Return unsupported command class if we don't support set
peternewman Jul 13, 2021
b99ff96
Undo an accidental commit of some testing tweaks
peternewman Jul 13, 2021
a32139d
Initial RDM Personality support
peternewman Jul 14, 2021
8b8685d
Merge branch 'master' into personalities
peternewman Jul 14, 2021
7682d33
Correct the size of a field
peternewman Jul 14, 2021
2682cb1
Merge branch 'personalities' of https://github.com/peternewman/DmxSer…
peternewman Jul 14, 2021
88734a5
Improve the example code
peternewman Jul 18, 2021
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
30 changes: 24 additions & 6 deletions examples/RDMSerialRecv/RDMSerialRecv.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,17 @@ void rgb(byte r, byte g, byte b)

// see DMXSerial2.h for the definition of the fields of this structure
const uint16_t my_pids[] = {E120_DEVICE_HOURS, E120_LAMP_HOURS};
const RDMPERSONALITY my_personalities[] = {
// Footprint (number of channels) and name
{1, "Intensity only"},
{3, "RGB"},
};
struct RDMINIT rdmInit = {
"mathertel.de", // Manufacturer Label
1, // Device Model ID
"Arduino RDM Device", // Device Model Label
3, // footprint
2, // Default RDM personality (1 based)
(sizeof(my_personalities)/sizeof(RDMPERSONALITY)), my_personalities,
(sizeof(my_pids)/sizeof(uint16_t)), my_pids,
0, NULL
};
Expand Down Expand Up @@ -96,7 +102,7 @@ void setup () {
DMXSerial2.write(start + 1, 0);
DMXSerial2.write(start + 2, 0);

// enable pwm outputs
// enable PWM outputs
pinMode(RedPin, OUTPUT); // sets the digital pin as output
pinMode(GreenPin, OUTPUT);
pinMode(BluePin, OUTPUT);
Expand Down Expand Up @@ -136,10 +142,22 @@ void loop() {
} // if

} else if (lastPacket < 30000) {
// read recent DMX values and set pwm levels
analogWrite(RedPin, DMXSerial2.readRelative(0));
analogWrite(GreenPin, DMXSerial2.readRelative(1));
analogWrite(BluePin, DMXSerial2.readRelative(2));
// read recent DMX values and set PWM levels based on the RDM personality
switch (DMXSerial2.getPersonalityNumber()) {
// RDM personalities are 1 based, so ignore 0
case 1:
// Intensity only, one channel, all colours the same
analogWrite(RedPin, DMXSerial2.readRelative(0));
analogWrite(GreenPin, DMXSerial2.readRelative(0));
analogWrite(BluePin, DMXSerial2.readRelative(0));
break;
case 2:
// RGB mode, individual control of each channel
analogWrite(RedPin, DMXSerial2.readRelative(0));
analogWrite(GreenPin, DMXSerial2.readRelative(1));
analogWrite(BluePin, DMXSerial2.readRelative(2));
break;
}

} else {
#if defined(SERIAL_DEBUG)
Expand Down
Loading