raising and failing edge capture on TIM4

diff --git a/drivers/tsensor.c b/drivers/tsensor.c
index 499fa45..4f11ec2 100644 (file)
--- a/drivers/tsensor.c
+++ b/drivers/tsensor.c
@@ -22,40 +22,57 @@
 
 #include <drivers/tsensor.h>
 
-/* void * update_handler() {
+#define PRESCALER 36000 // 1 kHz
 
-       printf("HERE!");
-       rclrbit(TIM4_SR1, 0);
-} */
+ void * update_handler() {
 
-void tsensor_init( ) {
+       if(rchkbit(TIM4_SR1, 1)) {
 
-       int prescaler = 31; 
+                       printf("RISING EDGE CAUGHT\n");
+                       printf("CCR1: %p\n", *TIM4_CCR1);
+       }
+       
+       if(rchkbit(TIM4_SR1, 2)) {
+                       printf("FALLING EDGE CAUGHT\n");
+                       printf("CCR2: %p\n", *TIM4_CCR2);
+       }
+       
 
-       rsetbit(RCC_APB2ENR, 3); // GPIOB enable
-       rsetbit(RCC_APB1ENR, 2); // TIM4 enable
-       rsetbitsfrom(TIM4_CR1, 5, 0x00); // edge-aligned mode
-       rclrbit(TIM4_CR1, 4); // upcounter (clrbit!)
+       rclrbit(TIM4_SR1, 1);
+       rclrbit(TIM4_SR1, 0);
+       rclrbit(TIM4_SR1, 2); // 
+       rclrbit(TIM4_SR1, 9); // OF
+       rclrbit(TIM4_SR1, 10); // OF
+       rclrbit(TIM4_SR1, 6);
+       // TODO clear overflow tag
+} 
 
-       rwrite(TIM4_PSC, 0xFFFF); // 1 MHz: 23
-       rwrite(TIM4_ARR, 0xAB9); // preload register
+void tsensor_output(uint16_t preload, uint16_t compare/*, uint16_t pulses */) {
 
+       /* GPIO AND CLOCK */
+       rsetbit(RCC_APB2ENR, 3); // GPIOB enable
        rwrite(GPIOB_CRL, 0x4A444444); // PB6 for Channel 1 TIM4 alternate 
+       rsetbit(RCC_APB1ENR, 2); // TIM4 enable
+       
+       rsetbitsfrom(TIM4_CR1, 5, 0x00); // edge-aligned mode
+       rclrbit(TIM4_CR1, 4); // upcounter (clrbit! not needed to set)
 
-       rwrite(TIM4_CCR1, 0x55C); // half of ARR
-       rwrite(TIM4_RCR, 0x0F); // repeat
-       rsetbit(TIM4_EGR, 0); // update generation
+       rwrite(TIM4_PSC, PRESCALER - 1); // 1 MHz
+       rwrite(TIM4_ARR, preload); // preload 
+       rwrite(TIM4_CCR1, compare); // compare
+       //rwrite(TIM4_RCR, pulses - 1); /* repeat ONLY IN ADVANCED TIMER */
+       
+       rsetbit(TIM4_EGR, 0); // update generation  
        
+       rsetbit(TIM4_CR1, 3); // one pulse mode
        rsetbitsfrom(TIM4_CCMR1, 4, 0x7); // PWM mode 1
        
        //rsetbit(TIM4_CCMR1, 3); // preload enable
        //rsetbit(TIM4_CR1, 7); // buffered
 
-       //rsetbit(TIM4_CR1, 3); // one pulse mode
 
        rsetbit(TIM4_CCER, 0); // enable output channel 1
-//     rsetbit(TIM4_BDTR, 15); // main output 
-       rsetbit(TIM4_CR1, 0);
+       rsetbit(TIM4_CR1, 0); // start counter
 
        /* INTERRUPTS */        
        //ivt_set_gate(41, update_handler, 0);
@@ -64,4 +81,47 @@ void tsensor_init( ) {
        //rsetbit(NVIC_ISER0, 25); // interupt 41 - 32
 }
 
+void tsensor_input(uint16_t preload) {
 
+       uint16_t timestamp;     
+       /* GPIO AND CLOCK */
+       rsetbit(RCC_APB2ENR, 3); // GPIOB enable
+       rwrite(GPIOB_CRL, 0x44444444); // Input floating (default state)
+       rsetbit(RCC_APB1ENR, 2); // TIM4 enable
+       
+       //rsetbitsfrom(TIM4_CR1, 5, 0x00); // edge-aligned mode
+       //rclrbit(TIM4_CR1, 4); // upcounter (clrbit! not needed to set)
+
+       rwrite(TIM4_PSC, PRESCALER - 1); // 1 MHz
+       rwrite(TIM4_ARR, preload); // preload 
+       
+       rsetbit(TIM4_CCMR1, 0); // input on TI1
+       rsetbit(TIM4_CCMR1, 9); // another input TI2
+       rsetbit(TIM4_CCER, 5); // other polarity, inverted
+
+       /* TODO: reg funct */
+       rsetbit(TIM4_SMCR, 4); // 101
+       rsetbit(TIM4_SMCR, 6); // 101
+       
+
+
+       // rsetbit(TIM4_SMCR, 2); // RESET rising edge triggers counter and generates update
+       rsetbit(TIM4_SMCR, 2); // 110
+       rsetbit(TIM4_SMCR, 1); // 110
+
+       rsetbit(TIM4_CR1, 3); // one pulse mode // NOTE: RESET after finised preload
+       // will catch multiple signal... can set fram
+       
+       rsetbit(TIM4_CCER, 0); // enable capture channel 1 (changed pos)
+       rsetbit(TIM4_CCER, 4); // enable capture channel 2 
+       /* Caught on rising edge, no need to change*/
+       /* Clear capture event flag */
+//     rsetbit(TIM4_CR1, 0); // RESET with no trigger mode start
+
+       // enable capture channel 1 interrupt
+       rsetbit(TIM4_DIER, 1);
+       rsetbit(TIM4_DIER, 2);
+        ivt_set_gate(46, update_handler, 0);
+       rsetbit(NVIC_ISER0, 30);
+
+}

diff --git a/include/drivers/tsensor.h b/include/drivers/tsensor.h
index 64a5e94..d22c068 100644 (file)
--- a/include/drivers/tsensor.h
+++ b/include/drivers/tsensor.h
@@ -1,2 +1,3 @@
-extern void tsensor_init();
+extern void tsensor_output(uint16_t, uint16_t/* , uint16_t */);
+extern void tsensor_input(uint16_t);
 

diff --git a/include/sys/mmap.h b/include/sys/mmap.h
index ee0da1e..1c36be1 100644 (file)
--- a/include/sys/mmap.h
+++ b/include/sys/mmap.h
@@ -115,6 +115,7 @@
 #define TIM4_EGR MEM_ADDR(0x40000814)
 #define TIM4_SR1 MEM_ADDR(0x40000810)
 #define TIM4_CCR1 MEM_ADDR(0x40000834)
+#define TIM4_CCR2 MEM_ADDR(0x40000838)
 #define TIM4_PSC MEM_ADDR(0x40000828)
 #define TIM4_SMCR MEM_ADDR(0x40000808)
 #define TIM4_CCER MEM_ADDR(0x40000820)

diff --git a/main.c b/main.c
index 38f9a37..ff45998 100644 (file)
--- a/main.c
+++ b/main.c
@@ -39,9 +39,7 @@ void main()
        uart_init();
 //     cputs("ROBSYS LOADING...\n");
        systick_init();
-       led_init();
-       rtc_init();
-       tsensor_init();
+//     tsensor_output(0xFFFF, 0x7FFF);
 
        init_printf(NULL, putc);
        // SPEED_TEST
@@ -64,6 +62,11 @@ void main()
        sysinfo();
 
 
+       tsensor_input(5000);
+
+       led_init();
+       rtc_init();
+
 //     tm1637_init();
 //     tm1637_start();
 

diff --git a/term.c b/term.c
index 9be55e4..7ce25ce 100644 (file)
--- a/term.c
+++ b/term.c
@@ -139,7 +139,7 @@ void terminal() {
 
 
        char *buf;
-        cputs("WELCOME TO ROBSYS!\n");
+        //cputs("WELCOME TO ROBSYS!\n");
  
          while (1) {
                  buf = readline("root# ");