me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Commenting through most of the remaining files.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

56
workspace/ts100/inc/APP_Version.h
View File

@@ -1,35 +1,41 @@
/********************* (C) COPYRIGHT 2015 e-Design Co.,Ltd. ********************
File Name : APP_Version.h
Version : S100 APP Ver 2.11
Description:
Author : bure & Celery
Data: 2015/08/03
History:
2015/08/03 ͳһ<CDB3><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
*******************************************************************************/
File Name : APP_Version.h
Version : S100 APP Ver 2.11
Description:
Author : bure & Celery
Data: 2015/08/03
History:
2015/08/03 ͳһ<CDB3><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
*******************************************************************************/
#ifndef __VERSION_H
#define __VERSION_H
#define M_VER 'V','0'
#define S_VER '0','1'
#define OEM_TYPE "0"
#define APP_BASE 0x0800C000
#define M_VER 'V','0'
#define S_VER '0','1'
#define OEM_TYPE "0"
#define APP_BASE 0x0800C000
/*----------------------------------------------------------------------------*/
#ifdef TYPE_DS201
#define PRODUCT_INFO "DS201"
#define SCH_VER "1.7B"
#elif TYPE_DS202
#include "DS202V1_6.h"
#define FLASH_PAGE 0x0800
#elif TYPE_DS203
#define PRODUCT_INFO "DS203"
#define SCH_VER "2.70"
#elif TYPE_S100
#define PRODUCT_INFO "TS100"
#include "S100V0_1.h"
#endif
#ifdef TYPE_DS201
#define PRODUCT_INFO "DS201"
#define SCH_VER "1.7B"
#else
#ifdef TYPE_DS202
#include "DS202V1_6.h"
#define FLASH_PAGE 0x0800
#else
#ifdef TYPE_DS203
#define PRODUCT_INFO "DS203"
#define SCH_VER "2.70"
#else
#ifdef TYPE_S100
#define PRODUCT_INFO "TS100"
#include "S100V0_1.h"
#endif
#endif
#endif
#endif
/*----------------------------------------------------------------------------*/
#define DFU_VER {M_VER,'.',S_VER,LCD_M, 0}

38
workspace/ts100/inc/Disk.h
View File

@@ -1,16 +1,16 @@
/********************* (C) COPYRIGHT 2015 e-Design Co.,Ltd. **********************
File Name : Disk.h
Version : S100 APP Ver 2.11
Description:
Author : Celery
Data: 2015/08/03
History:
2015/08/03 :
*******************************************************************************/
File Name : Disk.h
Version : S100 APP Ver 2.11
Description:
Author : Celery
Data: 2015/08/03
History:
2016/09/13 : Ben V. Brown - english comments
2015/08/03 :
*******************************************************************************/
#ifndef __DISK_H
#define __DISK_H
#include "stm32f10x_flash.h"
#include "usb_scsi.h"
#include "usb_regs.h"
@@ -31,7 +31,6 @@ History:
#define FILE_SECTOR &gDisk_buff[0x600]
#define Root (u8*)ROOT_SECTOR
//#define APP_BASE 0x0800C000
#define HEX 0
@@ -53,9 +52,9 @@ History:
//#define FAT_DATA 0x00FFFFF8
#define VOLUME 0x40DD8D18 //0x3E645C29
#define BUFF 0 // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݻ<EFBFBD><DDBB><EFBFBD><EFBFBD><EFBFBD>
#define BUFF 0 //
#define V32_BASE SECTOR_SIZE // V32 <20>ܹ<EFBFBD> 8*4=32 <20>ֽ<EFBFBD>
#define V32_BASE SECTOR_SIZE // V32 8*4=32
#define W_ADDR 0
#define ADDR 1
#define H_ADDR 2
@@ -65,7 +64,7 @@ History:
#define RD_CNT 6
#define WR_CNT 7
#define VAR_BASE V32_BASE + 32 // VAR <20>ܹ<EFBFBD> 9+17=26 <20>ֽ<EFBFBD>
#define VAR_BASE V32_BASE + 32 // VAR 9+17=26
#define USB_ST 0
#define SEG_KIND 1
#define SEG_LEN 2
@@ -75,10 +74,9 @@ History:
#define DATA_CNT 6
#define F_TYPE 7
#define F_FLAG 8
#define SEG_DATA 9 // ͨ<>Ű<EFBFBD><C5B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 9~26 <20><>17<31>ֽ<EFBFBD>
#define SEG_DATA 9 //9~26
u8 Cal_Val(u8 str[],u8 k,u8 flag);
u8 Cal_Val(u8 str[], u8 k, u8 flag);
void Disk_BuffInit(void);
u8 ReWrite_All(void);
u8 Config_Analysis(void);
@@ -86,12 +84,12 @@ void Disk_BuffInit(void);
void Disk_SecWrite(u8* pbuffer, u32 disk_addr);
void Close_File(void);
void Write_Memory(u32 w_offset, u32 w_length);
void Read_Memory (u32 r_offset, u32 r_length);
void Set_Ver(u8 str[],u8 i);
void Read_Memory(u32 r_offset, u32 r_length);
void Set_Ver(u8 str[], u8 i);
void Erase(void);
char * Get_Line(char *dst,char *src, int n,int m);
char * Get_Line(char *dst, char *src, int n, int m);
void Upper(u8* str, u16 len);
u8* SearchFile(u8* pfilename, u16* pfilelen,u16* root_addr);
u8* SearchFile(u8* pfilename, u16* pfilelen, u16* root_addr);
u8 ReWriteFlsash(void);
#endif
/********************************* END OF FILE ******************************/

6
workspace/ts100/inc/Flash.h
View File

@@ -13,9 +13,9 @@
#define PP 0x02 // Write to Memory instruction
#define PW 0x0A // Page write instruction
#define OK 0 // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define SEC_ERR 1 // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>д<EFBFBD><D0B4><EFBFBD><EFBFBD>
#define TMAX 100000 // <20><>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>
#define OK 0 //
#define SEC_ERR 1 //
#define TMAX 100000 //
#define WIP_Flag 0x01 // Write In Progress (WIP) flag
#define Dummy_Byte 0xA5

2
workspace/ts100/inc/Hardware.h
View File

@@ -40,7 +40,7 @@ u32 Get_AvgAd(void);
int Get_SensorTmp(void);
u16 Get_ThermometerTemp(void);
s16 Get_Temp(s16 wk_temp);
u32 Clear_Watchdog(void);
void Clear_Watchdog(void);
u32 Start_Watchdog(u32 ms);
u8 Get_AlarmType(void);
void Set_AlarmType(u8 type);

6
workspace/ts100/inc/MMA8652FC.h
View File

@@ -5,15 +5,15 @@ Description:
Author : Celery
Data: 2015/07/07
History:
2015/07/07 ͳһ<CDB3><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
2015/07/07 ͳһ<CDB3><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
*******************************************************************************/
#ifndef __MMA8652FC__H
#define __MMA8652FC__H
//--------------MMA8652 <EFBFBD><EFBFBD><EFBFBD>岿<EFBFBD><EFBFBD>----------------------------------------------//
//--------------MMA8652 Device ID----------------------------------------------//
#define DEVICE_ADDR 0X1D
//--------------MMA8652 <EFBFBD>Ĵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-------------------------------------------//
//--------------MMA8652 Registers-------------------------------------------//
#define STATUS_REG 0x00
#define X_MSB_REG 0X01
#define X_LSB_REG 0X02