diff --git a/Modules/Nano/RCnano/RCnano.ino b/Modules/Nano/RCnano/RCnano.ino index 004cd7c8..c0ab1a81 100644 --- a/Modules/Nano/RCnano/RCnano.ino +++ b/Modules/Nano/RCnano/RCnano.ino @@ -15,12 +15,11 @@ #include "PCA95x5_RC.h" // modified from https://github.com/hideakitai/PCA95x5 // rate control with nano -# define InoDescription "RCnano : 25-Jan-2024" -const uint16_t InoID = 25014; // change to send defaults to eeprom, ddmmy, no leading 0 +# define InoDescription "RCnano : 09-Jan-2024" +const uint16_t InoID = 9014; // change to send defaults to eeprom, ddmmy, no leading 0 const uint8_t InoType = 2; // 0 - Teensy AutoSteer, 1 - Teensy Rate, 2 - Nano Rate, 3 - Nano SwitchBox, 4 - ESP Rate #define MaxProductCount 2 -#define NC 0xFF // Pin are not connected struct ModuleConfig { diff --git a/Modules/Nano/RCnano/RCnano.vcxproj b/Modules/Nano/RCnano/RCnano.vcxproj index a69ddb7f..3bd3921c 100644 --- a/Modules/Nano/RCnano/RCnano.vcxproj +++ b/Modules/Nano/RCnano/RCnano.vcxproj @@ -165,7 +165,7 @@ gnu11 - $(ProjectDir)..\..\..\..\..\..\..\..\..\program files\microsoft visual studio\2022\community\common7\ide\extensions\osqpjdds.xje\Micro Platforms\default\vm-intelli-pre.h;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\Temp\VMBuilds\RCnano\nano_atmega328old\Debug\.vmintelli\e19cb606e213da4d9d21600d75253b96\vm-intelli-gcc-defines.h;$(ProjectDir)..\..\..\..\..\..\..\..\..\program files\microsoft visual studio\2022\community\common7\ide\extensions\osqpjdds.xje\Micro Platforms\default\vm-intelli-post.h;$(ProjectDir)__vm\.RCnano.vsarduino.h;%(ForcedIncludeFiles) + $(ProjectDir)..\..\..\..\..\..\..\..\..\program files\microsoft visual studio\2022\community\common7\ide\extensions\k5efmrr3.kil\Micro Platforms\default\vm-intelli-pre.h;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\Temp\VMBuilds\RCnano\nano_atmega328old\Debug\.vmintelli\0e5dc040bf83638b37e9b4f44d8f0d4f\vm-intelli-gcc-defines.h;$(ProjectDir)..\..\..\..\..\..\..\..\..\program files\microsoft visual studio\2022\community\common7\ide\extensions\k5efmrr3.kil\Micro Platforms\default\vm-intelli-post.h;$(ProjectDir)__vm\.RCnano.vsarduino.h;%(ForcedIncludeFiles) true true _VMICRO_INTELLISENSE;__AVR_atmega328p__;__AVR_ATmega328P__;__AVR_ATmega328p__;F_CPU=16000000L;ARDUINO=108019;ARDUINO_AVR_NANO;ARDUINO_ARCH_AVR;%(PreprocessorDefinitions) diff --git a/Modules/Nano/RCnano/Relays.ino b/Modules/Nano/RCnano/Relays.ino index bb2d0e46..380ff7b1 100644 --- a/Modules/Nano/RCnano/Relays.ino +++ b/Modules/Nano/RCnano/Relays.ino @@ -116,7 +116,7 @@ void CheckRelays() if (j < 1) Rlys = NewLo; else Rlys = NewHi; for (int i = 0; i < 8; i++) { - if (MDL.RelayPins[i + j * 8] < NC) // check if relay is enabled + if (MDL.RelayPins[i + j * 8] > 1) // check if relay is enabled { if (bitRead(Rlys, i)) digitalWrite(MDL.RelayPins[i + j * 8], MDL.RelayOnSignal); else digitalWrite(MDL.RelayPins[i + j * 8], !MDL.RelayOnSignal); } diff --git a/Modules/Nano/RCnano/__vm/Compile.vmps.xml b/Modules/Nano/RCnano/__vm/Compile.vmps.xml index 9158430e..1089853f 100644 --- a/Modules/Nano/RCnano/__vm/Compile.vmps.xml +++ b/Modules/Nano/RCnano/__vm/Compile.vmps.xml @@ -1,8 +1,8 @@ - + - +