Commenting through most of the remaining files.

Fixing logic errors throughout as well
This commit is contained in:
Ben V. Brown
2016-09-13 23:50:51 +10:00
parent 0b4068976c
commit 624fbe8e3f
19 changed files with 348 additions and 602 deletions

View File

@@ -21,11 +21,11 @@
#include "MMA8652FC.h"
/******************************************************************************/
u8 gTemp_array[16 * 16 + 16];
u8 gTemperatureshowflag = 0; /* 0 <20><><EFBFBD><EFBFBD><EFBFBD>϶<EFBFBD>,1<>ǻ<EFBFBD><C7BB>϶<EFBFBD>*/
u8 gTemperatureshowflag = 0;
u8 gUp_flag = 0, gDown_flag = 0, gLevel_flag = 0, gTempset_showctrl = 0;
u16 gTemp_array_u16[208];
u16 gSet_table[2] = { 4000, 1000 }; /*<2A><EFBFBD>ѡ<EFBFBD><D1A1>*/
u32 gCont = 0; /*gCont <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬ת<CCAC><D7AA><EFBFBD><EFBFBD><EFBFBD>ˢ<EFBFBD><CBA2><EFBFBD><EFBFBD>ʶ*/
u16 gSet_table[2] = { 4000, 1000 };
u32 gCont = 0;
static u8 Ver_s[] = { /*12*16*/0x04, 0x0C, 0x74, 0x80, 0x00, 0x00, 0x00, 0x80,
0x74, 0x0C, 0x04, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1C, 0x60, 0x1C, 0x03,
@@ -51,48 +51,37 @@ static u8 Ver_s[] = { /*12*16*/0x04, 0x0C, 0x74, 0x80, 0x00, 0x00, 0x00, 0x80,
/******************************************************************************/
/*******************************************************************************
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: Get_UpdataFlag
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:<3A><>ȡ<EFBFBD><C8A1>Ļˢ<C4BB>±<EFBFBD>־
<20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:NULL
<20><><EFBFBD>ز<EFBFBD><D8B2><EFBFBD>:<3A><>Ļˢ<C4BB>±<EFBFBD>־
Function:
Description:
*******************************************************************************/
u32 Get_UpdataFlag(void) {
return gCont;
}
/*******************************************************************************
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: Set_UpdataFlag
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ļˢ<C4BB>±<EFBFBD>־
<20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:1 ˢ<>£<EFBFBD>0 <20><>ˢ<EFBFBD><CBA2>
<20><><EFBFBD>ز<EFBFBD><D8B2><EFBFBD>:NULL
Function:
Description:
*******************************************************************************/
void Set_UpdataFlag(u32 cont) {
gCont = cont;
}
/*******************************************************************************
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: Set_TemperatureShowFlag
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><C2B6><EFBFBD>ʾ<EFBFBD><CABE>ʽ
<20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:flag <20><><EFBFBD>϶<EFBFBD>(0),<2C><><EFBFBD>϶<EFBFBD>(1)<29><>־
<20><><EFBFBD>ز<EFBFBD><D8B2><EFBFBD>:NULL
Function:
Description:
*******************************************************************************/
void Set_TemperatureShowFlag(u8 flag) {
gTemperatureshowflag = flag;
}
/*******************************************************************************
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: Get_TemperatureShowFlag
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:<3A><>ȡ<EFBFBD><EFBFBD><C2B6><EFBFBD>ʾ<EFBFBD><CABE>ʽ
<20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:NULL
<20><><EFBFBD>ز<EFBFBD><D8B2><EFBFBD>:flag <20><><EFBFBD>϶<EFBFBD>(0),<2C><><EFBFBD>϶<EFBFBD>(1)<29><>־
Function:
Description:־
*******************************************************************************/
u8 Get_TemperatureShowFlag(void) {
return gTemperatureshowflag;
}
/*******************************************************************************
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: TemperatureShow_Change
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:<3A><><EFBFBD>϶Ȼ<CFB6><C8BB>϶<EFBFBD><CFB6>໥ת<E0BBA5><D7AA>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: flag 0,<2C><><EFBFBD>϶<EFBFBD>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD>϶<EFBFBD>
flag 1,<2C><><EFBFBD>϶<EFBFBD>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD>϶<EFBFBD>
tmp Ҫת<D2AA><D7AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<20><><EFBFBD>ز<EFBFBD><D8B2><EFBFBD><><D7AA><EFBFBD><EFBFBD><EFBFBD>ֵ
Function:
Description: Converts F to C or C to F.
Input: flag = if flag==0 converts C to F
*******************************************************************************/
s16 TemperatureShow_Change(u8 flag, s16 tmp) {
if (flag == 0) {
@@ -102,10 +91,8 @@ s16 TemperatureShow_Change(u8 flag, s16 tmp) {
}
}
/*******************************************************************************
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: APP_Init
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:<3A><><EFBFBD>ݵ<EFBFBD>ѹ<EFBFBD><D1B9>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>ʼ״̬
<20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:NULL
<20><><EFBFBD>ز<EFBFBD><D8B2><EFBFBD>:NULL
Function:APP_Init
Description:Init the operating mode by looking at input voltage to pick USB or normal
*******************************************************************************/
void APP_Init(void) {
int rev;
@@ -113,13 +100,13 @@ void APP_Init(void) {
HEATING_TIMER= 0;
UI_TIMER= 0;
rev = Read_Vb(0);
if (rev == 0)
rev = Read_Vb(0); //Read input voltage
if (rev == 0) //no input volatage == error state
Set_CtrlStatus(ALARM);
else if (rev >= 4) {
else if (rev >= 4) { //We are USB powered (5V approx at input)
Set_LongKeyFlag(1);
Set_CtrlStatus(CONFIG);
} else {
} else { //Normal mode > ~9V at input
Set_CtrlStatus(IDLE);
G6_TIMER= device_info.idle_time;
}
@@ -127,10 +114,8 @@ void APP_Init(void) {
}
/*******************************************************************************
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: Display_Temp
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:<3A><>ʾ<EFBFBD><EFBFBD>
<20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:x:<3A><>ʾλ<CABE><CEBB> Temp:<3A><EFBFBD>
<20><><EFBFBD>ز<EFBFBD><D8B2><EFBFBD>:NULL
Function:
Description:
*******************************************************************************/
void Display_Temp(u8 x, s16 temp) {
char Str[8];
@@ -179,23 +164,21 @@ void Display_Temp(u8 x, s16 temp) {
TEMPSHOW_TIMER= 20; //200ms
}
/*******************************************************************************
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: Show_Notice
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:<3A><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE>Ϣ
<20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:NULL
<20><><EFBFBD>ز<EFBFBD><D8B2><EFBFBD>:NULL
Function:
Description:
*******************************************************************************/
void Show_Notice(void) {
int j, k;
static u8* ptr0;
static u8 posi = 0, i = 0;
if (i == 0) { //<EFBFBD><EFBFBD>1 <20><>
if (i == 0) { //1
ptr0 = Oled_DrawArea(0, 0, 96, 16, (u8*) Maplib);
} else if (i == 1) { //<EFBFBD><EFBFBD>2 <20><>
} else if (i == 1) { //2
ptr0 = Oled_DrawArea(0, 0, 96, 16, ptr0);
} else if (i == 2) { //<EFBFBD><EFBFBD>3 <20><>
} else if (i == 2) { //3
ptr0 = Oled_DrawArea(0, 0, 96, 16, (u8*) Maplib);
} else if (i == 3) { //<EFBFBD><EFBFBD>4 <20><>
} else if (i == 3) { //4
for (j = 0; j < 6; j++) {
k = 84;
while (k >= posi) {
@@ -214,18 +197,16 @@ void Show_Notice(void) {
i = 0;
}
/*******************************************************************************
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: Show_Ver
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:<3A><>ʾ<EFBFBD>
<20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:ver <20><EFBFBD><E6B1BE>flag (0 :<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ )(1<><31><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
<20><><EFBFBD>ز<EFBFBD><D8B2><EFBFBD>:NULL
Function:
Description:
*******************************************************************************/
void Show_Ver(u8 ver[], u8 flag) {
u8 *ptr;
int k, i;
u8 temp0, temp1, temp2;
u8 temp0 = 0, temp1 = 0, temp2 = 0;
if (ver[2] >= 0x30 && ver[2] < 0x3a)
temp1 = ver[2] - 0x30;
temp1 = ver[2] - 0x30; //shift from ascii to the raw value
if (ver[3] >= 0x30 && ver[3] < 0x3a)
temp2 = ver[3] - 0x30;
if (ver[0] >= 0x30 && ver[0] < 0x3a)
@@ -256,10 +237,8 @@ void Show_Ver(u8 ver[], u8 flag) {
}
/*******************************************************************************
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: Show_Config
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:<3A><>ʾCONFIG
<20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:NULL
<20><><EFBFBD>ز<EFBFBD><D8B2><EFBFBD>:NULL
Function:
Description: Draws the word CONFIG to the screen
*******************************************************************************/
void Show_Config(void) {
u8* ptr;
@@ -272,10 +251,8 @@ void Show_Config(void) {
}
/*******************************************************************************
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: Show_TempDown
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:<3A><>ʾ<EFBFBD><EFBFBD><C2B6>½<EFBFBD>: ʵ<><CAB5><EFBFBD><EFBFBD>>>>Ŀ<><C4BF><EFBFBD><EFBFBD>
<20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:temp ʵ<><CAB5><EFBFBD><EFBFBD>,dst_temp Ŀ<><C4BF><EFBFBD><EFBFBD>
<20><><EFBFBD>ز<EFBFBD><D8B2><EFBFBD>:NULL
Function:
Description:
*******************************************************************************/
void Show_TempDown(s16 temp, s16 dst_temp) {
static u8 guide_ui = 0;
@@ -327,10 +304,8 @@ void Show_TempDown(s16 temp, s16 dst_temp) {
Display_Str10(56, str);
}
/*******************************************************************************
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: Show_Cal
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:<3A><>ʾУ׼<D0A3><D7BC><EFBFBD>
<20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:flag = 1 У׼<D0A3>ɹ<EFBFBD> flag = 2 У׼ʧ<D7BC><CAA7>
<20><><EFBFBD>ز<EFBFBD><D8B2><EFBFBD>:NULL
Function:
Description:
*******************************************************************************/
void Show_Cal(u8 flag) {
u8 i;
@@ -349,10 +324,8 @@ void Show_Cal(u8 flag) {
Clear_Watchdog();
}
/*******************************************************************************
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: Show_Warning
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:<3A><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:NULL
<20><><EFBFBD>ز<EFBFBD><D8B2><EFBFBD>:NULL
Function:
Description:
*******************************************************************************/
void Show_Warning(void) {
u8 i;