arduino
/
ArcheryClock-Arduino
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

First (untested) changes for new HW

This commit is contained in:
giuliof 2019-01-10 15:55:21 +01:00
parent 05c930841b
commit 7d52e35c8f
3 changed files with 135 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.vscode/

288
ArcheryClockMEGA02_1.ino
View File

@ -1,5 +1,5 @@
//Copyright (C) 2010-2014 Henk Jegers
//Copyright (C) 2019 giuliof (GOLEM)
//This program is free software: you can redistribute it and/or modify
//it under the terms of the GNU General Public License as published by
//the Free Software Foundation, either version 3 of the License, or
@ -18,17 +18,19 @@
// version MEGA01_2 Added end number information. Needs Archeryclock2401 or newer. (older archeryclock versions don't sent the end number information to arduine)
// version MEGA02_1 Changes because of a change in protocoll for AC 241 (nr of archers and E and F shooters) and added functionality: emergency stop, add archers E and F. Changes for signal robustness. (0 (0000) is sent as 12 (1100) to prevent decoding issues when 3 times 0 is sent (000000000000)
#include "utils.h"
String inputString;
int serialvalue;
int statevalue; //received data for state details.
int trafficvalue; //received data for traffic lights, and ABCD lights
int leftcountvalue; //received data for left countdown.
int rightcountvalue; //received data for rightcountdown.
int abcdvalue; //received data for abcd details
// int abcdvalue; //received data for abcd details
int endnrvalue; //received data for end nr
int buttonvalue;
int remember1;
int loop1;
// int buttonvalue;
// int remember1;
// int loop1;
int blinkk;
int blinkkk;
int blinkl;
@ -36,78 +38,60 @@ int blinkr;
int rightdigit; //value of left digit (0..10 (10 means dashes))
int middigit; //value of middle digit (0..10 (10 means dashes))
int leftdigit; //value of light digit (0..10 (10 means dashes))
bool dots = false;
int lefend; //value of left digit to indicate end nr (0..9 or 15 (15 means P to indicate practise end))
int midend; //value of middle digit to indicate end nr (0..9)
int rigend; //value of middle digit to indicate end nr (0..9)
int comend; //value of combined left and middle digit. In case of practise end the P from the left digit should be projected. else the middle digit (0..9 or 15 (15 means P to indicate practise end))
// int lefend; //value of left digit to indicate end nr (0..9 or 15 (15 means P to indicate practise end))
// int midend; //value of middle digit to indicate end nr (0..9)
// int rigend; //value of middle digit to indicate end nr (0..9)
// int comend; //value of combined left and middle digit. In case of practise end the P from the left digit should be projected. else the middle digit (0..9 or 15 (15 means P to indicate practise end))
int segment[16] = {0x03f, 0x006, 0x05b, 0x04f, 0x066, 0x06d, 0x07d, 0x007, 0x07f, 0x06f, 0x040, 0x000, 0x03f, 0x000, 0x000, 0x073}; //0,1,2,3,4,5,6,7,8,9,-, , , , ,P
#define DOTS_bm _BV(7)
#define ABCD_PORT A
#define LEFTDIGIT_PORT K
#define MIDDIGIT_PORT L
#define RIGHTDIGIT_PORT C
#define TRAFLIGHT_PORT F
#define HORNP_PIN 7
#define REDP_PIN 6
#define ORANGEP_PIN 5
#define GREENP_PIN 4
#define notA_PIN 78
#define notB_PIN 77
#define notC_PIN 76
#define notD_PIN 75
#define A_PIN 74
#define B_PIN 73
#define C_PIN 72
#define D_PIN 71
#define LR_PIN 9
#define MUTE_PIN 8
const int segment[16] = {0x03f, 0x006, 0x05b, 0x04f, 0x066, 0x06d, 0x07d, 0x007, 0x07f, 0x06f, 0x040, 0x000, 0x03f, 0x000, 0x000, 0x073}; //0,1,2,3,4,5,6,7,8,9,-, , , , ,P
void setup()
{
pinMode(LR_PIN, INPUT_PULLUP);
pinMode(MUTE_PIN, INPUT_PULLUP);
DDRC = B00000000; // Pins A0 to A5 are inputs
buttonvalue = 0;
pinMode(2, OUTPUT);
pinMode(3, OUTPUT);
pinMode(4, OUTPUT);
pinMode(5, OUTPUT);
pinMode(6, OUTPUT);
pinMode(7, OUTPUT);
pinMode(8, OUTPUT);
pinMode(9, OUTPUT);
pinMode(14, OUTPUT);
pinMode(15, OUTPUT);
pinMode(16, OUTPUT);
pinMode(17, OUTPUT);
pinMode(18, OUTPUT);
pinMode(19, OUTPUT);
pinMode(20, OUTPUT);
pinMode(21, OUTPUT);
pinMode(22, OUTPUT);
pinMode(23, OUTPUT);
pinMode(24, OUTPUT);
pinMode(25, OUTPUT);
pinMode(26, OUTPUT);
pinMode(27, OUTPUT);
pinMode(28, OUTPUT);
pinMode(29, OUTPUT);
pinMode(30, OUTPUT);
pinMode(31, OUTPUT);
pinMode(32, OUTPUT);
pinMode(33, OUTPUT);
pinMode(34, OUTPUT);
pinMode(35, OUTPUT);
pinMode(36, OUTPUT);
pinMode(37, OUTPUT);
pinMode(38, OUTPUT);
pinMode(39, OUTPUT);
pinMode(40, OUTPUT);
pinMode(41, OUTPUT);
pinMode(42, OUTPUT);
pinMode(43, OUTPUT);
pinMode(44, OUTPUT);
pinMode(45, OUTPUT);
pinMode(46, OUTPUT);
pinMode(47, OUTPUT);
pinMode(48, OUTPUT);
pinMode(49, OUTPUT);
pinMode(50, OUTPUT);
pinMode(51, OUTPUT);
pinMode(52, OUTPUT);
pinMode(53, OUTPUT);
pinMode(A8, OUTPUT);
pinMode(A9, OUTPUT);
pinMode(A10, OUTPUT);
pinMode(A11, OUTPUT);
pinMode(A12, OUTPUT);
pinMode(A13, OUTPUT);
pinMode(A14, OUTPUT);
pinMode(A15, OUTPUT);
CATDDR(ABCD_PORT) = 0xFF;
CATDDR(LEFTDIGIT_PORT) = 0xFF;
CATDDR(MIDDIGIT_PORT) = 0xFF;
CATDDR(RIGHTDIGIT_PORT) = 0xFF;
CATDDR(TRAFLIGHT_PORT) = 0xFF;
remember1 = 0;
loop1 = 0;
pinMode(REDP_PIN, OUTPUT);
pinMode(ORANGEP_PIN, OUTPUT);
pinMode(GREENP_PIN, OUTPUT);
pinMode(HORNP_PIN, OUTPUT);
// buttonvalue = 0;
// remember1 = 0;
// loop1 = 0;
blinkk = 0;
blinkkk = 0;
blinkl = 0;
@ -117,7 +101,8 @@ void setup()
leftcountvalue = 0xAAA0;
serialvalue = 0x0000;
Serial.begin(9600);
Serial.begin(9600); // Debug UART
Serial1.begin(9600); // Debug UART
Serial.println("Arduino Serial Link");
Serial.println("connected!");
}
@ -125,11 +110,14 @@ void setup()
void loop()
{
inputString = ""; // Clear inputString
if (Serial.available())
// A command is received
if (Serial1.available())
{
while ((Serial.available()))
// Parse all (because is splitted in multiple bytes -- 2 bytes)
while ((Serial1.available()))
{
char digit = Serial.read(); // Read serial buffer
char digit = Serial1.read(); // Read serial buffer
if (digit != '\n')
{
inputString += digit;
@ -138,12 +126,8 @@ void loop()
serialvalue = inputString.toInt();
};
//16 bits data received.
//first bit is telling if the data is about traffic lights and ABCD lights (true). or about the digits of the countdown (false).
//second bit is telling:
// -in case of digits (first bit is 0)if the digits are from the right side countdown (true) or left side countdown (false).
// -in case of trafic/ABCD lights: not implemented jet. Proposal is to use this for ABCD light depending on sequence (For example CDAB is also possible to show)
// Now decode command and apply to the panel
// Refer to documentation for command structure
if ((serialvalue & 0x01) && not(serialvalue & 0x06))
{
trafficvalue = serialvalue;
@ -168,37 +152,7 @@ void loop()
}; //determine the digits value of the leftside
};
//Trafic lights and ABCD lights switching (independent to left/right switch connected to A5)
//Traficvalue bit 3 -14 show buzzer, green right side, orange right side, red right side, green left side, orange left side, red left side, A, B, C and D.
//digitalWrite(X, (trafficvalue&0x0008)?HIGH:LOW); //buzzer
//digitalWrite(X, (trafficvalue&0x0010)?HIGH:LOW); //green right side
//digitalWrite(X, (trafficvalue&0x0020)?HIGH:LOW); //orange right side
//digitalWrite(X, (trafficvalue&0x0040)?HIGH:LOW); //red right side
//digitalWrite(X, (trafficvalue&0x0080)?HIGH:LOW); //green left side
//digitalWrite(X, (trafficvalue&0x0100)?HIGH:LOW); //orange left side
//digitalWrite(X, (trafficvalue&0x0200)?HIGH:LOW); //red left side
digitalWrite(17, (trafficvalue & 0x0400) ? HIGH : LOW); //A
digitalWrite(16, (trafficvalue & 0x0800) ? HIGH : LOW); //B
digitalWrite(15, (trafficvalue & 0x1000) ? HIGH : LOW); //C
digitalWrite(14, (trafficvalue & 0x2000) ? HIGH : LOW); //D
digitalWrite(6, ((((statevalue >> 7) & B00000111) == 2) ? LOW : HIGH) and ((trafficvalue & 0x4000) ? HIGH : LOW)); //E
digitalWrite(7, ((((statevalue >> 7) & B00000111) == 2) ? LOW : HIGH) and ((trafficvalue & 0x8000) ? HIGH : LOW)); //F
digitalWrite(A15, ((((statevalue >> 7) & B00000111) != 2) ? LOW : HIGH) and ((trafficvalue & 0x4000) ? HIGH : LOW)); //green right arrow for fita finals
digitalWrite(39, ((((statevalue >> 7) & B00000111) != 2) ? LOW : HIGH) and ((trafficvalue & 0x8000) ? HIGH : LOW)); //green left arrow for fita finals
//(((((statevalue>>7)&B00000111)=2)?LOW:HIGH) and )
if (digitalRead(A4))
{ //buzzer yes/no switch
digitalWrite(18, (trafficvalue & 0x0008) ? HIGH : LOW); //buzzer
}
else
{
digitalWrite(18, LOW); //if switch on A4 is off, buzzer must be always off
};
//last 2 bits of trafic value show the number of archers. In this way we can determine notA, notB, notC and notD
// (hypothesis) blink algorithm for not{A,B,C,D}
if (blinkk == 0)
{
blinkk = 300;
@ -226,77 +180,81 @@ void loop()
blinkl = 0;
};
// Set ABCD(EF)
digitalWrite(A_PIN, (trafficvalue & 0x0400) ? HIGH : LOW); //A
digitalWrite(B_PIN, (trafficvalue & 0x0800) ? HIGH : LOW); //B
digitalWrite(C_PIN, (trafficvalue & 0x1000) ? HIGH : LOW); //C
digitalWrite(D_PIN, (trafficvalue & 0x2000) ? HIGH : LOW); //D
// EF not implemented in this hardware
// Set Horn
if (digitalRead(MUTE_PIN)) { // buzzer yes/no switch
digitalWrite(HORNP_PIN, (trafficvalue & 0x0008) ? HIGH : LOW);
}
else { // Stay silenced
digitalWrite(HORNP_PIN, LOW);
}
// Set not{A,B,C,D,(E,F)}
if ((((statevalue >> 4) & B00000111) != 6) ? HIGH : LOW)
{
digitalWrite(2, (((((statevalue >> 13) & B00000111) < 1) ? LOW : HIGH) and ((((statevalue >> 7) & B00000111) == 2) ? LOW : HIGH) and ((((statevalue >> 7) & B00000111) == 4) ? LOW : HIGH) and (not(trafficvalue & 0x0400) ? HIGH : LOW))); //notA. Is on if Archer A exist but it is not his/her turn to shoot
digitalWrite(3, (((((statevalue >> 13) & B00000111) < 1) ? LOW : HIGH) and ((((statevalue >> 7) & B00000111) == 2) ? LOW : HIGH) and ((((statevalue >> 7) & B00000111) == 4) ? LOW : HIGH) and (not(trafficvalue & 0x0800) ? HIGH : LOW))); //notB. Is on if Archer B exist but it is not his/her turn to shoot
digitalWrite(4, (((((statevalue >> 13) & B00000111) < 2) ? LOW : HIGH) and ((((statevalue >> 7) & B00000111) == 2) ? LOW : HIGH) and ((((statevalue >> 7) & B00000111) == 4) ? LOW : HIGH) and (not(trafficvalue & 0x1000) ? HIGH : LOW))); //notC. Is on if Archer C exist but it is not his/her turn to shoot
digitalWrite(5, (((((statevalue >> 13) & B00000111) < 3) ? LOW : HIGH) and ((((statevalue >> 7) & B00000111) == 2) ? LOW : HIGH) and ((((statevalue >> 7) & B00000111) == 4) ? LOW : HIGH) and (not(trafficvalue & 0x2000) ? HIGH : LOW))); //notD. Is on if Archer D exist but it is not his/her turn to shoot
digitalWrite(notA_PIN, (((((statevalue >> 13) & B00000111) < 1) ? LOW : HIGH) and (not(trafficvalue & 0x0400) ? HIGH : LOW))); //notA. Is on if Archer A exist but it is not his/her turn to shoot
digitalWrite(notB_PIN, (((((statevalue >> 13) & B00000111) < 1) ? LOW : HIGH) and ((((statevalue >> 7) & B00000111) == 2) ? LOW : HIGH) and ((((statevalue >> 7) & B00000111) == 4) ? LOW : HIGH) and (not(trafficvalue & 0x0800) ? HIGH : LOW))); //notB. Is on if Archer B exist but it is not his/her turn to shoot
digitalWrite(notC_PIN, (((((statevalue >> 13) & B00000111) < 2) ? LOW : HIGH) and ((((statevalue >> 7) & B00000111) == 2) ? LOW : HIGH) and ((((statevalue >> 7) & B00000111) == 4) ? LOW : HIGH) and (not(trafficvalue & 0x1000) ? HIGH : LOW))); //notC. Is on if Archer C exist but it is not his/her turn to shoot
digitalWrite(notD_PIN, (((((statevalue >> 13) & B00000111) < 3) ? LOW : HIGH) and ((((statevalue >> 7) & B00000111) == 2) ? LOW : HIGH) and ((((statevalue >> 7) & B00000111) == 4) ? LOW : HIGH) and (not(trafficvalue & 0x2000) ? HIGH : LOW))); //notD. Is on if Archer D exist but it is not his/her turn to shoot
// EF not implemented in this hardware
/*
digitalWrite(8, (((((statevalue >> 13) & B00000111) < 4) ? LOW : HIGH) and ((((statevalue >> 7) & B00000111) == 2) ? LOW : HIGH) and ((((statevalue >> 7) & B00000111) == 4) ? LOW : HIGH) and (not(trafficvalue & 0x4000) ? HIGH : LOW))); //notE. Is on if Archer E exist but it is not his/her turn to shoot
digitalWrite(9, (((((statevalue >> 13) & B00000111) < 5) ? LOW : HIGH) and ((((statevalue >> 7) & B00000111) == 2) ? LOW : HIGH) and ((((statevalue >> 7) & B00000111) == 4) ? LOW : HIGH) and (not(trafficvalue & 0x8000) ? HIGH : LOW))); //notF. Is on if Archer F exist but it is not his/her turn to shoot
*/
}
else
{
digitalWrite(notA_PIN, (blinkl));
digitalWrite(notB_PIN, (blinkl));
digitalWrite(notC_PIN, (blinkr));
digitalWrite(notD_PIN, (blinkr));
digitalWrite(2, (blinkl));
digitalWrite(3, (blinkl));
digitalWrite(4, (blinkr));
digitalWrite(5, (blinkr));
// EF not implemented in this hardware
/*
digitalWrite(8, (blinkl));
digitalWrite(9, (blinkl));
*/
};
//outputs depending on switch (A5 input) if right side or leftside is used
if (digitalRead(A5))
{ //right side
// Set Traffic lights and digits, depending on side switch
if (digitalRead(LR_PIN)) // left side (default)
{
//Trafic lights:
digitalWrite(19, (trafficvalue & 0x0010) ? HIGH : LOW); //green right side
digitalWrite(20, (trafficvalue & 0x0020) ? HIGH : LOW); //orange right side
digitalWrite(21, (trafficvalue & 0x0040) ? HIGH : LOW); //red right side
//digits
digitalWrite(23, ((rightcountvalue & 0x0008) ? HIGH : LOW) and ((segment[leftdigit] == 0x040) ? LOW : HIGH)); //dots to indicate minutes or seconds indication
rightdigit = ((rightcountvalue >> 4) & B00001111);
middigit = ((rightcountvalue >> 8) & B00001111);
leftdigit = ((rightcountvalue >> 12) & B00001111);
digitalWrite(GREENP_PIN, (trafficvalue & 0x0080) ? HIGH : LOW); //green left side
digitalWrite(ORANGEP_PIN, (trafficvalue & 0x0100) ? HIGH : LOW); //orange left side
digitalWrite(REDP_PIN, (trafficvalue & 0x0200) ? HIGH : LOW); //red left side
rightdigit = ((leftcountvalue >> 4) & B00001111);
middigit = ((leftcountvalue >> 8) & B00001111);
leftdigit = ((leftcountvalue >> 12) & B00001111);
//digits dots
dots = ((leftcountvalue & 0x0008) ? HIGH : LOW) and ((segment[leftdigit] == 0x040) ? LOW : HIGH);
}
else //left side
{
//Trafic lights:
digitalWrite(19, (trafficvalue & 0x0080) ? HIGH : LOW); //green left side
digitalWrite(20, (trafficvalue & 0x0100) ? HIGH : LOW); //orange left side
digitalWrite(21, (trafficvalue & 0x0200) ? HIGH : LOW); //red left side
//digits
digitalWrite(23, ((leftcountvalue & 0x0008) ? HIGH : LOW) and ((segment[leftdigit] == 0x040) ? LOW : HIGH)); //dots to indicate minutes or seconds indication
rightdigit = ((leftcountvalue >> 4) & B00001111);
middigit = ((leftcountvalue >> 8) & B00001111);
leftdigit = ((leftcountvalue >> 12) & B00001111);
digitalWrite(GREENP_PIN, (trafficvalue & 0x0010) ? HIGH : LOW); //green right side
digitalWrite(ORANGEP_PIN, (trafficvalue & 0x0020) ? HIGH : LOW); //orange right side
digitalWrite(REDP_PIN, (trafficvalue & 0x0040) ? HIGH : LOW); //red right side
rightdigit = ((rightcountvalue >> 4) & B00001111);
middigit = ((rightcountvalue >> 8) & B00001111);
leftdigit = ((rightcountvalue >> 12) & B00001111);
//digits dots
dots = ((rightcountvalue & 0x0008) ? HIGH : LOW) and ((segment[leftdigit] == 0x040) ? LOW : HIGH);
};
// Apply selected segments
CATPORT(LEFTDIGIT_PORT) = segment[leftdigit] | (dots ? DOTS_bm : 0);
CATPORT(MIDDIGIT_PORT) = segment[middigit];
CATPORT(RIGHTDIGIT_PORT) = segment[rightdigit];
digitalWrite(37, ((segment[leftdigit] & 0x001)) ? HIGH : LOW); //left digit segment A
digitalWrite(35, ((segment[leftdigit] & 0x002)) ? HIGH : LOW); //left digit segment B
digitalWrite(33, ((segment[leftdigit] & 0x004)) ? HIGH : LOW); //left digit segment C
digitalWrite(31, ((segment[leftdigit] & 0x008)) ? HIGH : LOW); //left digit segment D
digitalWrite(29, ((segment[leftdigit] & 0x010)) ? HIGH : LOW); //left digit segment E
digitalWrite(27, ((segment[leftdigit] & 0x020)) ? HIGH : LOW); //left digit segment F
digitalWrite(25, ((segment[leftdigit] & 0x040)) ? HIGH : LOW); //left digit segment G
digitalWrite(53, ((segment[middigit] & 0x001)) ? HIGH : LOW); //middle digit segment A
digitalWrite(51, ((segment[middigit] & 0x002)) ? HIGH : LOW); //middle digit segment B
digitalWrite(49, ((segment[middigit] & 0x004)) ? HIGH : LOW); //middle digit segment C
digitalWrite(47, ((segment[middigit] & 0x008)) ? HIGH : LOW); //middle digit segment D
digitalWrite(45, ((segment[middigit] & 0x010)) ? HIGH : LOW); //middle digit segment E
digitalWrite(43, ((segment[middigit] & 0x020)) ? HIGH : LOW); //middle digit segment F
digitalWrite(41, ((segment[middigit] & 0x040)) ? HIGH : LOW); //middle digit segment G
digitalWrite(A8, ((segment[rightdigit] & 0x001)) ? HIGH : LOW); //right digit segment A
digitalWrite(A9, ((segment[rightdigit] & 0x002)) ? HIGH : LOW); //right digit segment B
digitalWrite(A10, ((segment[rightdigit] & 0x004)) ? HIGH : LOW); //right digit segment C
digitalWrite(A11, ((segment[rightdigit] & 0x008)) ? HIGH : LOW); //right digit segment D
digitalWrite(A12, ((segment[rightdigit] & 0x010)) ? HIGH : LOW); //right digit segment E
digitalWrite(A13, ((segment[rightdigit] & 0x020)) ? HIGH : LOW); //right digit segment F
digitalWrite(A14, ((segment[rightdigit] & 0x040)) ? HIGH : LOW); //right digit segment G
// This feature is not implemented in this hardware
/*
lefend = ((endnrvalue >> 4) & B00001111);
midend = ((endnrvalue >> 8) & B00001111);
rigend = ((endnrvalue >> 12) & B00001111);
@ -324,7 +282,10 @@ void loop()
digitalWrite(48, ((segment[rigend] & 0x010)) ? HIGH : LOW); //right end digit segment E
digitalWrite(50, ((segment[rigend] & 0x020)) ? HIGH : LOW); //right end digit segment F
digitalWrite(52, ((segment[rigend] & 0x040)) ? HIGH : LOW); //right end digit segment G
*/
// This feature is not implemented in this hardware
/*
//Read buttons
buttonvalue = 0;
// if (digitalRead(A4)){buttonvalue=5;};
@ -349,4 +310,5 @@ void loop()
//if (loop1>7){blinkr=1;};
loop1--;
};
*/
}

9
utils.h Normal file
View File

@ -0,0 +1,9 @@
#define xCAT2(a,b) a##b
#define CAT2(a,b) xCAT2(a,b)
#define xCAT3(a,b,c) a##b##c
#define CAT3(a,b,c) xCAT3(a,b,c)
#define CATPORT(a) CAT2(PORT,a)
#define CATDDR(a) CAT2(DDR,a)