From e6f335fbe0345a84c8b85d9e41d2c6286332aaff Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Thu, 3 Mar 2022 17:39:56 -0500 Subject: [PATCH] cleanup --- telem.c | 70 +++++---------------------------------------------------- 1 file changed, 5 insertions(+), 65 deletions(-) diff --git a/telem.c b/telem.c index 4f2c158d..6c60b0fa 100644 --- a/telem.c +++ b/telem.c @@ -15,71 +15,11 @@ int main(int argc, char *argv[]) { } } -/* - - wiringPiSetup (); - - printf("\n"); - - pinMode (2, INPUT); - pullUpDnControl (2, PUD_UP); - - if (digitalRead(2) != HIGH) - { - printf("vB3 with TFB Present\n"); - map[BUS] = MINUS_Z; - map[BAT] = BUS; - map[PLUS_Z] = BAT; - map[MINUS_Z] = PLUS_Z; - snprintf(busStr, 10, "%d %d", test_i2c_bus(1), test_i2c_bus(0)); - } - else - { - pinMode (3, INPUT); - pullUpDnControl (3, PUD_UP); - - if (digitalRead(3) != HIGH) - { - printf("vB4 Present\n"); - map[BAT] = BUS; - map[BUS] = BAT; - snprintf(busStr, 10, "%d %d", test_i2c_bus(1), test_i2c_bus(0)); - // strcpy(busStr,"1 0"); - } - else - { - pinMode (26, INPUT); - pullUpDnControl (26, PUD_UP); - - if (digitalRead(26) != HIGH) - { - // if (debug == ON) - printf("CubeSatSim v1.1 INA219 Voltage and Current Telemetry\n"); - map[MINUS_X] = MINUS_Y; - map[PLUS_Z] = MINUS_X; - map[MINUS_Y] = PLUS_Z; - snprintf(busStr, 10, "%d %d", test_i2c_bus(1), test_i2c_bus(3)); - } - else - { - printf("VB3 Present\n"); - map[BUS] = MINUS_Z; - map[BAT] = BUS; - map[PLUS_Z] = BAT; - map[MINUS_Z] = PLUS_Z; - snprintf(busStr, 10, "%d %d", test_i2c_bus(1), test_i2c_bus(0)); - } - } - } -*/ - - printf("CubeSatSim v1.1 INA219 Voltage and Current Telemetry\n"); - map[MINUS_X] = MINUS_Y; - map[PLUS_Z] = MINUS_X; - map[MINUS_Y] = PLUS_Z; - snprintf(busStr, 10, "%d %d", test_i2c_bus(1), test_i2c_bus(3)); - - + printf("CubeSatSim v1.1 INA219 Voltage and Current Telemetry\n"); + map[MINUS_X] = MINUS_Y; + map[PLUS_Z] = MINUS_X; + map[MINUS_Y] = PLUS_Z; + snprintf(busStr, 10, "%d %d", test_i2c_bus(1), test_i2c_bus(3)); // Reading I2C voltage and current sensors // printf("Starting\n");