WebSVN – HomeAutomation – Diff – /trunk/EmbeddedSoftware/AVR/module/sns_Serial/sns_Serial.c

+/* ----------------------------------------------------------------------------
+ * Inclusions
+ * --------------------------------------------------------------------------*/
 #include "sns_Serial.h"
-#ifdef sns_Serial_USEEEPROM
-#include "sns_Serial_eeprom.h"
-struct eeprom_sns_Serial EEMEM eeprom_sns_Serial =
-{
-    {
-        ///TODO: Define initialization values on the EEPROM variables here, this will generate a *.eep file that can be used to store this values to the node, can in future be done with a EEPROM module and the make-scrips. Write the values in the exact same order as the struct is defined in the *.h file.
-xAB,   // x
-x1234  // y
-    },
-  // crc, must be a correct value, but this will also be handled by the EEPROM module or make scripts
-};
-#endif
+/* ----------------------------------------------------------------------------
+ * Definitions
+ * --------------------------------------------------------------------------*/
+#define sns_Serial_DEBUG 0
+#ifndef min
+#define min(_a,_b)      ((_a)<(_b) ? (_a) : (_b))
+#endif
+#ifndef max
+#define max(_a,_b)      ((_a)>(_b) ? (_a) : (_b))
+#endif
+#ifndef lim
+#define lim(_a,_minval,_maxval)     (max(min((_a),(_maxval)),(_minval)))
+#endif
+typedef enum {
+    PARITY_NONE = 0,
+    PARITY_EVEN = 1,
+    PARITY_ODD = 2,
+} parityMode_t;
+/* ----------------------------------------------------------------------------
-// internal variables
+ * Variables
+ * --------------------------------------------------------------------------*/
 static uint32_t baudRate = 9600;
-//static uint16_t format = CAN_MODULE_ENUM_SERIAL_SERIALCONFIG_PHYSICALFORMAT_LOOPBACK;
 static uint16_t format = CAN_MODULE_ENUM_SERIAL_SERIALCONFIG_PHYSICALFORMAT_RS232;
 static uint8_t databits = 8;
 static uint8_t stopbits = 1;
-static enum {
-    PARITY_NONE = 0,
-    PARITY_EVEN = 1,
-    PARITY_ODD = 2,
-} parityMode = 1;
+static parityMode_t parityMode = PARITY_NONE;
-// filter variables
-static uint8_t dataTimeout = 0;
+static uint8_t dataTimeout = 255;
 static uint8_t packetLength = 0;
 static struct __attribute__ ((packed)) {
     uint8_t prefixLength:2;
     uint8_t suffixLength:2;
     uint8_t prefixPattern[3];
     uint8_t suffixPattern[3];
 } filter;
-// prepare a new message, in case new data is available
 static StdCan_Msg_t msg;
-#define sns_Serial_DEBUG 0
+#ifdef sns_Serial_USEEEPROM
+#include "sns_Serial_eeprom.h"
+struct eeprom_sns_Serial EEMEM eeprom_sns_Serial =
+{
+    {
+,   // baudRate
+        CAN_MODULE_ENUM_SERIAL_SERIALCONFIG_PHYSICALFORMAT_LOOPBACK,    // format
+,      // databits
-#ifndef min
+,      // stopbits
-#define min(_a,_b)      ((_a)<(_b) ? (_a) : (_b))
+        PARITY_NONE,    // parityMode
+,    // dataTimeout
+,      // packetLength
+,      // prefixLength
+,      // suffixLength
+        {0,0,0},    // prefixPattern
+        {0,0,0},    // suffixPattern
-#endif
+    },
+  // crc, must be a correct value, but this will also be handled by the EEPROM module or make scripts
+};
-#ifndef max
-#define max(_a,_b)      ((_a)>(_b) ? (_a) : (_b))
 #endif
+/* ----------------------------------------------------------------------------
-#ifndef lim
+ * Internal Functions
+ * --------------------------------------------------------------------------*/
+static uint16_t getTimeoutValue(void)
+{
+    // configurations 0-250 translate directly to milliseconds (0 means DIRECT)
+    if (dataTimeout>=0 && dataTimeout<=250) {
+        return dataTimeout;
+    }
+    // configurations 251..254 are baudrate-dependent
+    else if (dataTimeout>=251 && dataTimeout<=254) {
-#define lim(_a,_minval,_maxval)     (max(min((_a),(_maxval)),(_minval)))
+        return (uint16_t)(baudRate/(uint32_t)1000UL*((uint32_t)dataTimeout-250UL));
+    }
+    // configuration 255 means use the compiled default value
-#endif
+    else {
+        return sns_Serial_FORCE_SEND_TIME_MS;
+    }
+}
+/* ----------------------------------------------------------------------------
+ * Function Implementations
+ * --------------------------------------------------------------------------*/
 uint8_t sns_Serial_setSettings(void)
