Add RelayBoard project patch from OBinou.

[pub/USBasp.git] / Projects / RelayBoard / RelayBoard.c

diff --git a/Projects/RelayBoard/RelayBoard.c b/Projects/RelayBoard/RelayBoard.c
index c303417..0936c4d 100644 (file)
--- a/Projects/RelayBoard/RelayBoard.c
+++ b/Projects/RelayBoard/RelayBoard.c
@@ -63,8 +63,8 @@ void SetupHardware(void)
        USB_Init();\r
 \r
        /* Initialize Relays */\r
        USB_Init();\r
 \r
        /* Initialize Relays */\r

-       DDRC  |= ALL_RELAYS;\r
-       PORTC |= ALL_RELAYS;\r
+       DDRC  |=  ALL_RELAYS;\r
+       PORTC &= ~ALL_RELAYS;\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -95,13 +95,13 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                switch (USB_ControlRequest.wValue)\r
                                {\r
                                        case 0x303:\r
                                switch (USB_ControlRequest.wValue)\r
                                {\r
                                        case 0x303:\r

-                                               if (data[1]) PORTC |= RELAY1; else PORTC &= ~RELAY1; break;\r
+                                               if (data[1]) PORTC &= ~RELAY1; else PORTC |= RELAY1; break;\r

                                        case 0x306:\r
                                        case 0x306:\r

-                                               if (data[1]) PORTC |= RELAY2; else PORTC &= ~RELAY2; break;\r
+                                               if (data[1]) PORTC &= ~RELAY2; else PORTC |= RELAY2; break;\r

                                        case 0x309:\r
                                        case 0x309:\r

-                                               if (data[1]) PORTC |= RELAY3; else PORTC &= ~RELAY3; break;\r
+                                               if (data[1]) PORTC &= ~RELAY3; else PORTC |= RELAY3; break;\r

                                        case 0x30c:\r
                                        case 0x30c:\r

-                                               if (data[1]) PORTC |= RELAY4; else PORTC &= ~RELAY4; break;\r
+                                               if (data[1]) PORTC &= ~RELAY4; else PORTC |= RELAY4; break;\r

                                        default:\r
                                                break;\r
                                }\r
                                        default:\r
                                                break;\r
                                }\r


@@ -121,13 +121,13 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                                Endpoint_Write_Control_Stream_LE(serial, sizeof(serial));\r
                                                break;\r
                                        case 0x303:\r
                                                Endpoint_Write_Control_Stream_LE(serial, sizeof(serial));\r
                                                break;\r
                                        case 0x303:\r

-                                               if (PORTC & RELAY1) data[1]=3; else data[1]=2; break;\r
+                                               if (PORTC & RELAY1) data[1] = 2; else data[1] = 3; break;\r

                                        case 0x306:\r
                                        case 0x306:\r

-                                               if (PORTC & RELAY2) data[1]=3; else data[1]=2; break;\r
+                                               if (PORTC & RELAY2) data[1] = 2; else data[1] = 3; break;\r

                                        case 0x309:\r
                                        case 0x309:\r

-                                               if (PORTC & RELAY3) data[1]=3; else data[1]=2; break;\r
+                                               if (PORTC & RELAY3) data[1] = 2; else data[1] = 3; break;\r

                                        case 0x30c:\r
                                        case 0x30c:\r

-                                               if (PORTC & RELAY4) data[1]=3; else data[1]=2; break;\r
+                                               if (PORTC & RELAY4) data[1] = 2; else data[1] = 3; break;\r

                                        default:\r
                                                break;\r
                                }\r
                                        default:\r
                                                break;\r
                                }\r