diff --git a/Hardware/PSDR.pcb b/Hardware/PSDR.pcb index 192ce04..c015075 100644 Binary files a/Hardware/PSDR.pcb and b/Hardware/PSDR.pcb differ diff --git a/Hardware/PSDR.sch b/Hardware/PSDR.sch index ec8e2f9..424c46a 100644 Binary files a/Hardware/PSDR.sch and b/Hardware/PSDR.sch differ diff --git a/Hardware/PSDR2.6_BOM.xls b/Hardware/PSDR2.6_BOM.xls new file mode 100644 index 0000000..3634919 Binary files /dev/null and b/Hardware/PSDR2.6_BOM.xls differ diff --git a/Source/include/hal.h b/Source/include/hal.h index b526e13..3116602 100644 --- a/Source/include/hal.h +++ b/Source/include/hal.h @@ -162,7 +162,8 @@ extern const Gpio_Pin I2C_SDA; extern const Gpio_Pin FLIP_FLOP_ENABLE; extern const Gpio_Pin RED_LED; -extern const Gpio_Pin FIVE_VOLT_REGULATOR_ENABLE; + +extern const Gpio_Pin CHARGE_POWER_SOURCE; // extern const Gpio_Pin NC_1; // extern const Gpio_Pin DAC_SWITCHES; diff --git a/Source/src/hal.c b/Source/src/hal.c index 81bf797..5f349ed 100644 --- a/Source/src/hal.c +++ b/Source/src/hal.c @@ -205,6 +205,9 @@ const Gpio_Pin RED_LED = const Gpio_Pin FIVE_VOLT_REGULATOR_ENABLE = { GPIOE, GPIO_PIN_2 }; +const Gpio_Pin CHARGE_POWER_SOURCE = + { GPIOB, GPIO_PIN_8 }; + //// timer pins //const Timer_Pin LED_G = //{ @@ -878,6 +881,13 @@ hal_setupPins (void) gpioInitStructure.Pull = GPIO_NOPULL; HAL_GPIO_Init (FIVE_VOLT_REGULATOR_ENABLE.port, &gpioInitStructure); HAL_GPIO_WritePin (FIVE_VOLT_REGULATOR_ENABLE.port, FIVE_VOLT_REGULATOR_ENABLE.pin, 0); + + gpioInitStructure.Pin = CHARGE_POWER_SOURCE.pin; + gpioInitStructure.Speed = GPIO_SPEED_LOW; + gpioInitStructure.Mode = GPIO_MODE_OUTPUT_PP; + gpioInitStructure.Pull = GPIO_NOPULL; + HAL_GPIO_Init (CHARGE_POWER_SOURCE.port, &gpioInitStructure); + HAL_GPIO_WritePin (CHARGE_POWER_SOURCE.port, CHARGE_POWER_SOURCE.pin, 1); //High is for high current charging (I think 1A) Low is for 0.5A I think. } // diff --git a/Source/src/main.c b/Source/src/main.c index d7a5ade..a381459 100644 --- a/Source/src/main.c +++ b/Source/src/main.c @@ -937,7 +937,7 @@ setFreq(vfoAFrequency); - setGainPot(128, 128); + setGainPot(200, 200); //testing Uart configUartPeripheral(); @@ -1816,7 +1816,7 @@ void TIM_Try(void) TimHandle.Instance = TIM3; TimHandle.Init.CounterMode = TIM_COUNTERMODE_UP; - TimHandle.Init.Period = 800; //was 1050. Can't remember what that works out to. I think 44kHz or so + TimHandle.Init.Period = 1050; //was 1050, 800 works okay, not in AM though. Can't remember what that works out to. I think 44kHz or so TimHandle.Init.Prescaler = uwPrescalerValue; TimHandle.Init.ClockDivision = 0; HAL_TIM_Base_Init(&TimHandle); @@ -1838,7 +1838,7 @@ HAL_NVIC_EnableIRQ(TIMx_IRQn); __TIM4_CLK_ENABLE(); TimHandle4.Instance = TIM4; TimHandle4.Init.CounterMode = TIM_COUNTERMODE_UP; - TimHandle4.Init.Period = 800; //was 1050 + TimHandle4.Init.Period = 1050; //was 1050, 800 works okay, not in AM though. TimHandle4.Init.Prescaler = uwPrescalerValue; TimHandle4.Init.ClockDivision = 0;