clyne/stm-game
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adc measures vdd; sleep mode for 1.1mA idd

Browse Source
This commit is contained in:
Clyne 2020-11-29 15:06:13 -05:00
parent fdf1a42bba
commit 764446fb86
5 changed files with 176 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cfg/halconf.h
View File

@ -44,7 +44,7 @@
* @brief Enables the ADC subsystem.
*/
#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
#define HAL_USE_ADC FALSE
#define HAL_USE_ADC TRUE
#endif
/**

12
cfg/mcuconf.h
View File

@ -42,18 +42,18 @@
#define STM32_VOS STM32_VOS_1P8
#define STM32_PVD_ENABLE FALSE
#define STM32_PLS STM32_PLS_LEV0
#define STM32_HSI16_ENABLED FALSE
#define STM32_HSI16_ENABLED TRUE
#define STM32_HSI16_DIVIDER_ENABLED FALSE
#define STM32_LSI_ENABLED TRUE
#define STM32_HSE_ENABLED FALSE
#define STM32_LSE_ENABLED FALSE
#define STM32_ADC_CLOCK_ENABLED FALSE
#define STM32_MSIRANGE STM32_MSIRANGE_2M
#define STM32_SW STM32_SW_MSI
//#define STM32_ADC_CLOCK_ENABLED FALSE
#define STM32_MSIRANGE STM32_MSIRANGE_4M
#define STM32_SW STM32_SW_HSI16
#define STM32_PLLSRC STM32_PLLSRC_HSI16
#define STM32_PLLMUL_VALUE 4
#define STM32_PLLDIV_VALUE 2
#define STM32_HPRE STM32_HPRE_DIV1
#define STM32_HPRE STM32_HPRE_DIV4
#define STM32_PPRE1 STM32_PPRE1_DIV1
#define STM32_PPRE2 STM32_PPRE2_DIV1
#define STM32_MCOSEL STM32_MCOSEL_NOCLOCK
@ -85,7 +85,7 @@
* ADC driver system settings.
* Note, IRQ is shared with EXT channels 21 and 22.
*/
#define STM32_ADC_USE_ADC1 FALSE
#define STM32_ADC_USE_ADC1 TRUE
#define STM32_ADC_ADC1_CKMODE STM32_ADC_CKMODE_ADCCLK
#define STM32_ADC_ADC1_DMA_PRIORITY 2
#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY 2

118
dogs.c
View File

@ -212,3 +212,121 @@ void draw_bitmap(int x, int y, const unsigned char *buffer)
}
}
static const unsigned char draw_number_bitmaps[10][10] = {
{ 8, 8, // '0'
0b00011000,
0b00100100,
0b01000010,
0b01000010,
0b01000010,
0b01000010,
0b00100100,
0b00011000,
},
{ 8, 8, // '1'
0b00011000,
0b00101000,
0b00001000,
0b00001000,
0b00001000,
0b00001000,
0b00001000,
0b00111110,
},
{ 8, 8, // '2'
0b00011000,
0b00100100,
0b01000010,
0b00000010,
0b00000100,
0b00001000,
0b00010000,
0b01111110,
},
{ 8, 8, // '3'
0b00111000,
0b01000100,
0b00000010,
0b00111100,
0b00000100,
0b00000010,
0b01000100,
0b00111000,
},
{ 8, 8, // '4'
0b00000100,
0b00001100,
0b00010100,
0b00100100,
0b01111100,
0b00000100,
0b00000100,
0b00000100,
},
{ 8, 8, // '5'
0b01111110,
0b01000000,
0b01111000,
0b00000100,
0b00000010,
0b00000010,
0b01000100,
0b00111000,
},
{ 8, 8, // '6'
0b00011100,
0b00100000,
0b01000000,
0b01011100,
0b01100010,
0b01000010,
0b00100100,
0b00011000,
},
{ 8, 8, // '7'
0b01111110,
0b00000010,
0b00000100,
0b00001000,
0b00010000,
0b00010000,
0b00010000,
0b00010000,
},
{ 8, 8, // '8'
0b00011000,
0b00100100,
0b01000010,
0b00111100,
0b00100100,
0b01000010,
0b00100100,
0b00011000,
},
{ 8, 8, // '9'
0b00011000,
0b00100100,
0b01000010,
0b00100010,
0b00011110,
0b00000010,
0b01000100,
0b00111000,
},
};
void draw_number(int x, int y, int number)
{
if (number < 0)
number = -number;
int tmp = number;
int count;
for (count = 0; tmp; count++)
tmp /= 10;
x += count * 8;
do {
x -= 8;
draw_bitmap(x, y, draw_number_bitmaps[number % 10]);
} while (number /= 10);
}

