From feaf3666be65e241ad8f9783a605d5fbfc87bb4d Mon Sep 17 00:00:00 2001
From: Jens Ahrensfeld <jens@jayfield.org>
Date: Sat, 30 Mar 2019 11:48:05 +0000
Subject: [PATCH] [UART] - fixed baudrate calculation

[Bootloader]
- set baudrate top 115200

[HendiCtrl]
- set baudrate top 115200
- revised and fixed command interpreter
- added new commands: SW_VERSION, SW_IDENTIFIER, DEBUG on/on, Remote enter, Remote exit
- oven is switched off on entering / exiting remote


git-svn-id: http://moon:8086/svn/projects/HendiControl@173 fda53097-d464-4ada-af97-ba876c37ca34
---
 Control/firmware/Bootloader/machine.h |   9 +-
 Control/firmware/Bootloader/main.c    |   2 +-
 Control/firmware/Bootloader/uart.c    |  17 +--
 Control/firmware/Bootloader/uart.h    |   2 +-
 Control/firmware/HendiCtrl/machine.h  |   9 +-
 Control/firmware/HendiCtrl/main.c     | 198 ++++++++++++++++++++------
 Control/firmware/HendiCtrl/uart.c     |  17 +--
 Control/firmware/HendiCtrl/uart.h     |   2 +-
 8 files changed, 175 insertions(+), 81 deletions(-)

diff --git a/Control/firmware/Bootloader/machine.h b/Control/firmware/Bootloader/machine.h
index ff8bfa5..c8f4d0a 100644
--- a/Control/firmware/Bootloader/machine.h
+++ b/Control/firmware/Bootloader/machine.h
@@ -9,13 +9,6 @@
 #ifndef MACHINE_H_
 #define MACHINE_H_
 
-#if ARDUINO_NANO
-#define F_CPU			(16000000UL)	// MHz
-#else
-#define F_CPU			(18432000UL)	// MHz
-#endif
-
-
-
+#define F_CPU		(18432000UL)	// MHz
 
 #endif /* MACHINE_H_ */
