Skip to content
Snippets Groups Projects
Commit 455ec5ac authored by Michael DM Dryden's avatar Michael DM Dryden
Browse files

Switch to new communications protocol.

parent f6591fa0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/config/conf_board.h
+ 2
− 0
View file @ 455ec5ac
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
#define LED2 IOPORT_CREATE_PIN(PORTF,6) #define LED2 IOPORT_CREATE_PIN(PORTF,6)
#endif #endif
#define MAX_COMMAND_BYTES 64
// Default Settings (only used if EEPROM is empty) // Default Settings (only used if EEPROM is empty)
#define SETTINGS_MAX5443_OFFSET 0 #define SETTINGS_MAX5443_OFFSET 0
#define SETTINGS_TCS_ENABLED 1 #define SETTINGS_TCS_ENABLED 1
......
src/experiment.c
+ 21
− 13
View file @ 455ec5ac
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "tcs.h" #include "tcs.h"
#include "config/conf_board.h" #include "config/conf_board.h"
#include "shutter.h" #include "shutter.h"
#include <util/atomic.h>
//Public variable definitions //Public variable definitions
uint16_t g_gain = POT_GAIN_30k; uint16_t g_gain = POT_GAIN_30k;
...@@ -57,7 +58,7 @@ typedef void (*port_callback_t) (void); ...@@ -57,7 +58,7 @@ typedef void (*port_callback_t) (void);
static port_callback_t portd_int0_callback; static port_callback_t portd_int0_callback;
static port_callback_t portd_int1_callback; static port_callback_t portd_int1_callback;
void experiment_handler(char command){ void experiment_handler(char command[]){
static int16_t p1, p2, p3; static int16_t p1, p2, p3;
static uint16_t u1, u2, u3, u4; static uint16_t u1, u2, u3, u4;
static uint8_t p5, o1, o2, o3; static uint8_t p5, o1, o2, o3;
...@@ -66,40 +67,41 @@ void experiment_handler(char command){ ...@@ -66,40 +67,41 @@ void experiment_handler(char command){
uint16_t tcs_data[] = {0,0,0,0}; uint16_t tcs_data[] = {0,0,0,0};
uint16_t tcs_data1[] = {0,0,0,0}; uint16_t tcs_data1[] = {0,0,0,0};
double p6; double p6;
switch (command){
switch (command[0]){
case 'A': //ADS Buffer/rate/PGA values from ads1255.h case 'A': //ADS Buffer/rate/PGA values from ads1255.h
scanf("%hhx%hhx%hhx",&o1,&o2,&o3); sscanf(command+1, "%hhx%hhx%hhx",&o1,&o2,&o3);
printf("#A: %x %x %x\n",o1,o2,o3); printf("#A: %x %x %x\n",o1,o2,o3);
ads1255_setup(o1, o2, o3); ads1255_setup(o1, o2, o3);
break; break;
case 'G': //Gain case 'G': //Gain
scanf("%u%hhu",&g_gain, &g_short); sscanf(command+1, "%u%hhu",&g_gain, &g_short);
printf("#G: %u %u\n", g_gain, g_short); printf("#G: %u %u\n", g_gain, g_short);
pot_set_gain(); //uses global g_gain, so no params pot_set_gain(); //uses global g_gain, so no params
break; break;
case 'L': //LSV - start, stop, slope case 'L': //LSV - start, stop, slope
scanf("%u%u%i%i%i%i%u",&pct1,&pct2,&pcv1,&pcv2,&p1,&p2,&u1); sscanf(command+1, "%u%u%i%i%i%i%u",&pct1,&pct2,&pcv1,&pcv2,&p1,&p2,&u1);
precond(pcv1,pct1,pcv2,pct2); precond(pcv1,pct1,pcv2,pct2);
lsv_experiment(p1,p2,u1,2); lsv_experiment(p1,p2,u1,2);
break; break;
case 'C': //CV - v1, v2, start, scans, slope case 'C': //CV - v1, v2, start, scans, slope
scanf("%u%u%i%i%i%i%i%hhu%u",&pct1,&pct2,&pcv1,&pcv2,&p1,&p2,&p3,&p5,&u1); sscanf(command+1, "%u%u%i%i%i%i%i%hhu%u",&pct1,&pct2,&pcv1,&pcv2,&p1,&p2,&p3,&p5,&u1);
precond(pcv1,pct1,pcv2,pct2); precond(pcv1,pct1,pcv2,pct2);
cv_experiment(p1,p2,p3,p5,u1); cv_experiment(p1,p2,p3,p5,u1);
break; break;
case 'S': //SWV - start, stop, step size, pulse_height, frequency, scans case 'S': //SWV - start, stop, step size, pulse_height, frequency, scans
scanf("%u%u%i%i%i%i%u%u%u%u",&pct1,&pct2,&pcv1,&pcv2,&p1,&p2,&u1,&u2,&u3,&u4); sscanf(command+1, "%u%u%i%i%i%i%u%u%u%u",&pct1,&pct2,&pcv1,&pcv2,&p1,&p2,&u1,&u2,&u3,&u4);
precond(pcv1,pct1,pcv2,pct2); precond(pcv1,pct1,pcv2,pct2);
swv_experiment(p1,p2,u1,u2,u3,u4); swv_experiment(p1,p2,u1,u2,u3,u4);
break; break;
case 'D': //DPV - start, stop, step size, pulse_height, period, width case 'D': //DPV - start, stop, step size, pulse_height, period, width
scanf("%u%u%i%i%i%i%u%u%u%u",&pct1,&pct2,&pcv1,&pcv2,&p1,&p2,&u1,&u2,&u3,&u4); sscanf(command+1, "%u%u%i%i%i%i%u%u%u%u",&pct1,&pct2,&pcv1,&pcv2,&p1,&p2,&u1,&u2,&u3,&u4);
precond(pcv1,pct1,pcv2,pct2); precond(pcv1,pct1,pcv2,pct2);
dpv_experiment(p1,p2,u1,u2,u3,u4); dpv_experiment(p1,p2,u1,u2,u3,u4);
break; break;
...@@ -110,13 +112,14 @@ void experiment_handler(char command){ ...@@ -110,13 +112,14 @@ void experiment_handler(char command){
#if BOARD_VER_MAJOR == 1 && BOARD_VER_MINOR >= 2 #if BOARD_VER_MAJOR == 1 && BOARD_VER_MINOR >= 2
case 'P': //potentiometry - time, OCP/poteniometry case 'P': //potentiometry - time, OCP/poteniometry
scanf("%u%hhu",&pct1, &o1); sscanf(command+1, "%u%hhu",&pct1, &o1);
pot_experiment(pct1, o1); pot_experiment(pct1, o1);
break; break;
#endif #endif
case 'R': //CA - steps, step_dac[], step_seconds[] case 'R': //CA - steps, step_dac[], step_seconds[]
scanf("%hhu",&p5); //get number of steps {
sscanf(command+1, "%hhu%hhu",&p5, &o1); //get number of steps
printf("#INFO: Steps: %u\n", p5); printf("#INFO: Steps: %u\n", p5);
//allocate arrays for steps //allocate arrays for steps
...@@ -129,6 +132,9 @@ void experiment_handler(char command){ ...@@ -129,6 +132,9 @@ void experiment_handler(char command){
break; break;
} }
//request additional parameters from computer
printf("@RQP %u\n", 2*(uint16_t)p5);
uint8_t i; uint8_t i;
for (i=0; i<p5; i++){ for (i=0; i<p5; i++){
...@@ -141,7 +147,8 @@ void experiment_handler(char command){ ...@@ -141,7 +147,8 @@ void experiment_handler(char command){
printf("#INFO: Time: %u\n", step_seconds[i]); printf("#INFO: Time: %u\n", step_seconds[i]);
} }
scanf("%hhu", &o1); printf("@RCP %u\n", 2*(uint16_t)p5);
printf("#INFO: TCS_check: %hhu\n", o1); printf("#INFO: TCS_check: %hhu\n", o1);
if (o1 > 0) { if (o1 > 0) {
if (settings.settings.tcs_enabled > 0){ if (settings.settings.tcs_enabled > 0){
...@@ -174,9 +181,10 @@ void experiment_handler(char command){ ...@@ -174,9 +181,10 @@ void experiment_handler(char command){
free(step_seconds); free(step_seconds);
break; break;
}
case 'Z': //Shutter sync case 'Z': //Shutter sync
scanf("%lg",&p6); sscanf(command+1, "%lg", &p6);
shutter_cont(p6); shutter_cont(p6);
break; break;
......
src/experiment.h
+ 1
− 1
View file @ 455ec5ac
...@@ -86,7 +86,7 @@ extern uint8_t g_short; ...@@ -86,7 +86,7 @@ extern uint8_t g_short;
extern uint8_t autogain_enable; extern uint8_t autogain_enable;
uint16_t set_timer_period(uint32_t period, volatile void *tc); uint16_t set_timer_period(uint32_t period, volatile void *tc);
void experiment_handler(char command); void experiment_handler(char command[]);
void pot_init(void); void pot_init(void);
void pot_set_gain(void); void pot_set_gain(void);
void volt_exp_start(void); void volt_exp_start(void);
......
src/main.c
+ 51
− 10
View file @ 455ec5ac
...@@ -15,25 +15,56 @@ ...@@ -15,25 +15,56 @@
#include <stdint.h> #include <stdint.h>
#include "conf_board.h" #include "conf_board.h"
#include "ext_twi.h" #include "ext_twi.h"
#include <util/atomic.h>
//Internal function declarations //Internal function declarations
int8_t command_handler(char command); static void command_handler(uint16_t bytes);
int8_t command_handler(char command){ static void command_handler(uint16_t bytes){
/** /**
* Deals with commands over USB * Deals with commands over USB
* *
* Calls functions in * Calls functions in
* @param command Command character input. * @param command Command character input.
* @param bytes Number of command bytes to wait for
*/ */
if (bytes == 0) {
printf("@RCV 0\n");
return;
}
else if (bytes >= MAX_COMMAND_BYTES){
printf("@ERR Command too long\n");
return;
}
char command_buffer[MAX_COMMAND_BYTES];
read_data:
while (!udi_cdc_is_rx_ready());
delay_ms(100);
if(!fgets(command_buffer, MAX_COMMAND_BYTES, stdin)){
printf("@ERR Could not read string\n");
return;
}
command_buffer[strcspn(command_buffer, "\r\n")] = 0;
if (strlen(command_buffer) == 0)
goto read_data;
printf("@RCV %u\n", strlen(command_buffer));
printf("#%s\n", command_buffer);
char command = command_buffer[0];
switch (command){ switch (command){
case 'E': //Experiment options case 'E': //Experiment options
experiment_handler(getchar()); experiment_handler(command_buffer+1);
break; break;
case 'S': //Settings options case 'S': //Settings options
settings_handler(getchar()); settings_handler(command_buffer+1);
break; break;
case 'T': ; case 'T': ;
...@@ -62,8 +93,8 @@ int8_t command_handler(char command){ ...@@ -62,8 +93,8 @@ int8_t command_handler(char command){
printf("@ERR Command %c not recognized\n", command); printf("@ERR Command %c not recognized\n", command);
return; return;
} }
printf("no\n\r"); printf("@DONE\n");
return 0; return;
} }
int main(void){ int main(void){
...@@ -121,15 +152,25 @@ int main(void){ ...@@ -121,15 +152,25 @@ int main(void){
udc_attach(); udc_attach();
stdio_usb_enable(); stdio_usb_enable();
uint16_t bytes_sent = 0;
program_loop: program_loop:
#if BOARD_VER_MAJOR >= 1 && BOARD_VER_MINOR >= 2 && BOARD_VER_MICRO >=3 #if BOARD_VER_MAJOR >= 1 && BOARD_VER_MINOR >= 2 && BOARD_VER_MICRO >=3
ioport_set_pin_level(LED1, 1); ioport_set_pin_level(LED1, 1);
#endif #endif
while(getchar() != '!'); while (getchar() != '!');
printf ("C\r\n"); scanf("%u", &bytes_sent);
// // Empty buffer
// while (udi_cdc_is_rx_ready())
// udi_cdc_getc();
printf ("@ACK %u\n", bytes_sent);
#if BOARD_VER_MAJOR >= 1 && BOARD_VER_MINOR >= 2 && BOARD_VER_MICRO >=3 #if BOARD_VER_MAJOR >= 1 && BOARD_VER_MINOR >= 2 && BOARD_VER_MICRO >=3
ioport_set_pin_level(LED1, 0); ioport_set_pin_level(LED1, 0);
#endif #endif
command_handler(getchar());
command_handler(bytes_sent);
goto program_loop; goto program_loop;
} }
src/settings.c
+ 3
− 3
View file @ 455ec5ac
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
void update_firmware(void); void update_firmware(void);
void settings_handler(char command){ void settings_handler(char command[]){
switch (command){ switch (command[0]){
case 'D': //Reset defaults case 'D': //Reset defaults
settings_restore_defaults(); settings_restore_defaults();
break; break;
...@@ -31,7 +31,7 @@ void settings_handler(char command){ ...@@ -31,7 +31,7 @@ void settings_handler(char command){
break; break;
case 'W': //Write new settings case 'W': //Write new settings
scanf("%i%hhu%u%i%i%i%i%i%i%i%lu%lu", sscanf(command+1, "%i%hhu%u%i%i%i%i%i%i%i%lu%lu",
&settings.settings.max5443_offset, &settings.settings.max5443_offset,
&settings.settings.tcs_enabled, &settings.settings.tcs_enabled,
&settings.settings.tcs_clear_threshold, &settings.settings.tcs_clear_threshold,
......
src/settings.h
+ 1
− 1
View file @ 455ec5ac
...@@ -38,7 +38,7 @@ union { ...@@ -38,7 +38,7 @@ union {
char temp_char[EEPROM_PAGE_SIZE]; //makes sure struct fills whole page char temp_char[EEPROM_PAGE_SIZE]; //makes sure struct fills whole page
} settings; } settings;
void settings_handler(char command); void settings_handler(char command[]);
void settings_read_eeprom(void); void settings_read_eeprom(void);
void settings_write_eeprom(void); void settings_write_eeprom(void);
void settings_restore_defaults(void); void settings_restore_defaults(void);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment