WebSVN - Projects - Diff - Rev 465 and 466

  * - verifiy correctness of values
  * - clean up code :)
  */
 #if !(ALLCHARSDEBUG|(WRITECHARS != -1))
-// data structs not needed for character flashin
+// data structs not needed for character flashing
 #include "mk-data-structs.h"
 /* ##########################################################################
 volatile uint8_t last_RC_Quality = 255;
 // 16bit should be enough, normal LiPos don't last that long
 volatile uint16_t uptime = 0;
-volatile uint16_t timer = 0;
-volatile uint8_t short_timer = 0;
+volatile uint16_t timer = 0;
 // remember last time data was received
  * STROM TEST
  * ##########################################################################*/
 #define INT0_HIGH                       PORTD |=  (1 << PD2);
 #define INT0_LOW                        PORTD &= ~(1 << PD2);
-void SpiMasterInit(void)
 void SpiMasterInit(void) {
-        volatile char IOReg;
+    volatile char IOReg;
-        // set PB4(/SS), PB5(MOSI), PB7(SCK) as output
+    // set PB4(/SS), PB5(MOSI), PB7(SCK) as output
-        DDRB  = (1<<PB4)|(1<<PB5)|(1<<PB7);
+    DDRB = (1 << PB4) | (1 << PB5) | (1 << PB7);
-                PORTB |= (1 << PB4); // pullup SS
+    PORTB |= (1 << PB4); // pullup SS
-        //sei(); // we do it later
+    //sei(); // we do it later
+}
 volatile size_t icnt = 0;
 volatile unsigned char * iptr;
-volatile unsigned char spi_cmd[5];
+volatile unsigned char spi_cmd_buffer[5];
 volatile uint8_t spi_ready = 1;
+int16_t ampere = 0;
-int16_t ampere = 0;
+/**
-ISR(SPI_STC_vect)
-{
+ * SPI interrupt handler
-    /* Empfangenes Byte im Puffer ablegen. */
+ */
-    *iptr++ = SPDR;
+ISR(SPI_STC_vect) {
-    /* Zähler dekrementieren. */
-    icnt--;
+    *iptr++ = SPDR; // safe received byte to buffer
-    /* Falls Zähler noch nicht 0 ist... */
-    if (icnt) {
+    icnt--; // dec length
-                ///_delay_ms(1);
+    if (icnt) {
-        /* ...nächstes Byte senden. */
-        //SPDR = *iptr;
-                spi_ready = 1;
+        //SPDR = *iptr; // send next byte
-    }
+        spi_ready = 1; // we _should_ send later because the slave needs more time
-    else {
+    } else {
-        /* ...andernfalls Interrupt Modus deaktivieren. */
-        SPCR &= ~_BV(SPIE);
-                INT0_HIGH
+        SPCR &= ~_BV(SPIE); // deactivate interrupt
-                //_delay_ms(1);
+        INT0_HIGH // transfer is done, slave does not need to listen
+    }
-    }
+}
-}
+/**
  * check if SPI transfer is still busy
-int TransferIsBusy(void)
+ */
+int TransferIsBusy(void) {
+    return SPCR & _BV(SPIE);
+}
-{
+/**
-    return SPCR & _BV(SPIE);
+ * start a new transfer of <data> with length <len>
-}
+ */
-void StartTransfer(unsigned char *data, size_t len)
+void StartTransfer(unsigned char *data, size_t len) {
     INT0_LOW // /SS LOW ^= SS HIGH ^= slave should listen
-        INT0_LOW
-    /* Interrupt Datenpointer und Zähler setzen. */
-    iptr = data;
+    // set up pointer and length for interrupt handler
-    icnt = len;
+    iptr = data;
     icnt = len;
     /* SPI Interrupt aktivieren und Transfer anstossen. */
-    SPCR |= _BV(SPIE);
+    SPCR |= _BV(SPIE); // enable spi interrupt
-    SPDR = *iptr;
     SPDR = *iptr; // start transfer by first bye
+}
 /* ##########################################################################
- * / STROM TEST END
+/* ##########################################################################
- * ##########################################################################*/
+ * / STROM TEST END
  * ##########################################################################*/
 /**
  * timer kicks in every 1000uS ^= 1ms
  */
 ISR(TIMER0_OVF_vect) {
     OCR0 = 15; // preload
     if (!timer--) {
         uptime++;
     uint8_t cellnum = 0;
     if (CELL_NUM == -1) {
         write_ascii_string(2, 6, "Guessing Number of Cells");
         do {
             cellnum++;
-        } while (UBat > ((cellnum * CELL_VOLT_MAX) + 15));
+        } while (UBat > ((cellnum * CELL_VOLT_MAX) + 23));
     } else {
         cellnum = CELL_NUM;
+    }
     min_voltage = cellnum * CELL_VOLT_MIN;
     max_voltage = cellnum * CELL_VOLT_MAX;
 #endif
+    while (1) {
-    while (1) {
+        // in case SPI is ready and there is nothing to send right now
-                if (!icnt && spi_ready) {
+        if (!icnt && spi_ready) {
-                        short_timer = 0;
+            // correct transfer ends with d (done)
-                        ampere = spi_cmd[1] << 8;
-                        ampere |= spi_cmd[2];
+            if (spi_cmd_buffer[0] == 'd') {
-                        //write_ascii_char(7+4*30, spi_cmd[0]);
+                ampere = spi_cmd_buffer[1] << 8;
                 ampere |= spi_cmd_buffer[2];
-                        if (spi_cmd[0] == 'd') {
+                // update flags
+                COSD_FLAGS2 |= COSD_FLAG_STROMREC;
-                                COSD_FLAGS2 |= COSD_FLAG_STROMREC;
+                //write_ascii_char(8+4*30, 'v'); // valid
-                                //write_ascii_char(8+4*30, 'v'); // valid
+            } else {
-                        } else {
+                // update flags
-                                COSD_FLAGS2 &= ~COSD_FLAG_STROMREC;
+                COSD_FLAGS2 &= ~COSD_FLAG_STROMREC;
-                                //write_ascii_char(8+4*30, 'i'); // invalid
+                //write_ascii_char(8+4*30, 'i'); // invalid
-                        }
+            }
-                        spi_cmd[0] = 'A';
+            spi_cmd_buffer[0] = 'A';
-                        spi_cmd[1] = 'B';
+            spi_cmd_buffer[1] = 'B';
-                        spi_cmd[2] = 'C';
+            spi_cmd_buffer[2] = 'C';
-                        StartTransfer((unsigned char*)spi_cmd, 3);
+            StartTransfer((unsigned char*) spi_cmd_buffer, 3);
+        }
         if (rxd_buffer_locked) {

Subversion Repositories Projects

(root)/C-OSD/trunk/main.c - Rev 465 → 466