\ No newline at end of file
diff --git a/Control/firmware/Bootloader/main.c b/Control/firmware/Bootloader/main.c
index f20ccd4..2111664 100644
--- a/Control/firmware/Bootloader/main.c
+++ b/Control/firmware/Bootloader/main.c
@@ -96,7 +96,7 @@ int main(void)
 	{
 		bootloader_enter();
 		led_bsel(1);
-		uart_init(9600);
+		uart_init(115200);
 		uart_puts("Hendi-Control Bootloader v1.2\n");
 		size_t image_size = 0;
 		uint16_t page_addr = 0xFFFF;
diff --git a/Control/firmware/Bootloader/uart.c b/Control/firmware/Bootloader/uart.c
index 1ea1313..2da2d89 100644
--- a/Control/firmware/Bootloader/uart.c
+++ b/Control/firmware/Bootloader/uart.c
@@ -12,14 +12,14 @@
 
 void uart_init(uint32_t baudrate)
 {
-	uint16_t prescale8 = UART_PRESCALE(baudrate, 8UL);
-	uint16_t prescale16 = UART_PRESCALE(baudrate, 16UL);
+	uint32_t prescale8 = UART_PRESCALE(baudrate, 8UL);
+	uint32_t prescale16 = UART_PRESCALE(baudrate, 16UL);
 	
-	uint32_t baud8 = ((prescale8+1) * 8);
-	uint32_t baud16 = ((prescale16+1) * 16);
+	uint32_t fcpu8 = (prescale8 * baudrate * 8);
+	uint32_t fcpu16 = (prescale16 * baudrate * 16);
 	
-	uint32_t err8 = abs(baudrate - baud8);
-	uint32_t err16 = abs(baudrate - baud16);
+	uint32_t err8 = abs(fcpu8 - F_CPU);
+	uint32_t err16 = abs(fcpu16 - F_CPU);
 	
 	uint16_t prescale = prescale16;
 	if (err8 < err16)
@@ -31,8 +31,9 @@ void uart_init(uint32_t baudrate)
 	}
 	
 	// Set baud rate
-	UBRR0L  = (uint8_t)prescale;
-	UBRR0H = (uint8_t)(prescale >> 8);
+	uint16_t reg = prescale - 1;
+	UBRR0L  = (uint8_t)reg;
+	UBRR0H = (uint8_t)(reg >> 8);
 	
 	// Enable receiver and transmitter
 	UCSR0B = (1<<TXEN0)|(1<<RXEN0);
diff --git a/Control/firmware/Bootloader/uart.h b/Control/firmware/Bootloader/uart.h
index 41dbd21..f452aaa 100644
--- a/Control/firmware/Bootloader/uart.h
+++ b/Control/firmware/Bootloader/uart.h
@@ -13,7 +13,7 @@
 
 #define XON                     17       /* XON Zeichen */
 #define XOFF                    19       /* XOFF Zeichen */
-#define UART_PRESCALE(baudrate, smpPerBit) ((5+ 10*F_CPU / (baudrate*smpPerBit) - 1)/10)
+#define UART_PRESCALE(baudrate, smpPerBit) ((5 + (10*F_CPU) / (baudrate*smpPerBit))/10)
 
 void uart_init(uint32_t baudrate);
 void uart_putc(char c);
diff --git a/Control/firmware/HendiCtrl/machine.h b/Control/firmware/HendiCtrl/machine.h
index ff8bfa5..c8f4d0a 100644
--- a/Control/firmware/HendiCtrl/machine.h
+++ b/Control/firmware/HendiCtrl/machine.h
@@ -9,13 +9,6 @@
 #ifndef MACHINE_H_
 #define MACHINE_H_
 
-#if ARDUINO_NANO
-#define F_CPU			(16000000UL)	// MHz
-#else
-#define F_CPU			(18432000UL)	// MHz
-#endif
-
-
-
+#define F_CPU		(18432000UL)	// MHz
 
 #endif /* MACHINE_H_ */
\ No newline at end of file
diff --git a/Control/firmware/HendiCtrl/main.c b/Control/firmware/HendiCtrl/main.c
index 1c6f172..14f1676 100755
--- a/Control/firmware/HendiCtrl/main.c
+++ b/Control/firmware/HendiCtrl/main.c
@@ -24,19 +24,35 @@
 #include "mcp42x6.h"
 
 #define PRINT(a,...)	printf(a, ##__VA_ARGS__)
-#define PRINT_PROMPT	putchar(0x0D);putchar(0x0A);putchar(':');
-#define USART_BAUDRATE	9600UL
-#define TIMER_HW_CLOCK	(F_CPU/8)
-#define TIMER_IRQ_CLOCK	1000UL
-#define TIMER_HW_RELOAD	(0xFFFF-(TIMER_HW_CLOCK/TIMER_IRQ_CLOCK))
+#define PRINT_DEBUG(a,...)				\
+		if (g_debug)					\
+		{								\
+			printf(a, ##__VA_ARGS__);	\
+		}								
+
+#define PRINT_CRLF				putchar(0x0D);putchar(0x0A);
+#define PRINT_ANSWER(a,...)		PRINT_CRLF; printf(a, ##__VA_ARGS__);
+#define PRINT_PROMPT			PRINT_CRLF; putchar(':');
+#define USART_BAUDRATE			(115200UL)
+#define TIMER_HW_CLOCK			(F_CPU/8)
+#define TIMER_IRQ_CLOCK			1000UL
+#define TIMER_HW_RELOAD			(0xFFFF-(TIMER_HW_CLOCK/TIMER_IRQ_CLOCK))
 
 #define TIMER_SW_DELAY_MS(dly)	((dly*TIMER_IRQ_CLOCK)/1000UL)
 
+static const uint16_t POTI_HSYTERSE = 1;
+
 int16_t adc_poti = 0;
 int16_t adc_swin = 0;
 int sw_in_last = 0;
 size_t cmdStrSize = 0;
 Fifo messageFifo;
+uint16_t g_power = 0;
+int g_debug = 0;
+int g_switch = 0;
+
+static const char SW_IDENTIFIER[] = "Hendi-Control"; 
+static const char SW_VERSION[] = "v1.1"; 
 
 FILE uart_file = FDEV_SETUP_STREAM(uart_putchar, NULL, _FDEV_SETUP_WRITE);
 
@@ -48,8 +64,9 @@ typedef enum _eSwitch
 
 void setSwitch(int on)
 {
+	g_switch = on;
 	const char *sw_str[2] = {"OFF", "ON"};
-	PRINT("Set switch to %s\n", sw_str[on != 0]);
+	PRINT_DEBUG("Set switch to %s\n", sw_str[on != 0]);
 	portSet(PwrSwitch_out, on != 0);
 }
 
@@ -61,7 +78,8 @@ typedef enum _ePower
 
 void setPower(uint16_t power)
 {
-	PRINT("Set Power to %u\n", power);
+	g_power = power;
+	PRINT_DEBUG("Set Power to %u\n", power);
 	uint8_t dac_cmd[] = {0x00, 0x00};					// 6.2 Write Volatile Memory (C2:C0 = ‘010’)
 	size_t res = MCP47x6_write_volatile_dac(power, dac_cmd, sizeof(dac_cmd));
 	i2c_send(0x60, I2C_WRITE, dac_cmd, res);
@@ -97,7 +115,7 @@ int main(void)
 	port_init();
 	
 	stdout = &uart_file;
-	printf("Hendi Control v1.1\n");
+	printf("%s %s\n", SW_IDENTIFIER, SW_VERSION);
 
 	uint8_t dac_cmd[] = {0x00, 0x00, 0x00};		// 6.1 Write Volatile DAC Register (C2:C0 = ‘00x’)
 	size_t res = MCP47x6_write_volatile_mem(0x0000, dac_cmd, sizeof(dac_cmd));
@@ -124,57 +142,134 @@ int main(void)
 				case Uart:
 				{
 					// Process Uart message
-					cmdStr[cmdStrSize] = 0;
 					char c = (char)msg.m.uart.data;
+					cmdStr[cmdStrSize] = 0;
 					
 					// Command finished with CR/LF
-					if (c == 0x0A || c == 0x0D)
+					if (c == 0x0D)
 					{
-						PRINT_PROMPT;
-						if (cmdStrSize < 1)
-						{
-							break;
-						}
-
-						if (state == StateNormal || state == StateRemote)
+						char *pArgs = cmdStr;
+						cmdStrSize = 0;
+						while (*pArgs)
 						{
 							// Power Control
-							if (toupper(cmdStr[0]) == 'P')
+							if (toupper(*pArgs) == 'P')
 							{
-								uint16_t arg = (uint16_t)strtol(cmdStr+1, (char **)NULL, 10);
-								setPower(arg);
-								timer_start(TIMER_TIMEOUT, TIMER_SW_DELAY_MS(5000));
-								state_next = StateRemote;
+								pArgs++;
+								if ((*pArgs) == '?')
+								{
+									PRINT_ANSWER("%04u", g_power);
+									pArgs++;
+								}
+								else
+								{
+									if (!isdigit(*pArgs))
+									{
+										break;
+									}
+									uint16_t arg = (uint16_t)strtol(pArgs, &pArgs, 10);
+									if (state == StateRemote)
+									{
+										setPower(arg);
+									}
+								}
 							}
 
 							// Switch Control
-							if (toupper(cmdStr[0]) == 'S')
+							else if (toupper(*pArgs) == 'S')
 							{
-								uint16_t arg = (uint16_t)strtol(cmdStr+1, (char **)NULL, 10);
-								setSwitch(arg);
-								timer_start(TIMER_TIMEOUT, TIMER_SW_DELAY_MS(5000));
-								state_next = StateRemote;
+								pArgs++;
+								if ((*pArgs) == '?')
+								{
+									PRINT_ANSWER("%u", g_switch);
+									pArgs++;
+								}
+								else
+								{
+									if (!isdigit(*pArgs))
+									{
+										break;
+									}
+									uint16_t arg = (uint16_t)strtol(pArgs, &pArgs, 10);
+								
+									if (state == StateRemote)
+									{
+										setSwitch(arg);
+									}
+								}
 							}
 
-							// Switch Control
-							if (toupper(cmdStr[0]) == 'X')
+							// Enter remote
+							else if (toupper(*pArgs) == 'R')
 							{
-								timer_stop(TIMER_TIMEOUT);
-								setPower(PowerLow);
-								setSwitch(SwitchOff);
+								pArgs++;
+								if (state == StateNormal)
+								{
+									setPower(PowerLow);
+									setSwitch(SwitchOff);
+									state_next = StateRemote;
+								}
 							}
-						}
-						cmdStrSize = 0;
+
+							// Exit remote
+							else if (toupper(*pArgs) == 'X')
+							{
+								pArgs++;
+								if (state == StateRemote)
+								{
+									setPower(PowerLow);
+									setSwitch(SwitchOff);
+									state_next = StateNormal;
+								}
+							}
+
+							// Debug Control
+							else if (toupper(*pArgs) == 'D')
+							{
+								pArgs++;
+								if (!isdigit(*pArgs))
+								{
+									break;
+								}
+								g_debug = (uint16_t)strtol(pArgs, &pArgs, 10);
+							}
+							
+							// SW identifier
+							else if (toupper(*pArgs) == 'I')
+							{
+								pArgs++;
+								PRINT_ANSWER("%s", SW_IDENTIFIER);
+							}
+
+							// Version
+							else if (toupper(*pArgs) == 'V')
+							{
+								pArgs++;
+								PRINT_ANSWER("%s", SW_VERSION);
+							}
+							
+							// no match
+							else
+							{
+								pArgs++;
+							}
+							
+						} // while (*pArgs)
+						timer_start(TIMER_TIMEOUT, TIMER_SW_DELAY_MS(10000));
+						PRINT_PROMPT;
 					}
 					else
 					{
-						if (cmdStrSize < (sizeof(cmdStr)-1))
+						if ((c != 0x0A) && (c != 0x0D))
 						{
-							cmdStr[cmdStrSize++] = c;
+							if (cmdStrSize < (sizeof(cmdStr)-1))
+							{
+								cmdStr[cmdStrSize++] = c;
+							}
+							putchar(c);
 						}
-						putchar(c);
-					}
-				}
+					} // if (c == 0x0D)
+				} // case Uart:
 				break;
 
 				case AdcComplete:
