no functional change

[digitaldcpower] / main.c

diff --git a/main.c b/main.c
index d3b660e..a1205be 100644 (file)
--- a/main.c
+++ b/main.c
@@ -9,6 +9,7 @@
 * Clock frequency     : Internal clock 8 Mhz 
 *********************************************/
 #include <avr/io.h>
+#include <avr/pgmspace.h>
 #include <inttypes.h>
 #include <avr/interrupt.h>
 #define F_CPU 8000000UL  // 8 MHz
@@ -24,7 +25,7 @@
 #include "hardware_settings.h"
 
 // change this version string when you compile:
-#define SWVERSION "ver: ddcp-0.6.4"
+#define SWVERSION "ver: ddcp-0.6.6"
 //#define DEBUGDISP 1
 
 //debug LED:
@@ -146,7 +147,7 @@ void delay_ms_uartcheck(uint8_t ms)
                                 uartstrpos++;
                         }
                         if (uartstrpos>UARTSTRLEN){
-                                uart_sendstr_P("\r\nERROR\r\n");
+                                uart_sendstr_p(PSTR("\r\nERROR\r\n"));
                                 uartstrpos=0; // empty buffer
                                 uartstr[0]='\0'; // just print prompt
                                 uart_has_one_line=1; 
@@ -212,18 +213,18 @@ static void store_permanent(void){
         }
         delay_ms_uartcheck(1); // check for uart without delay
         if (changeflag){
-                lcd_puts_P("setting stored");
+                lcd_puts_p(PSTR("setting stored"));
                 eeprom_write_byte((uint8_t *)0x0,19); // magic number
                 eeprom_write_word((uint16_t *)0x02,set_val[0]);
                 eeprom_write_word((uint16_t *)0x04,set_val[1]);
         }else{
                 if (bpress> 2){
                         // display software version after long press
-                        lcd_puts_P(SWVERSION);
+                        lcd_puts_p(PSTR(SWVERSION));
                         lcd_gotoxy(0,1);
-                        lcd_puts_P("tuxgraphics.org");
+                        lcd_puts_p(PSTR("tuxgraphics.org"));
                 }else{
-                        lcd_puts_P("already stored");
+                        lcd_puts_p(PSTR("already stored"));
                 }
         }
         delay_ms_uartcheck(200);
@@ -253,9 +254,9 @@ static uint8_t check_buttons(void){
                         }
                         // version
                         if (uartstr[0]=='v' && uartstr[1]=='e'){
-                                uart_sendstr_p(P("  "));
-                                uart_sendstr_p(P(SWVERSION));
-                                uart_sendstr_p(P("\r\n"));
+                                uart_sendstr_p(PSTR("  "));
+                                uart_sendstr_p(PSTR(SWVERSION));
+                                uart_sendstr_p(PSTR("\r\n"));
                                 cmdok=1;
                         }
                         // store
@@ -275,18 +276,18 @@ static uint8_t check_buttons(void){
                         }
                         // help
                         if (uartstr[0]=='h' || uartstr[0]=='H'){
-                                uart_sendstr_p(P("  Usage: u=V*10|i=mA/10|store|help|version\r\n"));
-                                uart_sendstr_p(P("  Examples:\r\n"));
-                                uart_sendstr_p(P("  set 6V: u=60\r\n"));
-                                uart_sendstr_p(P("  max 200mA: i=20\r\n"));
+                                uart_sendstr_p(PSTR("  Usage: u=V*10|i=mA/10|store|help|version\r\n"));
+                                uart_sendstr_p(PSTR("  Examples:\r\n"));
+                                uart_sendstr_p(PSTR("  set 6V: u=60\r\n"));
+                                uart_sendstr_p(PSTR("  max 200mA: i=20\r\n"));
                                 cmdok=1;
                         }
                         if (uartprint_ok){
                                 cmdok=1;
-                                uart_sendstr_p(P("  ok\r\n"));
+                                uart_sendstr_p(PSTR("  ok\r\n"));
                         }
                         if (uartstr[0]!='\0' && cmdok==0){
-                                uart_sendstr_p(P("  command unknown\r\n"));
+                                uart_sendstr_p(PSTR("  command unknown\r\n"));
                         }
                         uart_sendchar('#'); // marking char for script interface
                         int_to_dispstr(measured_val[1],buf,1);