Simple counter (in seconds)

4 files changed, 136 insertions, 30 deletions

diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..b8ecd2e
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,5 @@
+BasedOnStyle: Webkit
+IndentWidth: 2
+BreakBeforeBraces: Allman
+AllowShortIfStatementsOnASingleLine: false
+ColumnLimit: 120
diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py
new file mode 100644
index 0000000..42834fb
--- /dev/null
+++ b/.ycm_extra_conf.py
@@ -0,0 +1,26 @@
+import os
+import ycm_core
+
+def FlagsForFile( filename, **kwargs ):
+  return {
+    'flags': [
+      '-Wall',
+      '-Wextra',
+      '-Werror',
+      '-Wno-long-long',
+      '-Wno-variadic-macros',
+      '-fexceptions',
+      '-ferror-limit=10000',
+      '-DNDEBUG',
+      '-std=c99',
+      '-x', 'c',
+      '-D_GNU_SOURCE',
+      '-D__AVR_ATtiny85__',
+      '-D__AVR__',
+      '-I.',
+      '-I', '/usr/avr/include/'
+    ],
+    'do_cache': True,
+  }
+
+# vim:set et sw=2 ts=2 tw=120:
diff --git a/Makefile b/Makefile
index e63d2c0..e81f5a1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,17 @@
-FLAGS=-Wall -I/usr/lib/gcc/avr/6.3.0/plugin/include/ -I/usr/avr/include -mmcu=attiny13 -O3 -DF_CPU=1200000 
+FLAGS=-Wall -O5 -Werror
+FLAGS+=-mmcu=attiny85
+FLAGS+=-D__AVR_ATtiny85__=1
+# FLAGS+=-DF_CPU=120000UL
+# FLAGS+=-DF_CPU=960000UL
+FLAGS+=-DF_CPU=800000UL
+FLAGS+=-I inc/int/
+FLAGS+=-I/usr/lib/gcc/avr/6.3.0/plugin/include/
+FLAGS+=-I/usr/avr/include
+
+program: all
+        avrdude -V -B100 -p t85 -c avrisp2 -P usb -U flash:w:main.hex
 
 all:
-        avr-gcc $(FLAGS) -o main.elf main.c
+        avr-gcc $(FLAGS) -o main.elf main.c inc/int/dcf77.c
         avr-objcopy -j .text -j .data -O ihex main.elf main.hex
 
-program: all
-        avrdude -B100 -p t85 -c avrisp2 -P usb -U flash:w:main.hex
diff --git a/main.c b/main.c
index 2b5753d..2dd8058 100644
--- a/main.c
+++ b/main.c
@@ -1,15 +1,12 @@
 // vim:set et sw=2 ts=2 tw=120:
-#define __AVR_ATtiny85__
+#include <stdint.h>
+#include <avr/io.h>
 #include <avr/interrupt.h>
-#include <avr/io.h> // (1)
+#include <util/delay.h>
 
-#ifndef F_CPU
-#warning "F_CPU war noch nicht definiert, wird nun mit 3686400 definiert"
-#define F_CPU 1000000UL
-#endif
+#include "inc/int/dcf77.h"
 
-#include <stdint.h>
-#include <util/delay.h>
+#define CTC_MATCH_OVERFLOW ((F_CPU / 1000) / 8)
 
 // set bit
 static inline void BIT_SET(volatile uint8_t* target, uint8_t bit) __attribute__((always_inline));
