diff --git a/display/software/.idea/workspace.xml b/display/software/.idea/workspace.xml index 93f079f..c544d39 100644 --- a/display/software/.idea/workspace.xml +++ b/display/software/.idea/workspace.xml @@ -2,12 +2,7 @@ - - - - - @@ -82,7 +77,7 @@ - + @@ -215,20 +210,6 @@ - + - + - + - + @@ -684,14 +637,14 @@ - + - + diff --git a/display/software/displayboard_servo/src/main.c b/display/software/displayboard_servo/src/main.c index 1e5ac48..dadaeba 100644 --- a/display/software/displayboard_servo/src/main.c +++ b/display/software/displayboard_servo/src/main.c @@ -9,26 +9,11 @@ #include "uart.h" #define BUFSIZE 40 -#define CURRENT_MAX 30000 // 30 Ampere is max -#define POWER_MAX 300 -#define SERVO_NEUTRAL 2312 -#define SERVO_MIN 2312 -#define SERVO_MAX 2312 - volatile uint16_t syscounter = 0; // values send over uart from powerboard -uint16_t voltage = 0; -int16_t current_in = 0; -int16_t current_out = 0; -uint8_t dumpsw = 0; -uint8_t loadsw = 0; -uint8_t gensw = 0; -uint16_t display = 0; - uint16_t power_gen = 0; -uint16_t power_load = 0; unsigned char data_count = 0; unsigned char data_in[BUFSIZE]; @@ -68,34 +53,8 @@ static void process_command() { token = strtok(start, ","); while( token ) { - switch(tokencounter) { - case 0: - voltage = atoi(token); - break; - case 1: - current_in = atoi(token); - break; - case 2: - current_out = atoi(token); - break; - case 3: - power_gen = atoi(token); - break; - case 4: - power_load = atoi(token); - break; - case 5: - if(atoi(token) == 1) loadsw = 1; - else loadsw = 0; - break; - case 6: - if(atoi(token) == 1) dumpsw = 1; - else dumpsw = 0; - break; - case 7: - if(atoi(token) == 1) gensw = 1; - else gensw = 0; - break; + if (tokencounter == 3) { + power_gen = atoi(token); } tokencounter++;