diff --git a/DSTAT-temp/src/experiment.c b/DSTAT-temp/src/experiment.c index 925092feae18db0de3b4cf19d0425c90cd746a45..ed2d5ad777161d8faf557381c5433ba9fa5b3870 100644 --- a/DSTAT-temp/src/experiment.c +++ b/DSTAT-temp/src/experiment.c @@ -220,11 +220,11 @@ void cv_experiment(int16_t v1, int16_t v2, int16_t start, uint8_t scans, uint16_ return; } - RTC.CTRL = RTC_PRESCALER_OFF_gc; - while (RTC.STATUS & RTC_SYNCBUSY_bm); - RTC.CNT = 0; - RTC.PER = 0xffff; - RTC.CTRL = RTC_PRESCALER_DIV1024_gc; // 1 s tick +// RTC.CTRL = RTC_PRESCALER_OFF_gc; +// while (RTC.STATUS & RTC_SYNCBUSY_bm); +// RTC.CNT = 0; +// RTC.PER = 0xffff; +// RTC.CTRL = RTC_PRESCALER_DIV1024_gc; // 1 s tick while(scans > 0){ if (start != v1){ @@ -242,7 +242,7 @@ void cv_experiment(int16_t v1, int16_t v2, int16_t start, uint8_t scans, uint16_ firstrun = 0; } - printf("Time: %lu s \n\r", rtc_get_time()); +// printf("Time: %lu s \n\r", rtc_get_time()); return; } @@ -386,19 +386,19 @@ static void porte_int0_lsv(void){ if (autogainswitch()==0){ noauto: - if (g_gain == POT_GAIN_300) - printf("%u %ld00000\n\r", TCC1.CNT,result); - else if (g_gain == POT_GAIN_3k) - printf("%u %ld0000\n\r", TCC1.CNT, result); - else if (g_gain == POT_GAIN_30k) - printf("%u %ld000\n\r", TCC1.CNT, result); - else if (g_gain == POT_GAIN_300k) - printf("%u %ld00\n\r", TCC1.CNT, result); - else if (g_gain == POT_GAIN_3M) - printf("%u %ld0\n\r", TCC1.CNT, result); - else if (g_gain == POT_GAIN_30M) - printf("%u %ld\n\r", TCC1.CNT, result); - else +// if (g_gain == POT_GAIN_300) +// printf("%u %ld\n\r", TCC1.CNT,result); +// else if (g_gain == POT_GAIN_3k) +// printf("%u %ld\n\r", TCC1.CNT, result); +// else if (g_gain == POT_GAIN_30k) +// printf("%u %ld000\n\r", TCC1.CNT, result); +// else if (g_gain == POT_GAIN_300k) +// printf("%u %ld00\n\r", TCC1.CNT, result); +// else if (g_gain == POT_GAIN_3M) +// printf("%u %ld0\n\r", TCC1.CNT, result); +// else if (g_gain == POT_GAIN_30M) +// printf("%u %ld\n\r", TCC1.CNT, result); +// else printf("%u %ld\n\r", TCC1.CNT, result); } diff --git a/DSTAT-temp/src/main.c b/DSTAT-temp/src/main.c index f8907539a20ea027aa06bca2232196346e7f1271..5b84083c72e4b1c260cf97daaf668d9e1c298d75 100644 --- a/DSTAT-temp/src/main.c +++ b/DSTAT-temp/src/main.c @@ -128,7 +128,7 @@ int main(void){ // } // } - ads1255_setup(ADS_BUFF_ON,ADS_DR_7500,ADS_PGA_2); + ads1255_setup(ADS_BUFF_ON,ADS_DR_60,ADS_PGA_2); // max5443_set_voltage1(0); // pot_exp_start(); @@ -137,17 +137,26 @@ int main(void){ // ads1255_wakeup(); autogain_enable = 0; - g_gain = POT_GAIN_100; + g_gain = POT_GAIN_30k; pot_set_gain(); +// max5443_set_voltage1(-1000*(65536/(double)3000)+32768); +// int16_t volt; while (1){ +// scanf("%d",&volt); +// printf("%d\n\r",volt); +// max5443_set_voltage1(volt*(65536/(double)3000)+32768); + + // command_handler((char)getchar()); // while (1){ // while (arch_ioport_get_pin_level(IOPORT_CREATE_PIN(PORTD, 5))); // printf("%ld\n\r", ads1255_read_fast24()); // } - delay_s(1); - lsv_experiment(-1500,1499,400,2); +// delay_s(1); + getchar(); + printf("#Start"); + cv_experiment(-1500,1499,-1500,1,100); } } \ No newline at end of file diff --git a/DSTAT1.atsuo b/DSTAT1.atsuo index 4df45696c86b841780d118e13d81732a79ca7946..4d5dce4f8e30d4e80caa77ff3ea7751260016e6d 100644 Binary files a/DSTAT1.atsuo and b/DSTAT1.atsuo differ