@@ -19,52 +16,121 @@ static inline void BIT_SET(volatile uint8_t* target, uint8_t bit) { *target |= (
 static inline void BIT_CLEAR(volatile uint8_t* target, uint8_t bit) __attribute__((always_inline));
 static inline void BIT_CLEAR(volatile uint8_t* target, uint8_t bit) { *target &= ~(1 << bit); };
 
+
+/*
+ * 
+ * PB2        : connected to ShiftClock on Port 11
+ * PB3        : connected to MemoryClock on Port 12 (shows content of memory)
+ * PB4 (PIN3) : connected to SERIAL_IN on pin 14
+ *
+ */
+
 void pulse_sck()
 {
   PORTB |= (1 << PB2);
-  _delay_ms(10); // Eine Sekunde +/-1/10000 Sekunde warten...
   PORTB ^= (1 << PB2);
+
 }
 
 void print_data(uint16_t data)
 {
-  BIT_CLEAR(&PORTB, PB4);
-  _delay_ms(50);
-  BIT_SET(&PORTB, PB4);
+  //BIT_CLEAR(&PORTB, PB4);
+  //BIT_SET(&PORTB, PB4);
 
   for (uint16_t i = 0; i < 16; i++)
   {
-    data & 0x1 << i ? BIT_SET(&PORTB, PB4) : BIT_CLEAR(&PORTB, PB4);
+    data & 0x1 << i
+      ? BIT_SET(&PORTB, PB4)
+      : BIT_CLEAR(&PORTB, PB4);
     pulse_sck();
   }
-
+  //BIT_CLEAR(&PORTB, PB4);
+  // pulse_sck();
   BIT_CLEAR(&PORTB, PB3);
-  _delay_ms(50);
   BIT_SET(&PORTB, PB3);
+
 }
 
 int main(void)
 {
-  DDRB = 0xFF;
 
   BIT_CLEAR(&PORTB, PB5);
-  _delay_ms(200);
+  _delay_ms(20);
   BIT_SET(&PORTB, PB5);
   BIT_CLEAR(&PORTB, PB5);
-  _delay_ms(200);
+  _delay_ms(20);
   BIT_SET(&PORTB, PB5);
 
+
+
+  // make all pins output pins...
+  DDRB  = 0xFF;
+  DDRB &= ~(1 << PB0); // makes PB0 an input pin (INT0)
+  PORTB |= (1 << PB0); // activate input resistor
+
+  // activate dcf77-receiver...
+  PORTB &=  (1 << PB1); // sets PB1 to low
+  _delay_ms(20);
+  PORTB &= ~(1 << PB1); // sets PB1 to low
+
+
+  cli();
+
+  /*
+  GIMSK |= (1<<INT0); // External Interrupt Request 0 Enable
+  GIMSK |= (1<<PCIE); // Pin Change Interrupt Enable
+
+  // MCU Control Register (controls CPU-behaviours like interrupts & sleepmode)
+  MCUCR |= ~(1<<ISC01) | (1<<ISC00); // any logical change generates interrupt
+  PCMSK |= (1<<PCINT0);
+  // INT0_CONTROL = INT0_RISING_EDGE; // going to toggle int0-behaviour
+  */
+
+  TCCR0A |= (1 << WGM01);              // CTC mode
+  // TCCR0B |= (1 << CS00);
+  TCCR0B |= (1 << CS01);               // Prescaler 8
+  // TCCR0B |= (1 << CS02);               // Prescaler 256
+  // OCR0A  |= (1 << WGM01);              // CTC mode
+
+  // OCR0A   = 149;
+  OCR0A   = 124;
+  // OCR0A   = CTC_MATCH_OVERFLOW;
+  TIMSK  |= (1 << OCIE0A);             // if you want interrupt
+
+  sei();
+
   while (1)
-  { // Endlosschleife
+  {
+    // uint16_t t = 1;
+    // for (uint16_t i=0; i<16; i++)
+    // {
+      print_data(t_current.s);
+      // t = t<<1;
+    // }
+    // print_data(t_current.s);
 
-    uint16_t data = 1;
-    for (; data < UINT16_MAX; data++)
-    {
-      // clear register (reset)
-      print_data(data | data << 6);
-    }
 
-    _delay_ms(1000); // Eine Sekunde +/-1/10000 Sekunde warten...
+    /*
+      print_data(0xFFFF);
+      _delay_ms(1000);
+      print_data(0x0000);
+      _delay_ms(1000);
+    */
   }
   return 0;
 }
+
+
+/*
+for(uint16_t hour=0; hour<24; hour++)
+  for(uint16_t minute=0; minute<60; minute++)
+    for (uint16_t second = 1; second < 60; second++)
+    {
+      // clear register (reset)
+      // print_data(hour<< 12 | minute << 6 | second);
+      // print_data((int64_t) dcf77);
+      // dcf77[dcf77_bit].bit == 1
+      //   ? print_data(0xFFFF)
+      //   : print_data(0x0000);
+    }A
+*/