From c670098300f4881d498fac11d827817c512e146b Mon Sep 17 00:00:00 2001 From: emiel steerneman Date: Mon, 3 Jul 2023 14:12:42 +0200 Subject: [PATCH 1/2] Update frequencies to assigned --- Core/Inc/Wireless/Wireless.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Core/Inc/Wireless/Wireless.h b/Core/Inc/Wireless/Wireless.h index 8470861d..5a9dec9b 100644 --- a/Core/Inc/Wireless/Wireless.h +++ b/Core/Inc/Wireless/Wireless.h @@ -19,15 +19,21 @@ #define WIRELESS_YELLOW_CHANNELS 0 #define WIRELESS_BLUE_CHANNELS 1 -/* -* Frequency steps in MHz, starting at 2.4GHz, going up to 2.5GHz -* For the 2022 RoboCup, we have been assigned the band 2.494 GHz to 2.500 GHz -*/ -// Because that wifi range (2.4 - 2.5) is very busy at robocup, we drop our channels as far as possible below that range: +/* Frequency steps in MHz, starting at 2.4GHz, going up to 2.5GHz */ + +/* Frequencies for the RoboCup 2023 */ +#define WIRELESS_CHANNEL_YELLOW_ROBOT_TO_BASESTATION 85 +#define WIRELESS_CHANNEL_BLUE_ROBOT_TO_BASESTATION 86 +#define WIRELESS_CHANNEL_YELLOW_BASESTATION_TO_ROBOT 87 +#define WIRELESS_CHANNEL_BLUE_BASESTATION_TO_ROBOT 88 + +/* Frequencies below 2.4GHz to avoid WiFi. Officially not supported by documentation, but according to TIGERs it works */ +/* #define WIRELESS_CHANNEL_YELLOW_ROBOT_TO_BASESTATION -10 #define WIRELESS_CHANNEL_BLUE_ROBOT_TO_BASESTATION -11.5 #define WIRELESS_CHANNEL_YELLOW_BASESTATION_TO_ROBOT -13 #define WIRELESS_CHANNEL_BLUE_BASESTATION_TO_ROBOT -14.5 +*/ #define WIRELESS_CHANNEL_DEFAULT_ROBOT_TO_BASESTATION WIRELESS_CHANNEL_YELLOW_ROBOT_TO_BASESTATION #define WIRELESS_CHANNEL_DEFAULT_BASESTATION_TO_ROBOT WIRELESS_CHANNEL_YELLOW_BASESTATION_TO_ROBOT From 173800a2fa5a4d0696fde444795091888611e0eb Mon Sep 17 00:00:00 2001 From: emiel steerneman Date: Mon, 3 Jul 2023 14:27:41 +0200 Subject: [PATCH 2/2] Removed commented-out define macros just to be sure --- Core/Inc/Wireless/Wireless.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Core/Inc/Wireless/Wireless.h b/Core/Inc/Wireless/Wireless.h index 5a9dec9b..9c786b73 100644 --- a/Core/Inc/Wireless/Wireless.h +++ b/Core/Inc/Wireless/Wireless.h @@ -29,10 +29,10 @@ /* Frequencies below 2.4GHz to avoid WiFi. Officially not supported by documentation, but according to TIGERs it works */ /* -#define WIRELESS_CHANNEL_YELLOW_ROBOT_TO_BASESTATION -10 -#define WIRELESS_CHANNEL_BLUE_ROBOT_TO_BASESTATION -11.5 -#define WIRELESS_CHANNEL_YELLOW_BASESTATION_TO_ROBOT -13 -#define WIRELESS_CHANNEL_BLUE_BASESTATION_TO_ROBOT -14.5 +define WIRELESS_CHANNEL_YELLOW_ROBOT_TO_BASESTATION -10 +define WIRELESS_CHANNEL_BLUE_ROBOT_TO_BASESTATION -11.5 +define WIRELESS_CHANNEL_YELLOW_BASESTATION_TO_ROBOT -13 +define WIRELESS_CHANNEL_BLUE_BASESTATION_TO_ROBOT -14.5 */ #define WIRELESS_CHANNEL_DEFAULT_ROBOT_TO_BASESTATION WIRELESS_CHANNEL_YELLOW_ROBOT_TO_BASESTATION