From 29d4c86ad8b78d96c1776f0f9f1685d6d1eb945f Mon Sep 17 00:00:00 2001 From: "Michael D. M. Dryden" Date: Fri, 5 Feb 2016 12:53:58 -0500 Subject: [PATCH 1/6] Move shutter controls to experiment. --- DSTAT/src/experiment.c | 19 +++++++++++++++++++ DSTAT/src/main.c | 19 ------------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/DSTAT/src/experiment.c b/DSTAT/src/experiment.c index 86db848..e9781b9 100644 --- a/DSTAT/src/experiment.c +++ b/DSTAT/src/experiment.c @@ -19,6 +19,7 @@ #include "settings.h" #include "tcs.h" #include "config/conf_board.h" +#include "shutter.h" //Public variable definitions uint16_t g_gain = POT_GAIN_30k; @@ -64,6 +65,7 @@ void experiment_handler(char command){ static uint16_t pct1, pct2; uint16_t tcs_data[] = {0,0,0,0}; uint16_t tcs_data1[] = {0,0,0,0}; + double p6; switch (command){ case 'A': //ADS Buffer/rate/PGA values from ads1255.h @@ -173,6 +175,23 @@ void experiment_handler(char command){ break; + case 'Z': //Shutter sync + scanf("%lg",&p6); + shutter_cont(p6); + break; + + case 'z': + shutter_cont_stop(); + break; + + case '1': + shutter_close(); + break; + + case '2': + shutter_open(); + break; + default: printf("#ERR: Command %c not recognized\n\r", command); } diff --git a/DSTAT/src/main.c b/DSTAT/src/main.c index 92089f1..d54995e 100644 --- a/DSTAT/src/main.c +++ b/DSTAT/src/main.c @@ -24,8 +24,6 @@ int8_t command_handler(char command){ * Calls functions in * @param command Command character input. */ - - double p1; switch (command){ case 'E': //Experiment options @@ -47,23 +45,6 @@ int8_t command_handler(char command){ printf("T%u.%u.%u.%u\n\r", tcs_data[0], tcs_data[1], tcs_data[2], tcs_data[3]); } break; - - case 'Z': //Test shutter - scanf("%lg",&p1); - shutter_cont(p1); - break; - - case 'z': - shutter_cont_stop(); - break; - - case '1': - shutter_close(); - break; - - case '2': - shutter_open(); - break; case 'V': //check version printf("V%u.%u\n\r", BOARD_VER_MAJOR, BOARD_VER_MINOR); -- GitLab From c8dbb8ebfbc7d72960c9b4b8fd6418f227043ca5 Mon Sep 17 00:00:00 2001 From: "Michael D. M. Dryden" Date: Tue, 12 Apr 2016 22:03:49 -0400 Subject: [PATCH 2/6] Move shutter to E1. --- DSTAT/src/shutter.c | 2 +- DSTAT/src/shutter.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/DSTAT/src/shutter.c b/DSTAT/src/shutter.c index 1c8a4ac..87ebea7 100644 --- a/DSTAT/src/shutter.c +++ b/DSTAT/src/shutter.c @@ -33,7 +33,7 @@ uint8_t shutter_cont(double freq){ else{ tc_enable(&SHUTTER_TC); tc_set_wgm(&SHUTTER_TC, TC_WG_FRQ); - tc_enable_cc_channels(&SHUTTER_TC, TC_CCAEN); + tc_enable_cc_channels(&SHUTTER_TC, TC_CCBEN); tc_write_clock_source(&SHUTTER_TC, TC_CLKSEL_DIV64_gc); diff --git a/DSTAT/src/shutter.h b/DSTAT/src/shutter.h index c1ba5dd..3709728 100644 --- a/DSTAT/src/shutter.h +++ b/DSTAT/src/shutter.h @@ -12,7 +12,7 @@ #include #include -#define SHUTTER_PIN IOPORT_CREATE_PIN(PORTE,0) +#define SHUTTER_PIN IOPORT_CREATE_PIN(PORTE,1) #define SHUTTER_TC TCE0 void shutter_init(void); @@ -21,4 +21,5 @@ void shutter_close(void); uint8_t shutter_cont(double freq); void shutter_cont_stop(void); + #endif /* shutter_h */ -- GitLab From dfd64c4ccfffb0d5c268d6a80bc94031aebeeae6 Mon Sep 17 00:00:00 2001 From: "Michael D. M. Dryden" Date: Tue, 17 May 2016 01:24:47 -0400 Subject: [PATCH 3/6] added CI --- .gitlab-ci.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..3a92c2b --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,13 @@ +image: gcc:latest + +before_script: + - apt-get upgrade -qy + - apt-get install -y gcc-avr binutils-avr avr-libc git + +build: + script: + - cd DSTAT + - make + artifacts: + paths: + - DSTAT/*.hex -- GitLab From cf5cb9853465fcbc98960c265a10b811467234ee Mon Sep 17 00:00:00 2001 From: "Michael D. M. Dryden" Date: Tue, 17 May 2016 01:38:24 -0400 Subject: [PATCH 4/6] Fix CI. --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a92c2b..1c2c047 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,8 @@ image: gcc:latest before_script: - - apt-get upgrade -qy - - apt-get install -y gcc-avr binutils-avr avr-libc git + - apt-get update -qy + - apt-get install -y gcc-avr binutils-avr avr-libc build: script: -- GitLab From 6b6f15e02fb0e596851dbae0f06f67ee371b4284 Mon Sep 17 00:00:00 2001 From: "Michael D. M. Dryden" Date: Tue, 17 May 2016 01:41:02 -0400 Subject: [PATCH 5/6] CI: add name to artifacts. --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c2c047..e7794ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,5 +9,6 @@ build: - cd DSTAT - make artifacts: + name: "${CI_BUILD_NAME}_${CI_BUILD_REF_NAME}" paths: - DSTAT/*.hex -- GitLab From 9f0018b85991c98a4257b1c8a00db03f716ca502 Mon Sep 17 00:00:00 2001 From: "Michael D. M. Dryden" Date: Tue, 17 May 2016 01:51:02 -0400 Subject: [PATCH 6/6] CI: Update to use image with AVR --- .gitlab-ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7794ad..0d9f53d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,4 @@ -image: gcc:latest - -before_script: - - apt-get update -qy - - apt-get install -y gcc-avr binutils-avr avr-libc +image: kalledk/docker-avr-toolchain build: script: -- GitLab