@@ -183,7 +278,7 @@ int main(void)
 					int16_t adc_curr = (int16_t)msg.m.adc.data;
 					if (adc_ch == 0)
 					{
-						if (((adc_curr - adc_poti) < -1) || ((adc_curr - adc_poti) > 1))
+						if (((adc_curr - adc_poti) <= -(int16_t)POTI_HSYTERSE) || ((adc_curr - adc_poti) >= (int16_t)POTI_HSYTERSE))
 						{
 							if (state == StateNormal)
 							{
@@ -206,14 +301,22 @@ int main(void)
 					{
 						case TIMER_GENERAL:
 						{
+							uint16_t interval = 1000;
+							uint16_t pulse = 50;
+							if (state == StateRemote)
+							{
+								interval = 500;
+								pulse = 50;
+							}
+
 							hb_state = !hb_state;
 							if (hb_state)
 							{
-								timer_start(timer_id, TIMER_SW_DELAY_MS(50));
+								timer_start(timer_id, TIMER_SW_DELAY_MS(pulse));
 							}
 							else
 							{
-								timer_start(timer_id, TIMER_SW_DELAY_MS(950));
+								timer_start(timer_id, TIMER_SW_DELAY_MS((interval-pulse)));
 							}
 							portSet(Led_HB, hb_state);
 						}
@@ -221,8 +324,11 @@ int main(void)
 						
 						case TIMER_TIMEOUT:
 						{
-							PRINT("Timeout!\n");
-							state_next = StateError;
+							if (state == StateRemote)
+							{
+								PRINT_DEBUG("Remote timeout!\n");
+								state_next = StateError;
+							}
 						}
 						break;
 						
@@ -232,7 +338,7 @@ int main(void)
 							int sw_in = adc_swin > 512;
 							if (sw_in != sw_in_last)
 							{
-								PRINT ("PwrSwitch_in = %d\n", sw_in);
+								PRINT_DEBUG ("PwrSwitch_in = %d\n", sw_in);
 								if (sw_in == 0)
 								{
 									if (state == StateError || state == StateRemote)
@@ -257,7 +363,7 @@ int main(void)
 		}
 		if (state != state_next)
 		{
-			PRINT("State change \"%s\" => \"%s\"\n", state_str[state], state_str[state_next]);
+			PRINT_DEBUG("State change \"%s\" => \"%s\"\n", state_str[state], state_str[state_next]);
 			if (state_next == StateError)
 			{
 				setPower(PowerLow);
diff --git a/Control/firmware/HendiCtrl/uart.c b/Control/firmware/HendiCtrl/uart.c
index b322e45..3a928db 100644
--- a/Control/firmware/HendiCtrl/uart.c
+++ b/Control/firmware/HendiCtrl/uart.c
@@ -41,14 +41,14 @@ void uart_init(Fifo *pFifo, uint32_t baudrate)
 {
 	g_pFifo = pFifo;
 
-	uint16_t prescale8 = UART_PRESCALE(baudrate, 8UL);
-	uint16_t prescale16 = UART_PRESCALE(baudrate, 16UL);
+	uint32_t prescale8 = UART_PRESCALE(baudrate, 8UL);
+	uint32_t prescale16 = UART_PRESCALE(baudrate, 16UL);
 	
-	uint32_t baud8 = ((prescale8+1) * 8);
-	uint32_t baud16 = ((prescale16+1) * 16);
+	uint32_t fcpu8 = (prescale8 * baudrate * 8);
+	uint32_t fcpu16 = (prescale16 * baudrate * 16);
 	
-	uint32_t err8 = abs(baudrate - baud8);
-	uint32_t err16 = abs(baudrate - baud16);
+	uint32_t err8 = abs(fcpu8 - F_CPU);
+	uint32_t err16 = abs(fcpu16 - F_CPU);
 	
 	uint16_t prescale = prescale16;
 	if (err8 < err16)
@@ -60,8 +60,9 @@ void uart_init(Fifo *pFifo, uint32_t baudrate)
 	}
 	
 	// Set baud rate
-	UBRR0L  = (uint8_t)prescale;
-	UBRR0H = (uint8_t)(prescale >> 8);
+	uint16_t reg = prescale - 1;
+	UBRR0L  = (uint8_t)reg;
+	UBRR0H = (uint8_t)(reg >> 8);
 	
 	// Enable receiver and transmitter
 	UCSR0B = (1<<TXEN0)|(1<<RXEN0);
diff --git a/Control/firmware/HendiCtrl/uart.h b/Control/firmware/HendiCtrl/uart.h
index d5f7b6a..4254d6b 100644
--- a/Control/firmware/HendiCtrl/uart.h
+++ b/Control/firmware/HendiCtrl/uart.h
@@ -12,7 +12,7 @@
 #include "machine.h"
 #include "fifo.h"
 
-#define UART_PRESCALE(baudrate, smpPerBit) ((5+ 10*F_CPU / (baudrate*smpPerBit) - 1)/10)
+#define UART_PRESCALE(baudrate, smpPerBit) ((5 + (10*F_CPU) / (baudrate*smpPerBit))/10)
 
 void uart_init(Fifo *pFifo, uint32_t baudrate);
 void uart_putc(char c);