+{
     uint8_t returnval = 1;
     else
+    {
         //invalid format
 #if sns_Serial_DEBUG==1
         printf("ERROR!\n");
 #endif
         //return 0, not successful
         returnval = 0;
     }
     return returnval;
+}
-void sns_Serial_Init(void)
+void sns_Serial_Init()
+{
 #ifdef sns_Serial_USEEEPROM
-    //if (EEDATA_OK) {
+    if (EEDATA_OK) {
-    if (0) {
+    //if (0) {
 #if ((__AVR_LIBC_MAJOR__ == 1  && __AVR_LIBC_MINOR__ == 6 && __AVR_LIBC_REVISION__ >=2)||(__AVR_LIBC_MAJOR__ == 1  && __AVR_LIBC_MINOR__ > 6)||__AVR_LIBC_MAJOR__ > 1)
         baudRate = eeprom_read_dword(EEDATA32.baudRate);
 #else
 #warning This version of AVR-libc does not have support for eeprom read dword
 #endif
 #endif
         eeprom_write_word_crc(EEDATA16.format, CAN_MODULE_ENUM_SERIAL_SERIALCONFIG_PHYSICALFORMAT_LOOPBACK, WITHOUT_CRC);
         eeprom_write_byte_crc(EEDATA.databits, 8, WITHOUT_CRC);
         eeprom_write_byte_crc(EEDATA.stopbits, 1, WITHOUT_CRC);
         eeprom_write_byte_crc(EEDATA.parityMode, PARITY_NONE, WITHOUT_CRC);
-        eeprom_write_byte_crc(EEDATA.dataTimeout, 0, WITHOUT_CRC);
+        eeprom_write_byte_crc(EEDATA.dataTimeout, 255, WITHOUT_CRC);
         eeprom_write_byte_crc(EEDATA.packetLength, 8, WITHOUT_CRC);
         eeprom_write_byte_crc(EEDATA.prefixLength, 0, WITHOUT_CRC);
         eeprom_write_byte_crc(EEDATA.suffixLength, 0, WITHOUT_CRC);
         eeprom_write_byte_crc(EEDATA.prefixPattern[0], 0, WITHOUT_CRC);
         eeprom_write_byte_crc(EEDATA.prefixPattern[1], 0, WITHOUT_CRC);
     msg.Length = 0; // no data so far
     //gpio_set_pin(sns_Serial_TXEN);            // enable TX
     //uart_putc('7');
+}
 void sns_Serial_Process(void)
+{
     StdCan_Set_class(msg.Header, CAN_MODULE_CLASS_SNS);
     StdCan_Set_direction(msg.Header, DIRECTIONFLAG_TO_OWNER);
+    {
         // ask uart driver for more data
         unsigned int data = uart_getc();
         // character is contained in LSB
         unsigned char c = (unsigned char)(data & 0x00FF);
         // status is contained in MSB
         status = (unsigned char)((data & 0xFF00) >> 8);
         // status == 0 means we just received a new char
         if (status == 0)
             printf("RX\n");
 #endif
             // insert it into the message
             msg.Data[(uint8_t)msg.Length] = c;
             msg.Length++;
+            uint16_t timeout;
-#if sns_Serial_FORCE_SEND_TIME_MS > 0
+            if ((timeout = getTimeoutValue()) != 0) {
-            Timer_SetTimeout(sns_Serial_FORCE_SEND_TIMER, sns_Serial_FORCE_SEND_TIME_MS , TimerTypeOneShot, 0);
+                Timer_SetTimeout(sns_Serial_FORCE_SEND_TIMER, timeout , TimerTypeOneShot, 0);
-#endif
+            }
+        }
     // keep going until max data length reached, or until uart RXBUF is empty
     } while (status == 0 && msg.Length < packetLength);
     // check if force send or send-frame full
-    if ((Timer_Expired(sns_Serial_FORCE_SEND_TIMER) && msg.Length>0) || msg.Length == packetLength || (sns_Serial_FORCE_SEND_TIME_MS == 0 && msg.Length>0))
+    if ((Timer_Expired(sns_Serial_FORCE_SEND_TIMER) && msg.Length>0) || msg.Length==packetLength || (getTimeoutValue()==0 && msg.Length>0))
+    {
         // transmit this chunk of data (max 8 chars)
         while(StdCan_Put(&msg) != StdCan_Ret_OK);
         msg.Length = 0; // no data so far
+    }
 }
 void sns_Serial_HandleMessage(StdCan_Msg_t *rxMsg)
 {
     if (    StdCan_Ret_class(rxMsg->Header) == CAN_MODULE_CLASS_SNS &&
         StdCan_Ret_direction(rxMsg->Header) == DIRECTIONFLAG_FROM_OWNER &&
         rxMsg->Header.ModuleType == CAN_MODULE_TYPE_SNS_SERIAL &&
         rxMsg->Header.ModuleId == sns_Serial_ID)
+    {
                 break;
+        }
+    }
+}
 void sns_Serial_List(uint8_t ModuleSequenceNumber)
+{
     StdCan_Msg_t txMsg;

Subversion Repositories HomeAutomation

(root)/trunk/EmbeddedSoftware/AVR/module/sns_Serial/sns_Serial.c – Rev 1764 → 1769