KB8PMY
/
CubeSatSim
mirror of https://github.com/alanbjohnston/CubeSatSim.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #267 from alanbjohnston/pico-v0.41

Browse Source 
Pico v0.41
pico
alanbjohnston 3 years ago committed by GitHub
parent 190a25a2a5 68da86c2e6
commit 5e76df2f75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 176 additions and 86 deletions
Show Stats Download Patch File Download Diff File

7
cubesatsim/cubesatsim.h
Unescape View File

@ -78,7 +78,7 @@
#define TEMPERATURE_PIN 28 // Diode temperature analog pin
#define PORT 8080
#define FREQUENCY_OFFSET 0
//#define FREQUENCY_OFFSET 0
#define TRUE 1
#define FALSE 0
@ -131,6 +131,7 @@
#define PROMPT_I2CSCAN 14
#define PROMPT_WIFI 15
#define PROMPT_CAMERA 16
#define PROMPT_OFFSET 17
#define PAYLOAD_QUERY 1
#define PAYLOAD_RESET 2
@ -145,7 +146,7 @@ float get_cpu_temp();
//#define WAV_DATA_LENGTH (50000 * 8)
uint32_t tx_freq_hz = 434900000 + FREQUENCY_OFFSET;
uint32_t tx_freq_hz = 434900000; // + FREQUENCY_OFFSET;
//uint8_t data[1024];
uint32_t tx_channel = 0;
@ -224,6 +225,7 @@ void load_sstv_image_2_as_cam_dot_jpg();
void get_input();
void transmit_led(bool status);
void reset_min_max();
int frequency_offset = 0;
#ifndef STASSID
#define STASSID "Pico"
@ -374,6 +376,7 @@ bool voltage_read = false;
bool ina219_started = false;
bool camera_detected = false;
bool rotate_flag = true;
bool clockgen_present = false;
int led_builtin_pin;

199
cubesatsim/cubesatsim.ino
Unescape View File

