From 165a1776f3de83e20c95a7216c1e43e2852e5a26 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 29 Jan 2023 15:16:40 -0500 Subject: [PATCH 01/10] changed led_builtin_pin everywhere --- cubesatsim/cubesatsim.ino | 79 ++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 21 deletions(-) diff --git a/cubesatsim/cubesatsim.ino b/cubesatsim/cubesatsim.ino index 9dee0a17..85c23f60 100644 --- a/cubesatsim/cubesatsim.ino +++ b/cubesatsim/cubesatsim.ino @@ -108,12 +108,13 @@ void setup() { if (check_for_wifi()) { wifi = true; led_builtin_pin = LED_BUILTIN; // use default GPIO for Pico W -// pinMode(LED_BUILTIN, OUTPUT); + pinMode(LED_BUILTIN, OUTPUT); // configure_wifi(); - } else + } else { led_builtin_pin = 25; // manually set GPIO 25 for Pico board // pinMode(25, OUTPUT); - pinMode(led_builtin_pin, OUTPUT); + pinMode(led_builtin_pin, OUTPUT); + } /**/ config_gpio(); @@ -3110,11 +3111,17 @@ void blink_setup() void blink(int length) { - digitalWrite(led_builtin_pin, HIGH); // set the built-in LED ON - + if (wifi) + digitalWrite(BUILTIN_LED, HIGH); // set the built-in LED ON + else + digitalWrite(led_builtin_pin, HIGH); // set the built-in LED ON + sleep(length/1000.0); // delay(length); // wait for a lenth of time - digitalWrite(led_builtin_pin, LOW); // set the built-in LED off + if (wifi) + digitalWrite(BUILTIN_LED, LOW); // set the built-in LED OFF + else + digitalWrite(led_builtin_pin, LOW); // set the built-in LED OFF } void led_set(int ledPin, bool state) @@ -3399,9 +3406,11 @@ void process_pushbutton() { // return; /// just skip for now -// if (!wifi) - digitalWrite(led_builtin_pin, HIGH); // make sure built in LED is on before starting to blink - +// make sure built in LED is on before starting to blink + if (wifi) + digitalWrite(BUILTIN_LED, HIGH); // set the built-in LED ON + else + digitalWrite(led_builtin_pin, HIGH); // set the built-in LED ON sleep(1.0); int pb_value = digitalRead(MAIN_PB_PIN); @@ -3490,7 +3499,11 @@ void process_pushbutton() { transmit_off(); sleep(2.0); - digitalWrite(led_builtin_pin, LOW); // make sure built-in LED is off + // make sure built-in LED is off + if (wifi) + digitalWrite(BUILTIN_LED, LOW); // set the built-in LED OFF + else + digitalWrite(led_builtin_pin, LOW); // set the built-in LED OFF } void process_bootsel() { @@ -3589,18 +3602,30 @@ void process_bootsel() { transmit_off(); // sleep(2.0); - digitalWrite(led_builtin_pin, LOW); // make sure built-in LED is off + // make sure built-in LED is off + if (wifi) + digitalWrite(BUILTIN_LED, LOW); // set the built-in LED OFF + else + digitalWrite(led_builtin_pin, LOW); // set the built-in LED OFF } void blinkTimes(int blinks) { for (int i = 0; i < blinks; i++) { digitalWrite(MAIN_LED_GREEN, LOW); -// if (!wifi) - digitalWrite(led_builtin_pin, LOW); + + if (wifi) + digitalWrite(BUILTIN_LED, LOW); // set the built-in LED OFF + else + digitalWrite(led_builtin_pin, LOW); // set the built-in LED OFF + sleep(0.1); digitalWrite(MAIN_LED_GREEN, HIGH); -// if (!wifi) - digitalWrite(led_builtin_pin, HIGH); + + if (wifi) + digitalWrite(BUILTIN_LED, HIGH); // set the built-in LED ON + else + digitalWrite(led_builtin_pin, HIGH); // set the built-in LED ON + sleep(0.1); } } @@ -3973,8 +3998,11 @@ void transmit_cw(int freq, float duration) { // freq in Hz, duration in millise digitalWrite(LED_BUILTIN, HIGH); // Transmit LED on else digitalWrite(25, HIGH); // Transmit LED on -*/ - digitalWrite(led_builtin_pin, HIGH); +*/ + if (wifi) + digitalWrite(BUILTIN_LED, HIGH); // set the built-in LED ON + else + digitalWrite(led_builtin_pin, HIGH); // set the built-in LED ON digitalWrite(MAIN_LED_BLUE, HIGH); @@ -4010,7 +4038,12 @@ void transmit_cw(int freq, float duration) { // freq in Hz, duration in millise else digitalWrite(25, LOW); // Transmit LED on */ - digitalWrite(led_builtin_pin, LOW); + + if (wifi) + digitalWrite(BUILTIN_LED, LOW); // set the built-in LED OFF + else + digitalWrite(led_builtin_pin, LOW); // set the built-in LED OFF + digitalWrite(MAIN_LED_BLUE, LOW); } @@ -4926,8 +4959,12 @@ void get_input() { void transmit_led(bool status) { if(filter_present) { -// if (!wifi) - digitalWrite(led_builtin_pin, status); - digitalWrite(MAIN_LED_BLUE, status); + + if (wifi) + digitalWrite(BUILTIN_LED, status); // set the built-in LED + else + digitalWrite(led_builtin_pin, status); // set the built-in LED + + digitalWrite(MAIN_LED_BLUE, status); } } From a5f13c633e44163aed1153af6ed7ec9dae0e79e3 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 29 Jan 2023 15:37:38 -0500 Subject: [PATCH 02/10] changed to LED_BUILTIN for W --- cubesatsim/cubesatsim.ino | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/cubesatsim/cubesatsim.ino b/cubesatsim/cubesatsim.ino index 85c23f60..e1032ee5 100644 --- a/cubesatsim/cubesatsim.ino +++ b/cubesatsim/cubesatsim.ino @@ -3112,14 +3112,14 @@ void blink_setup() void blink(int length) { if (wifi) - digitalWrite(BUILTIN_LED, HIGH); // set the built-in LED ON + digitalWrite(LED_BUILTIN, HIGH); // set the built-in LED ON else digitalWrite(led_builtin_pin, HIGH); // set the built-in LED ON sleep(length/1000.0); // delay(length); // wait for a lenth of time if (wifi) - digitalWrite(BUILTIN_LED, LOW); // set the built-in LED OFF + digitalWrite(LED_BUILTIN, LOW); // set the built-in LED OFF else digitalWrite(led_builtin_pin, LOW); // set the built-in LED OFF } @@ -3408,7 +3408,7 @@ void process_pushbutton() { // make sure built in LED is on before starting to blink if (wifi) - digitalWrite(BUILTIN_LED, HIGH); // set the built-in LED ON + digitalWrite(LED_BUILTIN, HIGH); // set the built-in LED ON else digitalWrite(led_builtin_pin, HIGH); // set the built-in LED ON sleep(1.0); @@ -3501,7 +3501,7 @@ void process_pushbutton() { // make sure built-in LED is off if (wifi) - digitalWrite(BUILTIN_LED, LOW); // set the built-in LED OFF + digitalWrite(LED_BUILTIN, LOW); // set the built-in LED OFF else digitalWrite(led_builtin_pin, LOW); // set the built-in LED OFF } @@ -3604,7 +3604,7 @@ void process_bootsel() { // make sure built-in LED is off if (wifi) - digitalWrite(BUILTIN_LED, LOW); // set the built-in LED OFF + digitalWrite(LED_BUILTIN, LOW); // set the built-in LED OFF else digitalWrite(led_builtin_pin, LOW); // set the built-in LED OFF } @@ -3614,7 +3614,7 @@ void blinkTimes(int blinks) { digitalWrite(MAIN_LED_GREEN, LOW); if (wifi) - digitalWrite(BUILTIN_LED, LOW); // set the built-in LED OFF + digitalWrite(LED_BUILTIN, LOW); // set the built-in LED OFF else digitalWrite(led_builtin_pin, LOW); // set the built-in LED OFF @@ -3622,7 +3622,7 @@ void blinkTimes(int blinks) { digitalWrite(MAIN_LED_GREEN, HIGH); if (wifi) - digitalWrite(BUILTIN_LED, HIGH); // set the built-in LED ON + digitalWrite(LED_BUILTIN, HIGH); // set the built-in LED ON else digitalWrite(led_builtin_pin, HIGH); // set the built-in LED ON @@ -4000,7 +4000,7 @@ void transmit_cw(int freq, float duration) { // freq in Hz, duration in millise digitalWrite(25, HIGH); // Transmit LED on */ if (wifi) - digitalWrite(BUILTIN_LED, HIGH); // set the built-in LED ON + digitalWrite(LED_BUILTIN, HIGH); // set the built-in LED ON else digitalWrite(led_builtin_pin, HIGH); // set the built-in LED ON @@ -4040,7 +4040,7 @@ void transmit_cw(int freq, float duration) { // freq in Hz, duration in millise */ if (wifi) - digitalWrite(BUILTIN_LED, LOW); // set the built-in LED OFF + digitalWrite(LED_BUILTIN, LOW); // set the built-in LED OFF else digitalWrite(led_builtin_pin, LOW); // set the built-in LED OFF @@ -4961,7 +4961,7 @@ void transmit_led(bool status) { if(filter_present) { if (wifi) - digitalWrite(BUILTIN_LED, status); // set the built-in LED + digitalWrite(LED_BUILTIN, status); // set the built-in LED else digitalWrite(led_builtin_pin, status); // set the built-in LED From c4f77fc0eaa6f13fbdccab9b09c94276326adb52 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 29 Jan 2023 15:53:29 -0500 Subject: [PATCH 03/10] fixed one --- cubesatsim/cubesatsim.ino | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cubesatsim/cubesatsim.ino b/cubesatsim/cubesatsim.ino index e1032ee5..35ddb6be 100644 --- a/cubesatsim/cubesatsim.ino +++ b/cubesatsim/cubesatsim.ino @@ -3511,10 +3511,11 @@ void process_bootsel() { // Serial.println("BOOTSEL pressed!"); int release = FALSE; - -// if (!wifi) - digitalWrite(led_builtin_pin, HIGH); // make sure built in LED is on before blinking - + + if (wifi) + digitalWrite(LED_BUILTIN, HIGH); // set the built-in LED ON + else + digitalWrite(led_builtin_pin, HIGH); // set the built-in LED ON sleep(1.0); // int pb_value = digitalRead(MAIN_PB_PIN); From e86caf2e6e26f43a816b34fc1a67f6de36583486 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 29 Jan 2023 15:56:08 -0500 Subject: [PATCH 04/10] print in cw --- cubesatsim/cubesatsim.ino | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cubesatsim/cubesatsim.ino b/cubesatsim/cubesatsim.ino index 35ddb6be..3da7db12 100644 --- a/cubesatsim/cubesatsim.ino +++ b/cubesatsim/cubesatsim.ino @@ -4002,9 +4002,10 @@ void transmit_cw(int freq, float duration) { // freq in Hz, duration in millise */ if (wifi) digitalWrite(LED_BUILTIN, HIGH); // set the built-in LED ON - else + else { digitalWrite(led_builtin_pin, HIGH); // set the built-in LED ON - + Serial.printf("Turning on LED at pin: %d\n", led_builtin_pin); + } digitalWrite(MAIN_LED_BLUE, HIGH); unsigned long duration_us = duration * 1000; From 90237addfb3dd9561dfc85fc7894a6a0526a5ed3 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 29 Jan 2023 15:58:26 -0500 Subject: [PATCH 05/10] blink at start --- cubesatsim/cubesatsim.ino | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cubesatsim/cubesatsim.ino b/cubesatsim/cubesatsim.ino index 3da7db12..49401bf3 100644 --- a/cubesatsim/cubesatsim.ino +++ b/cubesatsim/cubesatsim.ino @@ -114,6 +114,15 @@ void setup() { led_builtin_pin = 25; // manually set GPIO 25 for Pico board // pinMode(25, OUTPUT); pinMode(led_builtin_pin, OUTPUT); + + digitalWrite(led_builtin_pin, HIGH); + delay(500); + digitalWrite(led_builtin_pin, LOW); + delay(500); + digitalWrite(led_builtin_pin, HIGH); + delay(500); + digitalWrite(led_builtin_pin, LOW); + delay(500); } /**/ From dd4ffffe2f1a94fb8587a43380c4aaa9660aef59 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 29 Jan 2023 16:01:05 -0500 Subject: [PATCH 06/10] changed config_gpio --- cubesatsim/cubesatsim.ino | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cubesatsim/cubesatsim.ino b/cubesatsim/cubesatsim.ino index 49401bf3..fc87ab32 100644 --- a/cubesatsim/cubesatsim.ino +++ b/cubesatsim/cubesatsim.ino @@ -3652,7 +3652,8 @@ void config_gpio() { // set all Pico GPIO pins to input for (int i = 6; i < 29; i++) { - pinMode(i, INPUT); + if (i != led_builtin_pin) + pinMode(i, INPUT); } pinMode(PI_3V3_PIN, INPUT); From 9e9498ce15682f7560e385e632e9512969e9b036 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 29 Jan 2023 16:05:22 -0500 Subject: [PATCH 07/10] corrected config_gpio --- cubesatsim/cubesatsim.ino | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/cubesatsim/cubesatsim.ino b/cubesatsim/cubesatsim.ino index fc87ab32..7a32f066 100644 --- a/cubesatsim/cubesatsim.ino +++ b/cubesatsim/cubesatsim.ino @@ -113,16 +113,7 @@ void setup() { } else { led_builtin_pin = 25; // manually set GPIO 25 for Pico board // pinMode(25, OUTPUT); - pinMode(led_builtin_pin, OUTPUT); - - digitalWrite(led_builtin_pin, HIGH); - delay(500); - digitalWrite(led_builtin_pin, LOW); - delay(500); - digitalWrite(led_builtin_pin, HIGH); - delay(500); - digitalWrite(led_builtin_pin, LOW); - delay(500); + pinMode(led_builtin_pin, OUTPUT); } /**/ @@ -3650,11 +3641,13 @@ void blink_pin(int pin, int duration) { void config_gpio() { - // set all Pico GPIO pins to input - for (int i = 6; i < 29; i++) { - if (i != led_builtin_pin) + // set all Pico GPIO connected pins to input + for (int i = 6; i < 22; i++) { pinMode(i, INPUT); } + pinMode(26, INPUT); + pinMode(27, INPUT); + pinMode(28, INPUT); pinMode(PI_3V3_PIN, INPUT); Serial.print("Pi 3.3V: "); From 67a37994b834ccde5ae52ed21ec70d9e2c084a62 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 29 Jan 2023 16:10:27 -0500 Subject: [PATCH 08/10] remove print, blink led at start --- cubesatsim/cubesatsim.ino | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/cubesatsim/cubesatsim.ino b/cubesatsim/cubesatsim.ino index 7a32f066..fed8b1e6 100644 --- a/cubesatsim/cubesatsim.ino +++ b/cubesatsim/cubesatsim.ino @@ -3672,6 +3672,17 @@ void config_gpio() { /// pinMode(led_builtin_pin, OUTPUT); // Set LED pin to output /// blink_pin(led_builtin_pin, 150); // digitalWrite(led_builtin_pin, HIGH); // Leave Pico LED on + + if (wifi) + digitalWrite(LED_BUILTIN, HIGH); // set the built-in LED ON + else + digitalWrite(led_builtin_pin, HIGH); // set the built-in LED ON + sleep(0.15); + if (wifi) + digitalWrite(LED_BUILTIN, LOW); // set the built-in LED OFF + else + digitalWrite(led_builtin_pin, LOW); // set the built-in LED OFF + pinMode(MAIN_LED_GREEN, OUTPUT); // Set Main Green LED pin to output blink_pin(MAIN_LED_GREEN, 150); digitalWrite(MAIN_LED_GREEN, HIGH); // Leave Green LED on @@ -4005,11 +4016,10 @@ void transmit_cw(int freq, float duration) { // freq in Hz, duration in millise */ if (wifi) digitalWrite(LED_BUILTIN, HIGH); // set the built-in LED ON - else { + else digitalWrite(led_builtin_pin, HIGH); // set the built-in LED ON - Serial.printf("Turning on LED at pin: %d\n", led_builtin_pin); - } - digitalWrite(MAIN_LED_BLUE, HIGH); + + digitalWrite(MAIN_LED_BLUE, HIGH); unsigned long duration_us = duration * 1000; From 29369ed25759c0c8fe061916987bf973f37ace28 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 29 Jan 2023 16:13:46 -0500 Subject: [PATCH 09/10] revert last commit --- cubesatsim/cubesatsim.ino | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/cubesatsim/cubesatsim.ino b/cubesatsim/cubesatsim.ino index fed8b1e6..7a32f066 100644 --- a/cubesatsim/cubesatsim.ino +++ b/cubesatsim/cubesatsim.ino @@ -3672,17 +3672,6 @@ void config_gpio() { /// pinMode(led_builtin_pin, OUTPUT); // Set LED pin to output /// blink_pin(led_builtin_pin, 150); // digitalWrite(led_builtin_pin, HIGH); // Leave Pico LED on - - if (wifi) - digitalWrite(LED_BUILTIN, HIGH); // set the built-in LED ON - else - digitalWrite(led_builtin_pin, HIGH); // set the built-in LED ON - sleep(0.15); - if (wifi) - digitalWrite(LED_BUILTIN, LOW); // set the built-in LED OFF - else - digitalWrite(led_builtin_pin, LOW); // set the built-in LED OFF - pinMode(MAIN_LED_GREEN, OUTPUT); // Set Main Green LED pin to output blink_pin(MAIN_LED_GREEN, 150); digitalWrite(MAIN_LED_GREEN, HIGH); // Leave Green LED on @@ -4016,10 +4005,11 @@ void transmit_cw(int freq, float duration) { // freq in Hz, duration in millise */ if (wifi) digitalWrite(LED_BUILTIN, HIGH); // set the built-in LED ON - else + else { digitalWrite(led_builtin_pin, HIGH); // set the built-in LED ON - - digitalWrite(MAIN_LED_BLUE, HIGH); + Serial.printf("Turning on LED at pin: %d\n", led_builtin_pin); + } + digitalWrite(MAIN_LED_BLUE, HIGH); unsigned long duration_us = duration * 1000; From 11aa66354da8a60203d5d6cf4957126566ef54b3 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 29 Jan 2023 16:22:46 -0500 Subject: [PATCH 10/10] don't print pin --- cubesatsim/cubesatsim.ino | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cubesatsim/cubesatsim.ino b/cubesatsim/cubesatsim.ino index 7a32f066..95c1e086 100644 --- a/cubesatsim/cubesatsim.ino +++ b/cubesatsim/cubesatsim.ino @@ -4005,10 +4005,9 @@ void transmit_cw(int freq, float duration) { // freq in Hz, duration in millise */ if (wifi) digitalWrite(LED_BUILTIN, HIGH); // set the built-in LED ON - else { + else digitalWrite(led_builtin_pin, HIGH); // set the built-in LED ON - Serial.printf("Turning on LED at pin: %d\n", led_builtin_pin); - } + digitalWrite(MAIN_LED_BLUE, HIGH); unsigned long duration_us = duration * 1000;