1
dogs.h
View File

@ -23,6 +23,7 @@ void dogs_flush();
void draw_pixel(int x, int y, bool state);
void draw_bitmap(int x, int y, const unsigned char *buffer);
void draw_number(int x, int y, int number);
#endif // DOGS_H_

51
main.c
View File

@ -19,8 +19,47 @@
* - Serial through LPUART1 works (38400 baud, takes over swdio pins)
* - Display comm. over SPI, can clear screen
* - Can read buttons through PAL (through interrupts now)
* - Use ADC to read Vintref, print to screen in mV
* - Sleep mode via WFI, saves ~0.5mA (we're running around 1.1mA)
*/
static volatile bool adc_is_complete = false;
static void adc_callback(ADCDriver *adcp)
{
adc_is_complete = true;
}
static const ADCConfig adccfg = {
.dummy = 0
};
static const ADCConversionGroup adcgrpcfg = {
.circular = false,
.num_channels = 1,
.end_cb = adc_callback,
.error_cb = NULL,
.cfgr1 = ADC_CFGR1_RES_12BIT, /* CFGR1 */
.cfgr2 = 0, /* CFGR2 */
.tr = ADC_TR(0, 0), /* TR */
.smpr = ADC_SMPR_SMP_1P5, /* SMPR */
.chselr = ADC_CHSELR_CHSEL17 /* CHSELR */
};
static int readVddmv()
{
adcsample_t reading = 0;
adcStart(&ADCD1, &adccfg);
adcSTM32EnableVREF(&ADCD1);
adcStartConversion(&ADCD1, &adcgrpcfg, &reading, 1);
while (!adc_is_complete);
adcStopConversion(&ADCD1);
adcSTM32DisableVREF(&ADCD1);
adcStop(&ADCD1);
return 3000 * /* CAL */ *((adcsample_t *)0x1FF80078) / reading;
}
THD_WORKING_AREA(waThread2, 96);
THD_FUNCTION(Thread2, arg)
{
@ -42,6 +81,8 @@ THD_FUNCTION(Thread2, arg)
int x = 0, y = 0;
int counter = 0;
int mv = readVddmv();
while (1) {
chThdSleepMilliseconds(100);
@ -55,8 +96,14 @@ THD_FUNCTION(Thread2, arg)
else if ((b & (BUTTON_JOYDL | BUTTON_JOYUL)) == (BUTTON_JOYDL | BUTTON_JOYUL))
x--;
if (++counter == 50) {
counter = 0;
mv = readVddmv();
}
dogs_clear();
draw_bitmap(x, y, testbitmap);
draw_number(0, 50, mv);
dogs_flush();
}
}
@ -69,6 +116,7 @@ int main(void)
{
halInit();
chSysInit();
RCC->CFGR |= RCC_CFGR_STOPWUCK;
buttons_init();
@ -85,7 +133,8 @@ int main(void)
task but YOU MUST NEVER TRY TO SLEEP OR WAIT in this loop. Note that
this tasks runs at the lowest priority level so any instruction added
here will be executed after all other tasks have been started. */
while (1);
while (1)
asm("wfi");
}
void HardFault_Handler()