diff --git a/application.c b/application.c index 28071bf..582f0c5 100644 --- a/application.c +++ b/application.c @@ -22,7 +22,7 @@ #include // standard integer types #include // standard utilities #include // string utilities -#include // date/time utilities +#include // mathematical utilities /* STM32 (including CM3) libraries */ #include // Cortex M3 utilities @@ -35,12 +35,19 @@ #include // independent watchdog utilities #include // debug utilities #include // flash utilities +#include // ADC utilities +#include // real time clock utilities /* own libraries */ #include "global.h" // board definitions #include "print.h" // printing utilities #include "usart.h" // USART utilities #include "usb_cdcacm.h" // USB CDC ACM utilities +#include "led_ws2812b.h" // WS2812B LEDs utilities +#include "rtc_dcf77.h" // DCF77 time receiver utilities + +/** use external RTC, else use internal RTC */ +#define EXTERNAL_RTC false #define WATCHDOG_PERIOD 10000 /**< watchdog period in ms */ @@ -48,10 +55,53 @@ * @{ */ volatile bool rtc_internal_tick_flag = false; /**< flag set when internal RTC ticked */ +volatile bool photoresistor_flag = false; /**< flag set when ambient luminosity is measured */ /** @} */ -time_t time_rtc = 0; /**< time (seconds since Unix Epoch) */ -struct tm* time_tm; /**< time in tm format (time zones are not handled for non-POSIX environments) */ +/** @defgroup main_ticks ticks per time units + * @note these are derived from TICKS_PER_SECOND + * @note I have to use type variables because defines would be stored in signed integers, leading to an overflow it later calculations + * @{ + */ +/** the number of ticks in one second (32768 divisor greater than 256*LED_WS2812B_LEDS/60) */ +#define TICKS_PER_SECOND 256UL +/** number of ticks in one second */ +const uint32_t ticks_second = TICKS_PER_SECOND; +/** number of ticks in one minute */ +const uint32_t ticks_minute = 60*TICKS_PER_SECOND; +/** number of ticks in one hour */ +const uint32_t ticks_hour = 60*60*TICKS_PER_SECOND; +/** number of ticks in one midday (12 hours) */ +const uint32_t ticks_midday = 12*60*60*TICKS_PER_SECOND; +/** @} */ + +/** @defgroup photoresistor_adc ADC used to ambient luminosity + * @{ + */ +#define PHOTORESISTOR_ADC_CHANNEL ADC_CHANNEL1 /**< ADC channel */ +#define PHOTORESISTOR_PORT GPIOA /**< port on which the battery is connected */ +#define PHOTORESISTOR_PORT_RCC RCC_GPIOA /**< timer port peripheral clock */ +#define PHOTORESISTOR_PIN GPIO1 /**< pin of the port on which the battery is connected */ +/** @} */ + +/** RGB values for the WS2812B clock LEDs */ +uint8_t clock_leds[LED_WS2812B_LEDS*3] = {0}; +/** gamma correction lookup table (common for all colors) */ +uint8_t gamma_correction_lut[256] = {0}; +/** photo-resistor measurement of ambient luminosity */ +volatile uint16_t photoresistor_value = 0; +/** photo-resistor voltage for the minimum brightness */ +#define PHOTORESISTOR_MIN 2.7 +/** photo-resistor voltage for the maximum brightness */ +#define PHOTORESISTOR_MAX 1.7 +/** factor to dim LED of the clock, depending on the ambient luminosity */ +float clock_brightness = 1; +/** minimum LED brightness */ +#define BRIGHTNESS_MIN 0.2 +/** maximum LED brightness */ +#define BRIGHTNESS_MAX 1.0 +/** the factor to change the brightness */ +#define BRIGHTNESS_FACTOR 0.1 size_t putc(char c) { @@ -99,6 +149,8 @@ static void process_command(char* str) if (0==strcmp(word,"h") || 0==strcmp(word,"help") || 0==strcmp(word,"?")) { printf("available commands:\n"); printf("led [on|off|toggle]\n"); + printf("time [HH:MM:SS]\n"); + printf("DCF77 on|off\n"); } else if (0==strcmp(word,"l") || 0==strcmp(word,"led")) { word = strtok(NULL,delimiter); if (!word) { @@ -123,38 +175,25 @@ static void process_command(char* str) } else if (0==strcmp(word,"time")) { word = strtok(NULL,delimiter); if (!word) { - time_rtc = rtc_get_counter_val(); // get time from internal RTC - time_tm = localtime(&time_rtc); // convert time - printf("time: %02d:%02d:%02d\n", time_tm->tm_hour, time_tm->tm_min, time_tm->tm_sec); + printf("time: %02u:%02u:%02u\n", rtc_get_counter_val()/ticks_hour, (rtc_get_counter_val()%ticks_hour)/ticks_minute, (rtc_get_counter_val()%ticks_minute)/ticks_second); // get and print time from internal RTC } else if (strlen(word)!=8 || word[0]<'0' || word[0]>'2' || word[1]<'0' || word[1]>'9' || word[3]<'0' || word[3]>'5' || word[4]<'0' || word[4]>'9' || word[6]<'0' || word[6]>'5' || word[7]<'0' || word[7]>'9') { // time format is incorrect goto error; } else { - time_rtc = rtc_get_counter_val(); // get time from internal RTC - time_tm = localtime(&time_rtc); // convert time - time_tm->tm_hour = (word[0]-'0')*10+(word[1]-'0')*1; // set hours - time_tm->tm_min = (word[3]-'0')*10+(word[4]-'0')*1; // set minutes - time_tm->tm_sec = (word[6]-'0')*10+(word[7]-'0')*1; // set seconds - time_rtc = mktime(time_tm); // get back seconds - rtc_set_counter_val(time_rtc); // save time to internal RTC + rtc_set_counter_val(((word[0]-'0')*10+(word[1]-'0')*1)*ticks_hour+((word[3]-'0')*10+(word[4]-'0')*1)*ticks_minute+((word[6]-'0')*10+(word[7]-'0')*1)*ticks_second); // set time in internal RTC counter printf("time set\n"); } - } else if (0==strcmp(word,"date")) { + } else if (0==strcmp(word,"DCF77")) { word = strtok(NULL,delimiter); if (!word) { - time_rtc = rtc_get_counter_val(); // get time from internal RTC - time_tm = localtime(&time_rtc); // convert time - printf("date: %d-%02d-%02d\n", 1900+time_tm->tm_year, time_tm->tm_mon+1, time_tm->tm_mday); - } else if (strlen(word)!=10 || word[0]!='2' || word[1]!='0' || word[2]<'0' || word[2]>'9' || word[3]<'0' || word[3]>'9' || word[5]<'0' || word[5]>'1' || word[6]<'0' || word[6]>'9' || word[8]<'0' || word[8]>'3' || word[9]<'0' || word[9]>'9') { - goto error; + goto error; + } else if (0==strcmp(word,"on")) { + rtc_dcf77_on(); // switch DCF77 on + printf("DCF77 receiver switched on\n"); // notify user + } else if (0==strcmp(word,"off")) { + rtc_dcf77_off(); // switch DCF77 off + printf("DCF77 receiver switched off\n"); // notify user } else { - time_rtc = rtc_get_counter_val(); // get time from internal RTC - time_tm = localtime(&time_rtc); // convert time - time_tm->tm_year = ((word[0]-'0')*1000+(word[1]-'0')*100+(word[2]-'0')*10+(word[3]-'0')*1)-1900; // set year - time_tm->tm_mon = (word[5]-'0')*10+(word[6]-'0')*1-1; // set month - time_tm->tm_mday = (word[8]-'0')*10+(word[9]-'0')*1; // set day - time_rtc = mktime(time_tm); // get back seconds - rtc_set_counter_val(time_rtc); // save time to internal RTC - printf("date set\n"); + goto error; } } else { goto error; @@ -166,6 +205,162 @@ error: return; } +/** switch off all clock LEDs + * @note LEDs need to be set separately + */ +static void clock_clear(void) +{ + // set all colors of all LEDs to 0 + for (uint16_t i=0; i=LED_WS2812B_LEDS*256 || led_minute>=LED_WS2812B_LEDS*256) { // a calculation error occurred + return; + } + // show hours and minutes on LEDs + if (led_hour>led_minute) { + // show hours in blue (and clear other LEDs) + for (uint16_t led=0; led=0xff) { // full hours + clock_leds[led*3+2] = 0xff; + } else { // running hours + clock_leds[led*3+2] = led_hour; + } + led_hour -= clock_leds[led*3+2]; + } + // show minutes in green (override hours) + for (uint16_t led=0; led0; led++) { + clock_leds[led*3+0] = 0; + if (led_minute>=0xff) { // full minutes + clock_leds[led*3+1] = 0xff; + } else { // running minutes + clock_leds[led*3+1] = led_minute; + } + led_minute -= clock_leds[led*3+1]; + clock_leds[led*3+2] = 0; + } + } else { + // show minutes in green (and clear other LEDs) + for (uint16_t led=0; led=0xff) { // full minutes + clock_leds[led*3+1] = 0xff; + } else { // running minutes + clock_leds[led*3+1] = led_minute; + } + led_minute -= clock_leds[led*3+1]; + clock_leds[led*3+2] = 0; + } + // show hours in blue (override minutes) + for (uint16_t led=0; led0; led++) { + clock_leds[led*3+0] = 0; + clock_leds[led*3+1] = 0; + if (led_hour>=0xff) { // full hours + clock_leds[led*3+2] = 0xff; + } else { // running hours + clock_leds[led*3+2] = led_hour; + } + led_hour -= clock_leds[led*3+2]; + } + } + // don't show seconds on full minute (better for first time setting, barely visible else) + if (time%ticks_minute==0) { + return; + } + uint32_t led_second = (LED_WS2812B_LEDS*(256*(uint64_t)(time%ticks_minute)))/ticks_minute; // scale to LED brightnesses for seconds + uint8_t brightness_second = led_second%256; // get brightness for seconds for last LED + uint16_t second_led = (LED_WS2812B_LEDS*(time%ticks_minute))/ticks_minute; // get LED for seconds (we only use the last LED as runner instead of all LEDs as arc) + // set seconds LED + clock_leds[second_led*3+0] = brightness_second; + //clock_leds[second_led*3+1] = 0; // clear other colors (minutes/hours indication) + //clock_leds[second_led*3+2] = 0; // clear other colors (minutes/hours indication) + // set previous seconds LED + second_led = ((second_led==0) ? LED_WS2812B_LEDS-1 : second_led-1); // previous LED + clock_leds[second_led*3+0] = 0xff-brightness_second; + //clock_leds[second_led*3+1] = 0; // clear other colors (minutes/hours indication) + //clock_leds[second_led*3+2] = 0; // clear other colors (minutes/hours indication) +} + +/** set the LEDs + * @details set the LED colors on WS2812B LEDs + * @note WS2812B LED color values need to be transmitted separately + */ +static void clock_leds_set(void) +{ + for (uint16_t i=0; i255 ? 512-i-1 : i); // get fade brightness + for (uint8_t hour=0; hour<12; hour++) { // set all hour colors + uint16_t led = LED_WS2812B_LEDS/12*hour; // get LED four hour mark + clock_leds[led*3+0] = brightness; // set brightness + clock_leds[led*3+1] = brightness; // set brightness + clock_leds[led*3+2] = brightness; // set brightness + } + clock_leds_set(); // set the colors of all LEDs + led_ws2812b_transmit(); // transmit set color + // delay some time for the animation + for (uint32_t j=0; j<40000; j++) { + __asm__("nop"); + } + } +} + /** program entry point * this is the firmware function started by the micro-controller */ @@ -207,14 +402,64 @@ void main(void) // setup RTC printf("setup internal RTC: "); - rtc_auto_awake(RCC_LSE, 32768-1); // ensure internal RTC is on, uses the 32.678 kHz LSE, and the prescale is set to our tick speed, else update backup registers accordingly (power off the micro-controller for the change to take effect) + rtc_auto_awake(RCC_LSE, 32768/ticks_second-1); // ensure internal RTC is on, uses the 32.678 kHz LSE, and the prescale is set to our tick speed, else update backup registers accordingly (power off the micro-controller for the change to take effect) rtc_interrupt_enable(RTC_SEC); // enable RTC interrupt on "seconds" nvic_enable_irq(NVIC_RTC_IRQ); // allow the RTC to interrupt printf("OK\n"); - time_rtc= rtc_get_counter_val(); // get time from internal RTC - time_tm = localtime(&time_rtc); // convert time - printf("date: %d-%02d-%02d %02d:%02d:%02d\n", 1900+time_tm->tm_year, time_tm->tm_mon+1, time_tm->tm_mday, time_tm->tm_hour, time_tm->tm_min, time_tm->tm_sec); + // setup DCF77 + printf("setup DCF77 receiver: "); + rtc_dcf77_setup(); // setup DCF77 module + printf("OK\n"); + rtc_dcf77_on(); // switch DCF77 on to get correct time + printf("DCF77 receiver switched on\n"); // notify user + + // setup WS2812B LEDs + printf("setup LEDs: "); + for (uint16_t i=0; itm_sec) { // new minute - printf("time: %02d:%02d:%02d\n", time_tm->tm_hour, time_tm->tm_min, time_tm->tm_sec); + if ((ticks_time%(ticks_second/10))==0) { // one tenth of a second passed + adc_start_conversion_regular(ADC1); // start measuring ambient luminosity } + if ((ticks_time%ticks_second)==0) { // one second passed + led_toggle(); // LED toggling confuses the 32.768 kHz oscillator on the blue pill + } + if ((ticks_time%ticks_minute)==0) { // one minute passed + printf("%02u:%02u:%02u\n", ticks_time/ticks_hour, (ticks_time%ticks_hour)/ticks_minute, (ticks_time%ticks_minute)/ticks_second); // display external time + } + if ((ticks_time%ticks_hour)==0) { // one hours passed + clock_hours(); // show hour markers + rtc_dcf77_on(); // switch DCF77 on to update/correct time + printf("DCF77 receiver switched on\n"); // notify user + } + if (ticks_time>=ticks_midday*2) { // one day passed + rtc_set_counter_val(rtc_get_counter_val()%ticks_midday); // reset time counter + } + clock_set_time(ticks_time); // set time + } + while (photoresistor_flag) { // new photo-resistor value has been measured + photoresistor_flag = false; // reset flag + action = true; // action has been performed + float photoresistor_voltage = photoresistor_value*1.2/ref_value; // calculate voltage from value + float new_clock_brightness = 0; // to calculate new brightness + if (photoresistor_voltagePHOTORESISTOR_MIN) { // low ambient luminosity + new_clock_brightness = BRIGHTNESS_MIN; // set low brightness + } else { // intermediate ambient luminosity + new_clock_brightness = BRIGHTNESS_MIN+(BRIGHTNESS_MAX-BRIGHTNESS_MIN)*(1-(photoresistor_voltage-PHOTORESISTOR_MAX)/(PHOTORESISTOR_MIN-PHOTORESISTOR_MAX)); // set variable brightness + } + clock_brightness = clock_brightness*(1-BRIGHTNESS_FACTOR)+new_clock_brightness*BRIGHTNESS_FACTOR; // calculate new brightness based on factor + //printf("photo-resistor voltage: %f, clock brightness: %f\n", photoresistor_voltage, clock_brightness); } if (action) { // go to sleep if nothing had to be done, else recheck for activity action = false; @@ -288,3 +579,10 @@ void rtc_isr(void) rtc_clear_flag(RTC_SEC); // clear flag rtc_internal_tick_flag = true; // notify to show new time } + +/** interrupt service routine called when ADC conversion completed */ +void adc1_2_isr(void) +{ + photoresistor_value = adc_read_regular(ADC1); // read measured photo-resistor value (clears interrupt flag) + photoresistor_flag = true; // notify new ambient luminosity has been measured +}