meydin/info.linkwitz.ha_pcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP Version read to deploy

Browse Source
This commit is contained in:
Meydin87
2022-09-21 07:36:42 +02:00
parent f6425c35d8
commit 998ec66f0f
33 changed files with 5396 additions and 1894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
Software/UPSoftware/UPSoftware.ino
View File

@@ -30,8 +30,6 @@ int PinCount = 8;
PinState PinPD2[8];
byte DeviceId[2];
void setup() {
SPI.begin();
@@ -80,24 +78,7 @@ void setup() {
SendSerialPackage();
}
byte CircularShift(byte b)
{
return (b << 1) | (b >> 7 & 1);
}
uint32_t GetDeviceId(uint32_t canFrameId)
{
return canFrameId & 0xFFFF;
}
uint32_t CreateCanId(uint32_t commandId)
{
return ((commandId & 0xFFF) * 0x10000) | ( DeviceId[0] << 8) | (DeviceId[1]) | CAN_EFF_FLAG;
}
bool debugFlag = false;
void loop()
{
for (int i = 0; i <= PinCount - 1; i++)
@@ -108,32 +89,33 @@ void loop()
if (mcp2515.readMessage(&_frame) == MCP2515::ERROR_OK)
{
debugFlag ^= true;
int meyPinId = _frame.data[0];
bool state = _frame.data[1] > 0;
PinState *adressedPin;
for (int i = 0; i <= PinCount - 1; i++)
if (PinPD2[i].meyPinId == meyPinId)
{
adressedPin = &PinPD2[i];
break;
}
if (adressedPin != NULL)
if (GetDeviceId(_frame.can_id) == GetMyDeviceId())
{
if (adressedPin->is_input == true)
int meyPinId = _frame.data[0];
bool state = _frame.data[1] > 0;
PinState *adressedPin;
for (int i = 0; i <= PinCount - 1; i++)
if (PinPD2[i].meyPinId == meyPinId)
{
adressedPin = &PinPD2[i];
break;
}
if (adressedPin != NULL)
{
pinMode(adressedPin->pin_id, OUTPUT);
adressedPin->is_input = false;
if (adressedPin->is_input == true)
{
pinMode(adressedPin->pin_id, OUTPUT);
adressedPin->is_input = false;
}
adressedPin->pin_state = state;
digitalWrite(adressedPin->pin_id, state);
}
adressedPin->pin_state = state;
digitalWrite(adressedPin->pin_id, state);
}
}
delay(20);
}
@@ -151,6 +133,7 @@ void SendSerialPackage()
mcp2515.sendMessage(MCP2515::TXB1, &_frame);
}
void SendSwitchedTriggeredCanPackage(byte pinId, int state)
{
_frame.can_id = CreateCanId(0x050);
@@ -194,20 +177,46 @@ bool ReadPin(PinState * state)
return digitalRead(state->pin_id);
}
byte GetDeviceIdLow(){
return (SIGROW.SERNUM0 ^
CircularShift(SIGROW.SERNUM2) << 1 ^
CircularShift( CircularShift(SIGROW.SERNUM4)) ^
CircularShift( CircularShift( CircularShift(SIGROW.SERNUM6))) ^
CircularShift( CircularShift( CircularShift( CircularShift(SIGROW.SERNUM8)))));
byte CircularShift(byte b)
{
return (b << 1) | (b >> 7 & 1);
}
byte GetDeviceIdHigh(){
uint32_t GetDeviceId(uint32_t canFrameId)
{
return canFrameId & 0xFFFF;
}
uint32_t GetPackageType(uint32_t canFrameId)
{
return (canFrameId / 0x10000) & 0xFFF;
}
uint32_t CreateCanId(uint32_t commandId)
{
return ((commandId & 0xFFF) * 0x10000) | ( DeviceId[0] << 8) | (DeviceId[1]) | CAN_EFF_FLAG;
}
uint32_t GetMyDeviceId()
{
return ( DeviceId[0] << 8) | (DeviceId[1]);
}
byte GetDeviceIdLow() {
return (SIGROW.SERNUM0 ^
CircularShift(SIGROW.SERNUM2) << 1 ^
CircularShift( CircularShift(SIGROW.SERNUM4)) ^
CircularShift( CircularShift( CircularShift(SIGROW.SERNUM6))) ^
CircularShift( CircularShift( CircularShift( CircularShift(SIGROW.SERNUM8)))));
}
byte GetDeviceIdHigh() {
return (SIGROW.SERNUM1 ^
CircularShift(SIGROW.SERNUM3) << 1 ^
CircularShift( CircularShift(SIGROW.SERNUM5)) ^
CircularShift( CircularShift( CircularShift(SIGROW.SERNUM7))) ^
CircularShift( CircularShift( CircularShift( CircularShift(SIGROW.SERNUM9)))));
CircularShift(SIGROW.SERNUM3) << 1 ^
CircularShift( CircularShift(SIGROW.SERNUM5)) ^
CircularShift( CircularShift( CircularShift(SIGROW.SERNUM7))) ^
CircularShift( CircularShift( CircularShift( CircularShift(SIGROW.SERNUM9)))));
}
bool CheckPinStatus(PinState * state)