ошибки

This commit is contained in:
dimoniche 2019-08-01 00:40:43 +03:00
parent 05f1e7c485
commit 5ba4a5f6b9
10 changed files with 55 additions and 747 deletions

View File

@ -111,6 +111,11 @@ void DrawMenu(void)
{
if((SystemTime%2))
{
if(currentPosition >= COUNT_POST + COUNT_VACUUM)
{
currentPosition = 0;
}
for( ;currentPosition < COUNT_POST + COUNT_VACUUM; currentPosition++)
{
if((enable_coin[currentPosition]
@ -121,10 +126,15 @@ void DrawMenu(void)
else if((enable_coin[currentPosition])
&& currentPosition >= COUNT_POST) break;
}
if(currentPosition >= COUNT_POST + COUNT_VACUUM)
{
currentPosition = 0;
return;
}
if(currentPosition >= COUNT_POST + COUNT_VACUUM) currentPosition = 0;
UserPrintMoneyMenu(currentPosition++);
UserPrintMoneyMenu(currentPosition);
currentPosition++;
}
}
@ -195,12 +205,16 @@ void UserAppTask(void *p_arg)
break;
}
for(int post = 0; post < COUNT_POST; post++)
for(int post = 0; post < COUNT_POST + COUNT_VACUUM; post++)
{
GetData(&EnableCoinDesc, &enable_coin[post], post, DATA_FLAG_DIRECT_INDEX);
GetData(&EnableValidatorDesc, &cash_enable[post], post, DATA_FLAG_DIRECT_INDEX);
GetData(&EnableBankDesc, &bank_enable[post], post, DATA_FLAG_DIRECT_INDEX);
GetData(&EnableSignalDesc, &enable_signal[post], post, DATA_FLAG_DIRECT_INDEX);
if(post < COUNT_POST)
{
GetData(&EnableValidatorDesc, &cash_enable[post], post, DATA_FLAG_DIRECT_INDEX);
GetData(&EnableBankDesc, &bank_enable[post], post, DATA_FLAG_DIRECT_INDEX);
GetData(&EnableSignalDesc, &enable_signal[post], post, DATA_FLAG_DIRECT_INDEX);
}
accmoney = GetAcceptedMoney(post);
accmoney += GetAcceptedBankMoney(post);
@ -448,7 +462,7 @@ void UserAppTask(void *p_arg)
if (accmoney > 0)
{
wash_State[number_post] = washing;
SaveEventRecord(0, JOURNAL_EVENT_WASHING, number_post);
SaveEventRecord(number_post, JOURNAL_EVENT_WASHING, number_post);
}
}
break;
@ -563,8 +577,8 @@ void UserAppTask(void *p_arg)
break;
case EVENT_KEY_F1:
testMoney = 100;
PostUserEvent(EVENT_BANK_INSERTED_POST1);
//testMoney = 100;
//PostUserEvent(EVENT_BANK_INSERTED_POST4);
/*FIO4SET_bit.P4_28 = 1;
OSTimeDly(50);
@ -587,11 +601,11 @@ void UserAppTask(void *p_arg)
FIO4CLR_bit.P4_28 = 1;*/
break;
case EVENT_KEY_F2:
PostUserEvent(EVENT_CASH_PRINT_CHECK_POST1);
//PostUserEvent(EVENT_STOP_MONEY_POST4);
break;
case EVENT_KEY_F3:
testMoney = 100;
PostUserEvent(EVENT_CASH_INSERTED_POST1);
//testMoney = 100;
//PostUserEvent(EVENT_WAIT_CASH_PRINT_CHECK_POST4);
break;
#endif
default:

View File

@ -225,22 +225,22 @@ void GetEventStr(char* str, char event)
break;
case JOURNAL_EVENT_PRINT_BILL_ONLINE_POST1:
sprintf(str, "Ïå÷.online ÷åêà ïîñò 1");
sprintf(str, "Печ.эл.чека пост 1");
break;
case JOURNAL_EVENT_PRINT_BILL_ONLINE_POST2:
sprintf(str, "Ïå÷. online ÷åêà ïîñò 2");
sprintf(str, "Печ.эл.чека пост 2");
break;
case JOURNAL_EVENT_PRINT_BILL_ONLINE_POST3:
sprintf(str, "Ïå÷.online ÷åêà ïîñò 3");
sprintf(str, "Печ.эл.чека пост 3");
break;
case JOURNAL_EVENT_PRINT_BILL_ONLINE_POST4:
sprintf(str, "Ïå÷.online ÷åêà ïîñò 4");
sprintf(str, "Печ.эл.чека пост 4");
break;
case JOURNAL_EVENT_PRINT_BILL_ONLINE_POST5:
sprintf(str, "Ïå÷.online ÷åêà ïîñò 5");
sprintf(str, "Печ.эл.чека пост 5");
break;
case JOURNAL_EVENT_PRINT_BILL_ONLINE_POST6:
sprintf(str, "Ïå÷.online ÷åêà ïîñò 6");
sprintf(str, "Печ.эл.чека пост 6");
break;
case JOURNAL_EVENT_PRINT_Z:

View File

@ -1,678 +0,0 @@
#include <includes.h>
#include "uart.h"
#define UART1_RX_BUFSIZE 128
#define UART1_TX_BUFSIZE 64
unsigned char UART1TXBuffer[UART1_TX_BUFSIZE];
unsigned short UART1TXhead = 0;
unsigned short UART1TXtail = 0;
unsigned short UART1TXcount = 0;
unsigned char UART1RXBuffer[UART1_RX_BUFSIZE];
unsigned short UART1RXhead = 0;
unsigned short UART1RXtail = 0;
unsigned short UART1RXcount = 0;
void Uart1_Flush(void)
{
#if OS_CRITICAL_METHOD == 3
OS_CPU_SR cpu_sr = 0;
#endif
OS_ENTER_CRITICAL();
UART1TXcount = UART1TXhead = UART1TXtail = 0;
UART1RXcount = UART1RXhead = UART1RXtail = 0;
U1IER_bit.THREIE = 0;
U1FCR = 0x06;
OS_EXIT_CRITICAL();
}
int Uart1_Getc(void)
{
#if OS_CRITICAL_METHOD == 3
OS_CPU_SR cpu_sr = 0;
#endif
OS_ENTER_CRITICAL();
int res = -1;
if (UART1RXcount > 0)
{
UART1RXcount--;
res = UART1RXBuffer[UART1RXhead++];
UART1RXhead %= UART1_RX_BUFSIZE;
}
OS_EXIT_CRITICAL();
return res;
}
int Uart1_Gotc(void)
{
#if OS_CRITICAL_METHOD == 3
OS_CPU_SR cpu_sr = 0;
#endif
OS_ENTER_CRITICAL();
int res = 0;
if (UART1RXcount > 0) res = 1;
OS_EXIT_CRITICAL();
return res;
}
int Uart1_Ready()
{
#if OS_CRITICAL_METHOD == 3
OS_CPU_SR cpu_sr = 0;
#endif
OS_ENTER_CRITICAL();
int res = 0;
if (UART1TXcount < UART1_TX_BUFSIZE) res = 1;
OS_EXIT_CRITICAL();
return res;
}
int Uart1_Putc(unsigned char ch)
{
#if OS_CRITICAL_METHOD == 3
OS_CPU_SR cpu_sr = 0;
#endif
OS_ENTER_CRITICAL();
int res = 0;
if (UART1TXcount < UART1_TX_BUFSIZE)
{
if (UART1TXcount == 0)
{
if (U1LSR_bit.THRE)
{
U1THR = ch;
}
else
{
UART1TXcount++;
UART1TXBuffer[UART1TXtail++] = ch;
UART1TXtail %= UART1_TX_BUFSIZE;
U1IER = 3;
}
}
else
{
UART1TXcount++;
UART1TXBuffer[UART1TXtail++] = ch;
UART1TXtail %= UART1_TX_BUFSIZE;
U1IER = 3;
}
}
else
{
res = -1;
}
OS_EXIT_CRITICAL();
return res;
}
void Uart1_Isr(void)
{
CPU_INT08U IIRValue;
CPU_INT08U u1lsr;
volatile CPU_INT08U Dummy;
IIRValue = U1IIR;
IIRValue >>= 1; /* skip pending bit in IIR */
IIRValue &= 0x07; /* check bit 1~3, interrupt identification */
if (IIRValue == 2) /* Receive Data Available */
{
/* Receive Data Available */
if (U1LSR_bit.DR)
{
if (UART1RXcount < UART1_RX_BUFSIZE)
{
UART1RXBuffer[UART1RXtail++] = U1RBR;
UART1RXtail %= UART1_RX_BUFSIZE;
UART1RXcount++;
}
else
{
Dummy = U1RBR;
}
}
}
else if (IIRValue == 1) /* THRE, transmit holding register empty */
{
/* THRE interrupt */
if (UART1TXcount > 0)
{
U1THR = UART1TXBuffer[UART1TXhead++];
UART1TXhead %= UART1_TX_BUFSIZE;
UART1TXcount--;
}
else
{
U1IER = 1;
}
}
else
{
Dummy = U1RBR;
u1lsr = U1LSR;
u1lsr = u1lsr;
}
}
void Uart1_Init(CPU_INT32U baud_rate)
{
float div_fp; /* Baud rate divisor floating point precision */
CPU_INT16U div_int; /* Baud rate divisor floating point precision */
CPU_INT08U divlo;
CPU_INT08U divhi;
CPU_INT32U pclk_freq;
#if OS_CRITICAL_METHOD == 3 /* Allocate storage for CPU status register */
OS_CPU_SR cpu_sr = 0;
#endif
OS_ENTER_CRITICAL();
pclk_freq = BSP_CPU_PclkFreq(PCLK_UART1); /* Get peripheral clock frequency */
div_fp = (pclk_freq / 16.0 / baud_rate); /* Compute divisor for desired baud rate */
div_int = (CPU_INT16U)(div_fp + 0.5); /* Round the number up */
divlo = div_int & 0x00FF; /* Split divisor into LOW and HIGH bytes */
divhi = (div_int >> 8) & 0x00FF;
PCONP_bit.PCUART1 = 1; /* Enable the power bit for UART0 */
U1IER = 0;
U1FCR = 0x06; // enable and reset fifo
U1MCR = 0;
U1ACR = 0;
//U1FCR = 0x01; // enable and reset fifo
U1LCR = 0x80; /* Enable acces to Divisor latches */
U1DLL = divlo; /* Load divisor */
U1DLM = divhi;
U1FDR = 0x10;
U1LCR = 0;
U1LCR_bit.WLS = 0x03; // 8 bit
U1LCR_bit.SBS = 0; // 1 stop bit
U1IER = 1;
PINSEL4_bit.P2_0 = 0x2;
PINSEL4_bit.P2_1 = 0x2;
PINMODE4_bit.P2_0 = 0;
PINMODE4_bit.P2_1 = 0;
FIO2DIR_bit.P2_0 = 1;
FIO2DIR_bit.P2_1 = 0;
FIO2MASK_bit.P2_0 = 1;
FIO2MASK_bit.P2_1 = 1;
VICINTSELECT &= ~(1 << VIC_UART1);
VICVECTADDR7 = (CPU_INT32U)Uart1_Isr;
VICINTENABLE = (1 << VIC_UART1);
Uart1_Flush();
OS_EXIT_CRITICAL();
}
#define UART2_RX_BUFSIZE 128
#define UART2_TX_BUFSIZE 64
unsigned char UART2TXBuffer[UART2_TX_BUFSIZE];
unsigned short UART2TXhead = 0;
unsigned short UART2TXtail = 0;
unsigned short UART2TXcount = 0;
unsigned char UART2RXBuffer[UART2_RX_BUFSIZE];
unsigned short UART2RXhead = 0;
unsigned short UART2RXtail = 0;
unsigned short UART2RXcount = 0;
void Uart2_Flush(void)
{
#if OS_CRITICAL_METHOD == 3
OS_CPU_SR cpu_sr = 0;
#endif
OS_ENTER_CRITICAL();
UART2TXcount = UART2TXhead = UART2TXtail = 0;
UART2RXcount = UART2RXhead = UART2RXtail = 0;
U2IER_bit.THREIE = 0;
U2FCR = 0x06;
OS_EXIT_CRITICAL();
}
int Uart2_Getc(void)
{
#if OS_CRITICAL_METHOD == 3
OS_CPU_SR cpu_sr = 0;
#endif
OS_ENTER_CRITICAL();
int res = -1;
if (UART2RXcount > 0)
{
UART2RXcount--;
res = UART2RXBuffer[UART2RXhead++];
UART2RXhead %= UART2_RX_BUFSIZE;
}
OS_EXIT_CRITICAL();
return res;
}
int Uart2_Gotc(void)
{
#if OS_CRITICAL_METHOD == 3
OS_CPU_SR cpu_sr = 0;
#endif
OS_ENTER_CRITICAL();
int res = 0;
if (UART2RXcount > 0) res = 1;
OS_EXIT_CRITICAL();
return res;
}
int Uart2_Ready()
{
#if OS_CRITICAL_METHOD == 3
OS_CPU_SR cpu_sr = 0;
#endif
OS_ENTER_CRITICAL();
int res = 0;
if (UART2TXcount < UART2_TX_BUFSIZE) res = 1;
OS_EXIT_CRITICAL();
return res;
}
int Uart2_Putc(unsigned char ch)
{
#if OS_CRITICAL_METHOD == 3
OS_CPU_SR cpu_sr = 0;
#endif
OS_ENTER_CRITICAL();
int res = 0;
if (UART2TXcount < UART2_TX_BUFSIZE)
{
if (UART2TXcount == 0)
{
if (U2LSR_bit.THRE)
{
U2THR = ch;
}
else
{
UART2TXcount++;
UART2TXBuffer[UART2TXtail++] = ch;
UART2TXtail %= UART2_TX_BUFSIZE;
U2IER = 3;
}
}
else
{
UART2TXcount++;
UART2TXBuffer[UART2TXtail++] = ch;
UART2TXtail %= UART2_TX_BUFSIZE;
U2IER = 3;
}
}
else
{
res = -1;
}
OS_EXIT_CRITICAL();
return res;
}
void Uart2_Isr(void)
{
CPU_INT08U IIRValue;
CPU_INT08U u1lsr;
volatile CPU_INT08U Dummy;
IIRValue = U2IIR;
IIRValue >>= 1; /* skip pending bit in IIR */
IIRValue &= 0x07; /* check bit 1~3, interrupt identification */
if (IIRValue == 2) /* Receive Data Available */
{
/* Receive Data Available */
if (U2LSR_bit.DR)
{
if (UART2RXcount < UART2_RX_BUFSIZE)
{
UART2RXBuffer[UART2RXtail++] = U2RBR;
UART2RXtail %= UART2_RX_BUFSIZE;
UART2RXcount++;
}
else
{
Dummy = U2RBR;
}
}
}
else if (IIRValue == 1) /* THRE, transmit holding register empty */
{
/* THRE interrupt */
if (UART2TXcount > 0)
{
U2THR = UART2TXBuffer[UART2TXhead++];
UART2TXhead %= UART2_TX_BUFSIZE;
UART2TXcount--;
}
else
{
U2IER = 1;
}
}
else
{
Dummy = U2RBR;
u1lsr = U2LSR;
u1lsr = u1lsr;
}
}
void Uart2_Init(CPU_INT32U baud_rate)
{
float div_fp; /* Baud rate divisor floating point precision */
CPU_INT16U div_int; /* Baud rate divisor floating point precision */
CPU_INT08U divlo;
CPU_INT08U divhi;
CPU_INT32U pclk_freq;
#if OS_CRITICAL_METHOD == 3 /* Allocate storage for CPU status register */
OS_CPU_SR cpu_sr = 0;
#endif
OS_ENTER_CRITICAL();
pclk_freq = BSP_CPU_PclkFreq(PCLK_UART2); /* Get peripheral clock frequency */
div_fp = (pclk_freq / 16.0 / baud_rate); /* Compute divisor for desired baud rate */
div_int = (CPU_INT16U)(div_fp + 0.5); /* Round the number up */
divlo = div_int & 0x00FF; /* Split divisor into LOW and HIGH bytes */
divhi = (div_int >> 8) & 0x00FF;
PCONP_bit.PCUART2 = 1; /* Enable the power bit for UART0 */
U2IER = 0;
U2FCR = 0x06; // enable and reset fifo
U2ACR = 0;
//U1FCR = 0x01; // enable and reset fifo
U2LCR = 0x80; /* Enable acces to Divisor latches */
U2DLL = divlo; /* Load divisor */
U2DLM = divhi;
U2FDR = 0x10;
U2LCR = 0;
U2LCR_bit.WLS = 0x03; // 8 bit
U2LCR_bit.SBS = 0; // 1 stop bit
U2IER = 1;
PINSEL0_bit.P0_10 = 0x1;
PINSEL0_bit.P0_11 = 0x1;
PINMODE0_bit.P0_10 = 0;
PINMODE0_bit.P0_11 = 0;
FIO0DIR_bit.P0_10 = 1;
FIO0DIR_bit.P0_11 = 0;
FIO0MASK_bit.P0_10 = 1;
FIO0MASK_bit.P0_11 = 1;
VICINTSELECT &= ~(1 << VIC_UART2);
VICVECTADDR28 = (CPU_INT32U)Uart2_Isr;
VICINTENABLE = (1 << VIC_UART2);
Uart2_Flush();
OS_EXIT_CRITICAL();
}
void Uart0_Flush(void)
{
U0FCR = 0x06;
}
int Uart0_Getc(void)
{
int res = -1;
if (U0LSR_bit.DR) res = U0RBR;
return res;
}
int Uart0_Gotc(void)
{
int res = 0;
if (U0LSR_bit.DR) res = 1;
return res;
}
int Uart0_Ready()
{
int res = 0;
if (U0LSR_bit.THRE) res = 1;
return res;
}
int Uart0_Putc(unsigned char ch)
{
int res = 0;
while (U0LSR_bit.THRE == 0)
{
OSTimeDly(1);
}
U0THR = ch;
return res;
}
void Uart0_Init(CPU_INT32U baud_rate)
{
float div_fp; /* Baud rate divisor floating point precision */
CPU_INT16U div_int; /* Baud rate divisor floating point precision */
CPU_INT08U divlo;
CPU_INT08U divhi;
CPU_INT32U pclk_freq;
#if OS_CRITICAL_METHOD == 3 /* Allocate storage for CPU status register */
OS_CPU_SR cpu_sr = 0;
#endif
OS_ENTER_CRITICAL();
pclk_freq = BSP_CPU_PclkFreq(PCLK_UART0); /* Get peripheral clock frequency */
div_fp = (pclk_freq / 16.0 / baud_rate); /* Compute divisor for desired baud rate */
div_int = (CPU_INT16U)(div_fp + 0.5); /* Round the number up */
divlo = div_int & 0x00FF; /* Split divisor into LOW and HIGH bytes */
divhi = (div_int >> 8) & 0x00FF;
PCONP_bit.PCUART0 = 1; /* Enable the power bit for UART0 */
U0IER = 0;
U0FCR = 0x06; // enable and reset fifo
U0ACR = 0;
U0LCR = 0x80; /* Enable acces to Divisor latches */
U0DLL = divlo; /* Load divisor */
U0DLM = divhi;
U0FDR = 0x10;
U0LCR = 0;
U0LCR_bit.WLS = 0x03; // 8 bit
U0LCR_bit.SBS = 0; // 1 stop bit
U0IER = 1;
PINSEL0_bit.P0_2 = 0x1;
PINSEL0_bit.P0_3 = 0x1;
PINMODE0_bit.P0_2 = 0;
PINMODE0_bit.P0_3 = 0;
FIO0DIR_bit.P0_2 = 1;
FIO0DIR_bit.P0_3 = 0;
FIO0MASK_bit.P0_2 = 1;
FIO0MASK_bit.P0_3 = 1;
Uart0_Flush();
OS_EXIT_CRITICAL();
}
void InitUart(CPU_INT08U uart_index, CPU_INT32U uart_speed)
{
switch (uart_index){
case UART_NUMBER_0:
// #0
Uart0_Init(uart_speed);
break;
case UART_NUMBER_1:
// #1
Uart1_Init(uart_speed);
break;
case UART_NUMBER_2:
// #2
Uart2_Init(uart_speed);
break;
case UART_NUMBER_3:
break;
}
}
void UartFlush(CPU_INT08U uart_index)
{
switch (uart_index){
case UART_NUMBER_0:
// #0
Uart0_Flush();
break;
case UART_NUMBER_1:
// #1
Uart1_Flush();
break;
case UART_NUMBER_2:
// #2
Uart2_Flush();
break;
case UART_NUMBER_3:
break;
}
}
int UartGotc(CPU_INT08U uart_index)
{
switch (uart_index){
case UART_NUMBER_0:
// #0
return Uart0_Gotc();
case UART_NUMBER_1:
// #1
return Uart1_Gotc();
case UART_NUMBER_2:
// #2
return Uart2_Gotc();
case UART_NUMBER_3:
break;
}
return 0;
}
int UartGetc(CPU_INT08U uart_index)
{
switch (uart_index){
case UART_NUMBER_0:
// #0
return Uart0_Getc();
case UART_NUMBER_1:
// #1
return Uart1_Getc();
case UART_NUMBER_2:
// #2
return Uart2_Getc();
case UART_NUMBER_3:
break;
}
return 0;
}
int UartReady(CPU_INT08U uart_index)
{
switch (uart_index){
case UART_NUMBER_0:
// #0
return Uart0_Ready();
case UART_NUMBER_1:
// #1
return Uart1_Ready();
case UART_NUMBER_2:
// #2
return Uart2_Ready();
case UART_NUMBER_3:
break;
}
return 0;
}
int UartPutc(CPU_INT08U uart_index, CPU_INT08U ch)
{
switch (uart_index){
case UART_NUMBER_0:
// #0
return Uart0_Putc(ch);
case UART_NUMBER_1:
// #1
return Uart1_Putc(ch);
case UART_NUMBER_2:
// #2
return Uart2_Putc(ch);
case UART_NUMBER_3:
break;
}
return 0;
}

View File

@ -1,20 +0,0 @@
#ifndef _UART_H_
#define _UART_H_
#define UART_NUMBER_0 0
#define UART_NUMBER_1 1
#define UART_NUMBER_2 2
#define UART_NUMBER_3 3
extern void InitUart(CPU_INT08U uart_index, CPU_INT32U uart_speed);
extern void UartFlush(CPU_INT08U uart_index);
extern int UartGotc(CPU_INT08U uart_index);
extern int UartGetc(CPU_INT08U uart_index);
extern int UartReady(CPU_INT08U uart_index);
extern int UartPutc(CPU_INT08U uart_index, CPU_INT08U ch);
#endif //#ifndef _UART_H_

View File

@ -1402,11 +1402,11 @@ void PrintEventJournalRecord(TEventRecord *record)
}
else if ((record->event >= JOURNAL_EVENT_PRINT_BILL_POST1) && (record->event <= JOURNAL_EVENT_PRINT_BILL_VACUUM2))
{
sprintf(str_EventData, " ");
sprintf(str_EventData, "");
}
else if ((record->event >= JOURNAL_EVENT_PRINT_BILL_ONLINE_POST1) && (record->event <= JOURNAL_EVENT_PRINT_BILL_ONLINE_POST1))
else if ((record->event >= JOURNAL_EVENT_PRINT_BILL_ONLINE_POST1) && (record->event <= JOURNAL_EVENT_PRINT_BILL_ONLINE_POST6))
{
sprintf(str_EventData, " ");
sprintf(str_EventData, "");
}
else if (record->event == JOURNAL_EVENT_PRINT_Z)
{

View File

@ -1174,7 +1174,7 @@ void InitInputPorts()
// ìîíåòîïğèåìíèê 5
PINSEL4_bit.P2_2 = 0;
if(coinLevel[4])PINMODE3_bit.P1_21 = 3;
if(coinLevel[4])PINMODE4_bit.P2_2 = 3;
else PINMODE4_bit.P2_2 = 0;
FIO2DIR_bit.P2_2 = 0;
FIO2MASK_bit.P2_2 = 0;
@ -1237,15 +1237,15 @@ void InitInputPorts()
// áàíê 3
PINSEL3_bit.P1_24 = 0;
if(bankLevel[2])PINMODE1_bit.P0_24 = 3;
else PINMODE1_bit.P0_24 = 0;
if(bankLevel[2])PINMODE3_bit.P1_24 = 3;
else PINMODE3_bit.P1_24 = 0;
FIO1DIR_bit.P1_24 = 0;
FIO1MASK_bit.P1_24 = 0;
// áàíê 4
PINSEL3_bit.P1_23 = 0;
if(bankLevel[3])PINMODE1_bit.P0_23 = 3;
else PINMODE1_bit.P0_23 = 0;
if(bankLevel[3])PINMODE3_bit.P1_23 = 3;
else PINMODE3_bit.P1_23 = 0;
FIO1DIR_bit.P1_23 = 0;
FIO1MASK_bit.P1_23 = 0;

View File

@ -14,7 +14,7 @@ Count=0
Enabled=0
ShowSource=1
[DebugChecksum]
Checksum=782654363
Checksum=-1582667056
[Exceptions]
StopOnUncaught=_ 0
StopOnThrow=_ 0

View File

@ -18,7 +18,7 @@
<Column0>146</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
<Column0>202</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
</Workspace>
<Find-in-Files><ColumnWidth0>440</ColumnWidth0><ColumnWidth1>62</ColumnWidth1><ColumnWidth2>754</ColumnWidth2></Find-in-Files><TerminalIO/><Debug-Log><ColumnWidth0>22</ColumnWidth0><ColumnWidth1>1219</ColumnWidth1></Debug-Log></Static>
<Windows>
@ -34,7 +34,7 @@
</Tab>
<Tab><Identity>TabID-28963-15244</Identity><TabName>Find in Files</TabName><Factory>Find-in-Files</Factory><Session/></Tab><Tab><Identity>TabID-3677-8150</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs>
<SelectedTab>0</SelectedTab></Wnd0><Wnd1>
<SelectedTab>1</SelectedTab></Wnd0><Wnd1>
<Tabs>
<Tab>
<Identity>TabID-1122-24249</Identity>
@ -52,14 +52,14 @@
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app_cfg.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>58</SelStart><SelEnd>58</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\8\positive_6_24\OS\app\app.c</Filename><XPos>0</XPos><YPos>26</YPos><SelStart>1431</SelStart><SelEnd>1431</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\console.c</Filename><XPos>0</XPos><YPos>109</YPos><SelStart>3332</SelStart><SelEnd>3332</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\lib\lib_def.h</Filename><XPos>0</XPos><YPos>111</YPos><SelStart>5973</SelStart><SelEnd>5981</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\time.c</Filename><XPos>0</XPos><YPos>81</YPos><SelStart>625</SelStart><SelEnd>625</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\mode.c</Filename><XPos>0</XPos><YPos>28</YPos><SelStart>763</SelStart><SelEnd>763</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>470</SelStart><SelEnd>470</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>35</YPos><SelStart>1536</SelStart><SelEnd>1536</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>5</YPos><SelStart>246</SelStart><SelEnd>250</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>6</YPos><SelStart>635</SelStart><SelEnd>635</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h</Filename><XPos>0</XPos><YPos>342</YPos><SelStart>17866</SelStart><SelEnd>17866</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>348</SelStart><SelEnd>348</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\os_ii\source\os_core.c</Filename><XPos>0</XPos><YPos>1359</YPos><SelStart>56898</SelStart><SelEnd>56898</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>212</YPos><SelStart>6058</SelStart><SelEnd>6058</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>1324</YPos><SelStart>53502</SelStart><SelEnd>53502</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>562</YPos><SelStart>20336</SelStart><SelEnd>20336</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c</Filename><XPos>0</XPos><YPos>872</YPos><SelStart>23135</SelStart><SelEnd>23135</SelEnd></Tab><ActiveTab>16</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>871</YPos><SelStart>23586</SelStart><SelEnd>23586</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.h</Filename><XPos>0</XPos><YPos>3</YPos><SelStart>390</SelStart><SelEnd>390</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>33</YPos><SelStart>285</SelStart><SelEnd>285</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>27</YPos><SelStart>1131</SelStart><SelEnd>1131</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.h</Filename><XPos>0</XPos><YPos>26</YPos><SelStart>1390</SelStart><SelEnd>1532</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.c</Filename><XPos>0</XPos><YPos>115</YPos><SelStart>3540</SelStart><SelEnd>3540</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.c</Filename><XPos>0</XPos><YPos>491</YPos><SelStart>15135</SelStart><SelEnd>15135</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>2149</YPos><SelStart>96367</SelStart><SelEnd>96367</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>628</YPos><SelStart>15932</SelStart><SelEnd>15932</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Program Files (x86)\IAR Systems\Embedded Workbench 6.0\arm\inc\c\DLib_Product_string.h</Filename><XPos>0</XPos><YPos>40</YPos><SelStart>1449</SelStart><SelEnd>1449</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app_cfg.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>58</SelStart><SelEnd>58</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\8\positive_6_24\OS\app\app.c</Filename><XPos>0</XPos><YPos>26</YPos><SelStart>1431</SelStart><SelEnd>1431</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\console.c</Filename><XPos>0</XPos><YPos>109</YPos><SelStart>3332</SelStart><SelEnd>3332</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\lib\lib_def.h</Filename><XPos>0</XPos><YPos>111</YPos><SelStart>5973</SelStart><SelEnd>5981</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\time.c</Filename><XPos>0</XPos><YPos>81</YPos><SelStart>625</SelStart><SelEnd>625</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\mode.c</Filename><XPos>0</XPos><YPos>28</YPos><SelStart>763</SelStart><SelEnd>763</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>58</YPos><SelStart>2091</SelStart><SelEnd>2091</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>34</YPos><SelStart>3764</SelStart><SelEnd>3785</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>6</YPos><SelStart>399</SelStart><SelEnd>417</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h</Filename><XPos>0</XPos><YPos>342</YPos><SelStart>17866</SelStart><SelEnd>17866</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>348</SelStart><SelEnd>348</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\os_ii\source\os_core.c</Filename><XPos>0</XPos><YPos>1359</YPos><SelStart>56898</SelStart><SelEnd>56898</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>725</YPos><SelStart>28758</SelStart><SelEnd>28758</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>470</YPos><SelStart>9017</SelStart><SelEnd>9017</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c</Filename><XPos>0</XPos><YPos>872</YPos><SelStart>23135</SelStart><SelEnd>23135</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>318</YPos><SelStart>10362</SelStart><SelEnd>10362</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.h</Filename><XPos>0</XPos><YPos>3</YPos><SelStart>390</SelStart><SelEnd>390</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>27</YPos><SelStart>1131</SelStart><SelEnd>1131</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.h</Filename><XPos>0</XPos><YPos>26</YPos><SelStart>1390</SelStart><SelEnd>1532</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.c</Filename><XPos>0</XPos><YPos>115</YPos><SelStart>3540</SelStart><SelEnd>3540</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.c</Filename><XPos>0</XPos><YPos>491</YPos><SelStart>15135</SelStart><SelEnd>15135</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>571</YPos><SelStart>25718</SelStart><SelEnd>25732</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>1268</YPos><SelStart>30713</SelStart><SelEnd>30713</SelEnd></Tab><ActiveTab>22</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\keyboard\keyboard.c</Filename><XPos>0</XPos><YPos>24</YPos><SelStart>463</SelStart><SelEnd>463</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>420</SelStart><SelEnd>429</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>109</YPos><SelStart>3102</SelStart><SelEnd>3102</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
<Positions>
<Top><Row0><Sizes><Toolbar-02bf3140><key>iaridepm.enu1</key></Toolbar-02bf3140></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>710</Bottom><Right>237</Right><x>-2</x><y>-2</y><xscreen>254</xscreen><yscreen>205</yscreen><sizeHorzCX>198438</sizeHorzCX><sizeHorzCY>215563</sizeHorzCY><sizeVertCX>186719</sizeVertCX><sizeVertCY>748686</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>196</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>198</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>208202</sizeHorzCY><sizeVertCX>198438</sizeVertCX><sizeVertCY>215563</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
<Top><Row0><Sizes><Toolbar-02bf3140><key>iaridepm.enu1</key></Toolbar-02bf3140></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>710</Bottom><Right>293</Right><x>-2</x><y>-2</y><xscreen>254</xscreen><yscreen>205</yscreen><sizeHorzCX>198438</sizeHorzCX><sizeHorzCY>215563</sizeHorzCY><sizeVertCX>230469</sizeVertCX><sizeVertCY>748686</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>196</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>198</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>208202</sizeHorzCY><sizeVertCX>198438</sizeVertCX><sizeVertCY>215563</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
</Desktop>
</Workspace>

View File

@ -2,7 +2,7 @@
<project>
<fileVersion>2</fileVersion>
<fileChecksum>2899151881</fileChecksum>
<fileChecksum>2767443068</fileChecksum>
<configuration>
<name>Flash Central</name>
<outputs>
@ -3607,6 +3607,10 @@
</tool>
</inputs>
</file>
<forcedrebuild>
<name>[MULTI_TOOL]</name>
<tool>ILINK</tool>
</forcedrebuild>
</configuration>
<configuration>
<name>Flash Post</name>
@ -5456,6 +5460,10 @@
</tool>
</inputs>
</file>
<forcedrebuild>
<name>[MULTI_TOOL]</name>
<tool>ILINK</tool>
</forcedrebuild>
</configuration>
</project>

View File

@ -3218,22 +3218,6 @@
<name>$PROJ_DIR$\PROJECT\drivers\lcd\lcd.h</name>
</file>
</group>
<file>
<name>$PROJ_DIR$\PROJECT\drivers\uart.c</name>
<excluded>
<configuration>Flash Post</configuration>
<configuration>Flash Central</configuration>
<configuration>Flash Positive</configuration>
</excluded>
</file>
<file>
<name>$PROJ_DIR$\PROJECT\drivers\uart.h</name>
<excluded>
<configuration>Flash Post</configuration>
<configuration>Flash Central</configuration>
<configuration>Flash Positive</configuration>
</excluded>
</file>
</group>
<group>
<name>libs</name>