Compare commits

..

No commits in common. "c4272c52300c7790dbe7f90b6fa03001f685b76a" and "953649725b6ffa2a782acb538184a9e2c1d0dc18" have entirely different histories.

View file

@ -24,9 +24,6 @@
#define SI5351_ADDRESS 0x60 #define SI5351_ADDRESS 0x60
#define SI5351_REGISTER_3_OUTPUT_ENABLE_CONTROL 3
#define SI5351_REGISTER_177_PLL_RESET 177
#define SYM_ENTRY(SYM) { SYM, sizeof(SYM) / 2 } #define SYM_ENTRY(SYM) { SYM, sizeof(SYM) / 2 }
static uint8_t EEMEM eeprom_contrast = 8; static uint8_t EEMEM eeprom_contrast = 8;
@ -174,69 +171,6 @@ static volatile uint8_t enc = 0;
static volatile uint8_t value_contrast; static volatile uint8_t value_contrast;
static volatile uint8_t value_backlight; static volatile uint8_t value_backlight;
static const uint8_t m_si5351_regs_15to92_149to170[100][2] = {
// Init
{3, 0xFF},
{16, 0x4F}, /* CLK0 Control: 8mA drive, Multisynth 0 as CLK0 source, Clock
not inverted, Source = PLLA, Multisynth 0 in integer mode,
clock powered up */
{17, 0x4F}, /* CLK1 Control: 8mA drive, Multisynth 1 as CLK1 source, Clock
not inverted, Source = PLLA, Multisynth 1 in integer mode,
clock powered up */
{18, 0x6F}, /* CLK2 Control: 8mA drive, Multisynth 2 as CLK2 source, Clock
not inverted, Source = PLLB, Multisynth 2 in integer mode,
clock powered up */
{19, 0x80}, /* CLK3 Control: Not used ... clock powered down */
{20, 0x80}, /* CLK4 Control: Not used ... clock powered down */
{21, 0x80}, /* CLK5 Control: Not used ... clock powered down */
{22, 0x80}, /* CLK6 Control: Not used ... clock powered down */
{23, 0x80}, /* CLK7 Control: Not used ... clock powered down */
// PLL_A Setup (720MHz)
{26, 0x00},
{27, 0x05},
{28, 0x00},
{29, 0x0C},
{30, 0x66},
{31, 0x00},
{32, 0x00},
{33, 0x02},
// PLL_B Setup (705MHz)
{34, 0x02},
{35, 0x71},
{36, 0x00},
{37, 0x0C},
{38, 0x1A},
{39, 0x00},
{40, 0x00},
{41, 0x86},
// Multisynth0 Setup (120MHz)
{42, 0x00},
{43, 0x01},
{44, 0x00},
{45, 0x01},
{46, 0x00},
{47, 0x00},
{48, 0x00},
{49, 0x00},
// Multisynth1 Setup (12MHz)
{50, 0x00},
{51, 0x01},
{52, 0x00},
{53, 0x1C},
{54, 0x00},
{55, 0x00},
{56, 0x00},
{57, 0x00},
// Multisynth2 Setup (13.56MHz)
{58, 0x00},
{59, 0x01},
{60, 0x00},
{61, 0x18},
{62, 0x00},
{63, 0x00},
{64, 0x00},
{65, 0x00}};
static void spi_init(void) { static void spi_init(void) {
SPI_DDR |= (1 << SPI_SCK) | (1 << SPI_MOSI) | (1 << SPI_SS); SPI_DDR |= (1 << SPI_SCK) | (1 << SPI_MOSI) | (1 << SPI_SS);
SPI_PORT |= (1 << SPI_SS); SPI_PORT |= (1 << SPI_SS);
@ -370,18 +304,15 @@ static void lcd_write_integer_page(const uint32_t integer,
const bool invert) { const bool invert) {
if (digits != 0 || integer != 0) { if (digits != 0 || integer != 0) {
uint8_t input_digits = 0; uint8_t input_digits = 0;
uint32_t comperator = 1; uint16_t comperator = 1;
// Get digits
for (; comperator <= integer; comperator *= 10, input_digits++); for (; comperator <= integer; comperator *= 10, input_digits++);
// Print leading zeroes
for (int8_t i = digits - input_digits; i > 0; i--) { for (int8_t i = digits - input_digits; i > 0; i--) {
lcd_write_kerning(2, invert); lcd_write_kerning(2, invert);
lcd_write_digit_page(0, page, invert); lcd_write_digit_page(0, page, invert);
} }
// Print number itself
for (; comperator >= 10; comperator /= 10) { for (; comperator >= 10; comperator /= 10) {
lcd_write_kerning(2, invert); lcd_write_kerning(2, invert);
lcd_write_digit_page((integer % comperator) / (comperator / 10), lcd_write_digit_page((integer % comperator) / (comperator / 10),
@ -878,13 +809,6 @@ int main(void) {
(void) &twi_read_register; (void) &twi_read_register;
(void) &twi_write_register; (void) &twi_write_register;
for (uint16_t i = 0; i < sizeof(m_si5351_regs_15to92_149to170) / 2; i++)
twi_write_register(SI5351_ADDRESS, m_si5351_regs_15to92_149to170[i][0],
m_si5351_regs_15to92_149to170[i][1]);
twi_write_register(SI5351_ADDRESS, SI5351_REGISTER_177_PLL_RESET, 0xAC);
twi_write_register(SI5351_ADDRESS, SI5351_REGISTER_3_OUTPUT_ENABLE_CONTROL, 0x00);
// Enable interrupts // Enable interrupts
sei(); sei();