@ -8,7 +8,7 @@
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* but WITHOUT ANY WARRANTY; without even the implied warranty ofF
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
@ -91,6 +91,22 @@ void setup() {
Serial.begin(115200);
config_gpio();
/**/
if (check_for_wifi()) {
wifi = true;
led_builtin_pin = LED_BUILTIN; // use default GPIO for Pico W
pinMode(LED_BUILTIN, OUTPUT);
// configure_wifi();
} else {
led_builtin_pin = 25; // manually set GPIO 25 for Pico board
// pinMode(25, OUTPUT);
pinMode(led_builtin_pin, OUTPUT);
}
/**/
blink(50);
delay(10000);
LittleFS.begin();
@ -108,25 +124,18 @@ void setup() {
// otherwise, run CubeSatSim Pico code
Serial.println("CubeSatSim Pico v0.39 starting...\n");
/**/
if (check_for_wifi()) {
wifi = true;
led_builtin_pin = LED_BUILTIN; // use default GPIO for Pico W
pinMode(LED_BUILTIN, OUTPUT);
// configure_wifi();
} else {
led_builtin_pin = 25; // manually set GPIO 25 for Pico board
// pinMode(25, OUTPUT);
pinMode(led_builtin_pin, OUTPUT);
}
/**/
Serial.println("CubeSatSim Pico v0.41 starting...\n");
config_gpio();
//// config_gpio();
get_input();
if (wifi)
Serial.println("\nPico W detected!\n");
else
Serial.println("\nPico detected!\n");
start_clockgen();
EEPROM.begin(512);
@ -420,7 +429,6 @@ void read_config_file() {
sprintf(buff, "%s %d", "AMSAT", 0);
config_file.write(buff, strlen(buff));
config_file.close();
config_file = LittleFS.open("/sim.cfg", "r");
@ -429,10 +437,10 @@ void read_config_file() {
// char * cfg_buf[100];
config_file.read((uint8_t *)buff, 255);
// sscanf(buff, "%d", &cnt);
sscanf(buff, "%s %d %f %f %s", callsign, & reset_count, & lat_file, & long_file, sim_yes);
sscanf(buff, "%s %d %f %f %s %d", callsign, & reset_count, & lat_file, & long_file, sim_yes, & frequency_offset);
config_file.close();
if (debug_mode)
Serial.printf("Config file /sim.cfg contains %s %d %f %f %s\n", callsign, reset_count, lat_file, long_file, sim_yes);
// if (debug_mode)
Serial.printf("Config file /sim.cfg contains %s %d %f %f %s %d\n", callsign, reset_count, lat_file, long_file, sim_yes, frequency_offset);
reset_count = (reset_count + 1) % 0xffff;
@ -472,7 +480,7 @@ void write_config_file() {
else
strcpy(sim_yes, "no");
sprintf(buff, "%s %d %f %f %s", callsign, reset_count, latitude, longitude, sim_yes);
sprintf(buff, "%s %d %f %f %s %d", callsign, reset_count, latitude, longitude, sim_yes, frequency_offset);
Serial.println("Writing string ");
// if (debug_mode)
print_string(buff);
@ -550,19 +558,20 @@ void transmit_on() {
ret = clockgen.enableOutputs(true);
Serial.println("Enable clock outputs!");
}
*/
*/ if (clockgen_present) {
if (clockgen.enableOutputs(true)) {
start_clockgen();
if (mode == BPSK)
clockgen.setClockBPSK();
clockgen.setClockBPSK(frequency_offset);
else
clockgen.setClockFSK();
clockgen.setClockFSK(frequency_offset);
clockgen.enableOutputs(true);
Serial.println("Enable clock outputs!");
} else {
Serial.println("Enable clock outputs");
}
}
}
else if (mode == CW) {
// Serial.println("Transmit on!");
cw_stop = false;
@ -590,7 +599,7 @@ void transmit_off() {
Serial.println("Disable clock outputs!");
}
// clockgen.enableOutputs(false)
*/
*/ if (clockgen_present) {
if (clockgen.enableOutputs(false)) {
start_clockgen();
clockgen.enableOutputs(false);
@ -598,6 +607,7 @@ void transmit_off() {
} else {
Serial.println("Disable clock outputs");
}
}
}
else if (mode == SSTV)
@ -2223,10 +2233,13 @@ void config_radio()
if (sr_frs_present)
digitalWrite(PD_PIN, HIGH); // Enable SR_FRS
else {
// if (!clockgen_present)
if (mode != CW)
start_clockgen();
if (clockgen.setClockFSK()) {
if (clockgen_present) {
if (clockgen.setClockFSK(frequency_offset)) {
start_clockgen();
clockgen.setClockFSK();
clockgen.setClockFSK(frequency_offset);
Serial.println("Config clock for CW without SR_FRS!");
} else {
Serial.println("Config clock for CW without SR_FRS");
@ -2235,6 +2248,7 @@ void config_radio()
clockgen.enableOutputs(false);
digitalWrite(BPSK_CONTROL_B, LOW);
digitalWrite(BPSK_CONTROL_A, LOW);
}
}
@ -2247,14 +2261,15 @@ void config_radio()
Serial.println("Config clock for BPSK");
}
*/
if (clockgen.setClockBPSK()) {
if (clockgen_present) {
if (clockgen.setClockBPSK(frequency_offset)) {
start_clockgen();
clockgen.setClockBPSK();
clockgen.setClockBPSK(frequency_offset);
Serial.println("Config clock for BPSK");
} else {
Serial.println("Config clock for BPSK");
}
}
transmit_on();
}
else if (mode == FSK) {// || (mode == SSTV))
@ -2265,14 +2280,15 @@ void config_radio()
ret = clockgen.setClockFSK();
Serial.println("Config clock for FSK");
}
*/
if (clockgen.setClockFSK()) {
*/ if (clockgen_present) {
if (clockgen.setClockFSK(frequency_offset)) {
start_clockgen();
clockgen.setClockFSK();
clockgen.setClockFSK(frequency_offset);
Serial.println("Config clock for FSK");
} else {
Serial.println("Config clock for FSK");
}
}
transmit_on();
}
@ -2372,7 +2388,7 @@ void read_ina219()
loadvoltage = busvoltage + (shuntvoltage / 1000);
if ((debug_mode) || (voltage_read)) {
Serial.print("+Bat (1 0x44) Voltage: ");
Serial.print("Bat (1 0x44) Voltage: ");
Serial.print(loadvoltage);
Serial.print("V Current: ");
Serial.print(current_mA);
@ -3209,9 +3225,9 @@ void start_ina219() {
i2c_bus1 = i2c_1 || i2c2 || i2c3;
Wire1.setSDA(2);
Wire1.setSCL(3);
Wire1.begin();
// Wire1.setSDA(2);
// Wire1.setSCL(3);
// Wire1.begin();
if (!(i2c5 = ina219_2_0x40.begin(&Wire1))) // check i2c bus 2
Serial.println("I2C +Z sensor (bus 2 0x40) not found");
@ -3721,6 +3737,7 @@ void config_gpio() {
Serial.println(digitalRead(PI_3V3_PIN));
if (digitalRead(PI_3V3_PIN) == HIGH) {
// {
delay(10000);
Serial.print("Pi Zero present, so running Payload OK code instead of CubeSatSim code.");
start_payload();
while(true) {
@ -3764,7 +3781,7 @@ void config_gpio() {
Serial.println("BPF not present - no transmitting after CW ID");
if (digitalRead(TXC_PIN) == FALSE) {
// if (true) { // force SR_FRS not present
// if (false) { // force SR_FRS not present
Serial.println("SR_FRS present");
sr_frs_present = true;
}
@ -3953,11 +3970,11 @@ bool check_for_wifi() {
// if (result < 0x100) {
if (result < 0x10) {
Serial.println("\nPico W detected!\n");
// Serial.println("\nPico W detected!\n");
return(true);
}
else {
Serial.println("\nPico detected!\n");
// Serial.println("\nPico detected!\n");
return(false);
}
}
@ -4099,15 +4116,20 @@ void transmit_cw(int freq, float duration) { // freq in Hz, duration in millise
digitalWrite(AUDIO_OUT_PIN, LOW);
}
else {
// Serial.println("No sr_frs present!");
unsigned long start = micros();
// clockgen.enableOutputs(true);
if (clockgen_present) {
clockgen.enableOutputOnly(0);
digitalWrite(BPSK_CONTROL_A, HIGH);
}
while((micros() - start) < duration_us) { }
if (clockgen_present) {
digitalWrite(BPSK_CONTROL_A, LOW);
clockgen.enableOutputs(false);
}
}
// if (!wifi)
/*
@ -4135,19 +4157,26 @@ void transmit_callsign(char *callsign) {
print_string(id);
if (!sr_frs_present) {
// Serial.println("before start");
// start_clockgen();
// Serial.println("after start");
if (clockgen_present) {
if (clockgen.setClockFSK(frequency_offset)) {
start_clockgen();
if (clockgen.setClockFSK()) {
start_clockgen();
clockgen.setClockFSK();
if (clockgen_present)
clockgen.setClockFSK(frequency_offset);
Serial.println("Config clock for CW without SR_FRS!");
} else {
Serial.println("Config clock for CW without SR_FRS");
}
}
digitalWrite(PD_PIN, LOW); // disable SR_FRS
if (clockgen_present) {
clockgen.enableOutputs(false);
digitalWrite(BPSK_CONTROL_B, LOW);
digitalWrite(BPSK_CONTROL_A, LOW);
}
}
/*
if (reset_count == 0) {
program_radio();
@ -4415,11 +4444,15 @@ void serial_input() {
break;
case 'o':
case 'O':
Serial.println("Read diode temperature");
prompt = PROMPT_TEMP;
break;
case 'O':
Serial.println("Set frequency offset");
prompt = PROMPT_OFFSET;
break;
case 'l':
case 'L':
Serial.println("Change the Latitude and Longitude");
@ -4495,10 +4528,11 @@ void prompt_for_input() {
Serial.println("? Query sensors");
Serial.println("v Read INA219 voltage and current");
Serial.println("o Read diode temperature");
Serial.println("O Set frequency offset");
Serial.println("d Change debug mode");
Serial.println("w Connect to WiFi\n");
Serial.printf("Software version v0.39 \nConfig file /sim.cfg contains %s %d %f %f %s\n\n", callsign, reset_count, lat_file, long_file, sim_yes);
Serial.printf("Software version v0.41 \nConfig file /sim.cfg contains %s %d %f %f %s %d\n\n", callsign, reset_count, lat_file, long_file, sim_yes, frequency_offset);
switch(mode) {
@ -4637,13 +4671,6 @@ void prompt_for_input() {
read_ina219();
break;
case PROMPT_REBOOT:
Serial.println("Rebooting...");
Serial.flush();
watchdog_reboot (0, SRAM_END, 500); // restart Pico
sleep(20.0);
break;
case PROMPT_FORMAT:
LittleFS.format();
// Serial.println("Reboot or power cycle to restart the CubeSatSim");
@ -4666,6 +4693,42 @@ void prompt_for_input() {
write_config_file();
break;
case PROMPT_OFFSET:
if (frequency_offset != 0)
Serial.println("Frequency offset is currently on");
else
Serial.println("Frequency offset is currently off");
Serial.println("Do you want Frequency offset on (y/n)");
get_serial_char();
if ((serial_string[0] == 'y') || (serial_string[0] == 'Y')) {
Serial.println("Turning Frequency offset on");
frequency_offset = -15000; // set frequency offset
write_config_file();
program_radio();
Serial.println("Rebooting...");
Serial.flush();
watchdog_reboot (0, SRAM_END, 500); // restart Pico
sleep(20.0);
} else if ((serial_string[0] == 'n') || (serial_string[0] == 'N')) {
Serial.println("Turning Frequency offset off");
frequency_offset = 0; // turn off frequency offset
program_radio();
write_config_file();
Serial.println("Rebooting...");
Serial.flush();
watchdog_reboot (0, SRAM_END, 500); // restart Pico
sleep(20.0);
} else
Serial.println("No change to frequency offset.");
break;
case PROMPT_REBOOT:
Serial.println("Rebooting...");
Serial.flush();
watchdog_reboot (0, SRAM_END, 500); // restart Pico
sleep(20.0);
break;
case PROMPT_RESTART:
prompt = false;
// Serial.println("Restart not yet implemented");
@ -4852,7 +4915,7 @@ void get_serial_string() {
int input = 0;
int i = 0;
unsigned int elapsed_time = (unsigned int) millis();
while ((input != '\n') && (input!= '\r') && (i < 128) && ((millis() - elapsed_time) < 20000)) {
while ((input != '\n') && (input!= '\r') && (i < 128) && ((millis() - elapsed_time) < 40000)) { // was 20
if (Serial.available() > 0) {
input = Serial.read();
if ((input != '\n') && (input!= '\r')) {
@ -4932,7 +4995,11 @@ void program_radio() {
// mySerial.println("AT+DMOSETGROUP=0,434.9000,434.9000,0,8,0,0\r");
// mySerial.println("AT+DMOSETGROUP=0,432.2510,432.2510,0,8,0,0\r");
// mySerial.println("AT+DMOSETGROUP=0,432.2500,432.2500,0,8,0,0\r");
if (frequency_offset == 0)
mySerial.println("AT+DMOSETGROUP=0,434.9000,434.9000,0,8,0,0\r");
else
mySerial.println("AT+DMOSETGROUP=0,434.8750,434.8750,0,8,0,0\r");
sleep(0.5);
mySerial.println("AT+DMOSETMIC=8,0\r"); // was 8
@ -4983,19 +5050,39 @@ void write_mode(int save_mode) {
}
void start_clockgen() {
clockgen_present = false;
Wire1.setSDA(2);
Wire1.setSCL(3);
Wire1.begin();
if (clockgen.begin(&Wire) != ERROR_NONE)
{
/* There was a problem detecting the IC ... check your connections */
Serial.println("No Si5351 detected on bus 1");
if (clockgen.begin() != ERROR_NONE)
if (clockgen.begin(&Wire1) != ERROR_NONE)
{
/* There was a problem detecting the IC ... check your connections */
Serial.println("No Si5351 detected ... Check your wiring or I2C ADDR!");
Serial.println("No Si5351 detected on bus 2 ... Check your wiring or I2C ADDR!");
clockgen.begin(&Wire); // go back to Wire so that it doesn't lock up with no clockgen
return;
} else {
Serial.println("Si5351 detected on bus 2");
clockgen_present = true;
}
} else {
Serial.println("Si5351 detected on bus 1");
clockgen_present = true;
}
if (clockgen_present) {
Serial.println("Starting clockgen frequency 434.9 MHz");
// clockgen.setClockFSK(); // default to FSK
clockgen.enableOutputs(false);
}
}
void get_input() {

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.