removed board version check

was interfering with Blue Tx LED
pi-zero-2
alanbjohnston 4 years ago committed by GitHub
parent 7e2e501958
commit 1ee0ee87a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -14,6 +14,9 @@ int main(int argc, char *argv[]) {
debug = ON; debug = ON;
} }
} }
/*
wiringPiSetup (); wiringPiSetup ();
printf("\n"); printf("\n");
@ -40,7 +43,7 @@ int main(int argc, char *argv[]) {
printf("vB4 Present\n"); printf("vB4 Present\n");
map[BAT] = BUS; map[BAT] = BUS;
map[BUS] = BAT; map[BUS] = BAT;
snprintf(busStr, 10, "%d %d", test_i2c_bus(1), test_i2c_bus(0)); snprintf(busStr, 10, "%d %d", test_i2c_bus(1), test_i2c_bus(0));
// strcpy(busStr,"1 0"); // strcpy(busStr,"1 0");
} }
else else
@ -68,6 +71,15 @@ int main(int argc, char *argv[]) {
} }
} }
} }
*/
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 // Reading I2C voltage and current sensors
// printf("Starting\n"); // printf("Starting\n");
@ -127,7 +139,8 @@ int main(int argc, char *argv[]) {
printf("-Y | % 4.2f V % 5.0f mA \n", voltage[map[MINUS_Y]], current[map[MINUS_Y]]); printf("-Y | % 4.2f V % 5.0f mA \n", voltage[map[MINUS_Y]], current[map[MINUS_Y]]);
printf("-Z | % 4.2f V % 5.0f mA \n", voltage[map[MINUS_Z]], current[map[MINUS_Z]]); printf("-Z | % 4.2f V % 5.0f mA \n", voltage[map[MINUS_Z]], current[map[MINUS_Z]]);
printf("Bat | % 4.2f V % 5.0f mA \n", voltage[map[BAT]], current[map[BAT]]); printf("Bat | % 4.2f V % 5.0f mA \n", voltage[map[BAT]], current[map[BAT]]);
printf("Bus | % 4.2f V % 5.0f mA \n\n", voltage[map[BUS]], current[map[BUS]]); printf("Bus | % 4.2f V % 5.0f mA \n\n", voltage[map[BUS]], current[map[BUS]]);
fclose(file1);
return 0; return 0;
} }
@ -141,7 +154,7 @@ int test_i2c_bus(int bus)
strcat (busDev, busS); strcat (busDev, busS);
// printf("Bus Dev String: %s \n", busDev); // printf("Bus Dev String: %s \n", busDev);
if (access(busDev, W_OK | R_OK) >= 0) { // Test if I2C Bus is present if (access(busDev, W_OK | R_OK) >= 0) { // Test if I2C Bus is present
// printf("bus is present\n\n"); // printf("bus is present\n\n");
char result[128]; char result[128];
const char command_start[] = "timeout 10 i2cdetect -y "; const char command_start[] = "timeout 10 i2cdetect -y ";
@ -161,7 +174,7 @@ int test_i2c_bus(int bus)
{ {
printf("ERROR: %d bus has a problem \n Check I2C wiring and pullup resistors \n", bus); printf("ERROR: %d bus has a problem \n Check I2C wiring and pullup resistors \n", bus);
output = -1; output = -1;
} }
} else } else
{ {
printf("ERROR: %d bus has a problem \n Check software to see if enabled \n", bus); printf("ERROR: %d bus has a problem \n Check software to see if enabled \n", bus);

Loading…
Cancel
Save

Powered by TurnKey Linux.