Skip to content

Commit 41bed46

Browse files
paraiparai
committed
add Net releated modules
1 parent b59fb16 commit 41bed46

77 files changed

Lines changed: 4995 additions & 15 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Console.bat‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
@echo off
2+
3+
set ASPATH=%~dp0
4+
set astmp=%ASPATH%
5+
set ASDISK=%astmp:~1,2%
6+
set MSYS2=C:\msys64
7+
8+
%ASDISK%
9+
cd %ASPATH%
10+
11+
REM base env PATH
12+
set PATH=C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0
13+
14+
set PATH=C:\Anaconda3;C:\Anaconda3\Scripts;%MSYS2%\mingw64\bin;%MSYS2%\usr\bin;%MSYS2%\mingw32\bin;%PATH%
15+
set PATH=%PATH%;%ASPATH%\download\gcc-arm-none-eabi-5_4-2016q3-20160926-win32\bin
16+
17+
set ConEmu=%ASPATH%\download\ConEmu\ConEmu64.exe
18+
19+
if EXIST %ConEmu% goto prepareEnv
20+
cd %ASPATH%\download
21+
mkdir ConEmu
22+
cd ConEmu
23+
wget https://github.com/Maximus5/ConEmu/releases/download/v21.04.22/ConEmuPack.210422.7z
24+
"C:\Program Files\7-Zip\7z.exe" x ConEmuPack.210422.7z
25+
cd %ASPATH%
26+
27+
:prepareEnv
28+
set MSYS=winsymlinks:nativestrict
29+
30+
start %ConEmu% -title sim-app-boot-tools ^
31+
-runlist -new_console:d:"%ASPATH%":t:sim ^
32+
^|^|^| -new_console:d:"%ASPATH%":t:app ^
33+
^|^|^| -new_console:d:"%ASPATH%":t:boot ^
34+
^|^|^| -new_console:d:"%ASPATH%/tools":t:tools
35+

‎README.md‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# SSAS - Simple Smart Automotive Software
1+
# AS - Automotive Software
22

3-
This project is not open source, all of the BSWs are developed by me alone according to AUTOSAR 4.2.
3+
This project is not open source, all of the BSWs are developed by me alone according to AUTOSAR 4.4.
44

55
## BSWs of AUTOSAR
66

@@ -12,14 +12,22 @@ This project now provide below BSWs:
1212
CanTp
1313
Dem
1414
Dcm
15-
15+
1616
OsekNm
1717
CanNm
18-
18+
19+
Fls
1920
Fee
21+
Eep
22+
Ea
2023
MemIf (zero cost only)
2124
NvM
2225

26+
TcpIP (socket based, LWIP is supported)
27+
SoAd
28+
DoIP
29+
SOMEIP
30+
2331
## Tools & Libraries
2432

2533
This project now provide below tools & libraries:
@@ -40,6 +48,8 @@ This project now provide below tools & libraries:
4048

4149
​ **AsOne**: PyQT5 based GUI tool for Com/Dcm
4250

51+
**DoIPClient** : DoIP client library to access DoIP server
52+
4353

4454
## prebuilt demo applications and its tools
4555

‎app/app/SConscript‎

Lines changed: 60 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@ CWD = GetCurrentDir()
77

88
generate(Glob('config/*.json'))
99
generate(Glob('config/Com/*.json'))
10+
generate(Glob('config/Net/*.json'))
1011

1112
objsApp = Glob('*.c') + Glob('src/*.c')
1213

14+
LL_DL = os.getenv('LL_DL')
15+
1316

1417
class ApplicationApp(Application):
1518
def config(self):
@@ -19,7 +22,8 @@ class ApplicationApp(Application):
1922
for libName, source in self.libsForApp.items():
2023
self.LIBS.append(libName)
2124
self.RegisterConfig(libName, source)
22-
self.Append(CPPDEFINES=['USE_%s' % (libName.split(':')[0].upper())])
25+
self.Append(CPPDEFINES=['USE_%s' %
26+
(libName.split(':')[0].upper())])
2327
self.source = objsApp
2428

2529

@@ -28,19 +32,23 @@ libsCommon = {'Dcm': Glob('config/Dcm/Dcm_Cfg.c'),
2832
'Fls': Glob('config/Fls_Cfg.c'),
2933
'Fee': Glob('config/GEN/Fee_Cfg.c'),
3034
'NvM': Glob('config/GEN/NvM_Cfg.c'),
31-
}
35+
'Eep': Glob('config/Eep_Cfg.c'),
36+
'Ea': Glob('config/GEN/Ea_Cfg.c'),
37+
}
3238

3339
libsForCanApp = {'CanTp': Glob('../bootloader/config/CanTp_Cfg.c'),
3440
'OsekNm': Glob('config/OsekNm_Cfg.c'),
3541
'CanNm': Glob('config/CanNm_Cfg.c'),
3642
'Com': Glob('config/Com/GEN/Com_Cfg.c'),
37-
}
43+
}
3844
libsForCanApp.update(libsCommon)
3945

4046

4147
@register_application
4248
class ApplicationCanApp(ApplicationApp):
4349
def platform_config(self):
50+
if LL_DL != None:
51+
self.Append(CPPDEFINES=['CANTP_LL_DL=%s' % (LL_DL)])
4452
self.Append(CPPDEFINES=['USE_STD_DEBUG'])
4553
self.LIBS.append('Simulator')
4654

@@ -50,6 +58,7 @@ class ApplicationCanApp(ApplicationApp):
5058
self.Append(CPPDEFINES=['USE_CAN'])
5159
self.platform_config()
5260

61+
5362
@register_application
5463
class ApplicationCanNm(ApplicationApp):
5564
def platform_config(self):
@@ -62,6 +71,7 @@ class ApplicationCanNm(ApplicationApp):
6271
self.Append(CPPDEFINES=['USE_CAN'])
6372
self.platform_config()
6473

74+
6575
@register_application
6676
class ApplicationOsekNm(ApplicationApp):
6777
def platform_config(self):
@@ -73,3 +83,50 @@ class ApplicationOsekNm(ApplicationApp):
7383
super().config()
7484
self.Append(CPPDEFINES=['USE_CAN'])
7585
self.platform_config()
86+
87+
88+
libsForNetApp = {
89+
'SoAd': Glob('config/Net/GEN/SoAd_*.c'),
90+
'DoIP': Glob('config/Net/GEN/DoIp_*.c'),
91+
'Sd': Glob('config/Net/GEN/Sd_*.c'),
92+
'SomeIp': Glob('config/Net/GEN/SomeIp_*.c'),
93+
}
94+
libsForNetApp.update(libsCommon)
95+
96+
libsForNetAppT = {
97+
'SoAd': Glob('config/Net/GENT/SoAd_*.c'),
98+
'Sd': Glob('config/Net/GENT/Sd_*.c'),
99+
'SomeIp': Glob('config/Net/GENT/SomeIp_*.c'),
100+
}
101+
102+
103+
@register_application
104+
class ApplicationNetApp(Application):
105+
mylibs = libsForNetApp
106+
107+
def platform_config(self):
108+
self.Append(CPPDEFINES=['USE_STD_DEBUG'])
109+
self.LIBS.append('Simulator')
110+
111+
def config(self):
112+
self.CPPPATH = ['$INFRAS', '%s/include' % (CWD)]
113+
self.source = objsApp
114+
self.LIBS = ['TcpIp', 'StdTimer']
115+
self.Append(CPPDEFINES=['USE_TCPIP'])
116+
self.Append(
117+
CPPDEFINES=['DCM_DEFAULT_RXBUF_SIZE=4095', 'DCM_DEFAULT_TXBUF_SIZE=4095'])
118+
self.platform_config()
119+
for libName, source in self.mylibs.items():
120+
self.LIBS.append(libName)
121+
self.RegisterConfig(libName, source)
122+
self.Append(CPPDEFINES=['USE_%s' %
123+
(libName.split(':')[0].upper())])
124+
125+
126+
@register_application
127+
class ApplicationNetAppT(query_application('NetApp')):
128+
mylibs = libsForNetAppT
129+
130+
def config(self):
131+
super().config()
132+
self.Append(CPPDEFINES=['LWIP_AS_LOCAL_IP_TEST'])

‎app/app/config/Dcm/Dcm_Cfg.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ static const Dcm_ServiceType Dcm_UdsServices[] = {
156156
#ifdef DCM_USE_SERVICE_SECURITY_ACCESS
157157
DCM_SEC_LOCKED_MASK | DCM_SEC_LEVEL1_MASK | DCM_SEC_LEVEL2_MASK,
158158
#endif
159-
DCM_MISC_PHYSICAL | DCM_MISC_FUNCTIONAL | DCM_MISC_SUB_FUNCTION,
159+
DCM_MISC_PHYSICAL | DCM_MISC_FUNCTIONAL,
160160
},
161161
Dcm_DspClearDTC,
162162
NULL,

‎app/app/config/Dem.json‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
{
2+
"class": "Dem",
3+
"DTCs": [
4+
{
5+
"name": "DTC0",
6+
"number": "0x112200",
7+
"priority": 0
8+
},
9+
{
10+
"name": "DTC1",
11+
"number": "0x112201",
12+
"priority": 1
13+
},
14+
{
15+
"name": "DTC2",
16+
"number": "0x112202",
17+
"priority": 2
18+
},
19+
{
20+
"name": "DTC3",
21+
"number": "0x112203",
22+
"priority": 3
23+
},
24+
{
25+
"name": "DTC4",
26+
"number": "0x112204",
27+
"priority": 4
28+
}
29+
],
30+
"Environments": [
31+
{
32+
"name": "Battery",
33+
"id": "0x1001",
34+
"type": "uint16",
35+
"unit": "v"
36+
},
37+
{
38+
"name": "VehileSpeed",
39+
"id": "0x1002",
40+
"type": "uint16",
41+
"unit": "km/h"
42+
},
43+
{
44+
"name": "EngineSpeed",
45+
"id": "0x1003",
46+
"type": "uint16",
47+
"unit": "r/min"
48+
},
49+
{
50+
"name": "Time",
51+
"id": "0x1004",
52+
"type": "struct",
53+
"data": [
54+
{
55+
"name": "year",
56+
"type": "uint8"
57+
},
58+
{
59+
"name": "month",
60+
"type": "uint8"
61+
},
62+
{
63+
"name": "day",
64+
"type": "uint8"
65+
},
66+
{
67+
"name": "hour",
68+
"type": "uint8"
69+
},
70+
{
71+
"name": "minute",
72+
"type": "uint8"
73+
},
74+
{
75+
"name": "second",
76+
"type": "uint8"
77+
}
78+
],
79+
"unit": "YY-MM-DD-HH"
80+
}
81+
],
82+
"ExtendedDatas": [
83+
{
84+
"name": "FaultOccuranceCounter",
85+
"type": "uint8"
86+
},
87+
{
88+
"name": "AgingCounter",
89+
"type": "uint8"
90+
},
91+
{
92+
"name": "AgedCounter",
93+
"type": "uint8"
94+
}
95+
]
96+
}

‎app/app/config/Eep_Cfg.c‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/**
2+
* SSAS - Simple Smart Automotive Software
3+
* Copyright (C) 2021 Parai Wang <parai@foxmail.com>
4+
*
5+
* ref: Specification of EEPROM Driver AUTOSAR CP Release 4.4.0
6+
*/
7+
/* ================================ [ INCLUDES ] ============================================== */
8+
#include "Eep_Cfg.h"
9+
#include "Eep_Priv.h"
10+
#include "Ea.h"
11+
/* ================================ [ MACROS ] ============================================== */
12+
#ifndef EEP_BASE_ADDRESS
13+
#define EEP_BASE_ADDRESS 0
14+
#endif
15+
16+
#ifndef EEP_MAX_READ_FAST
17+
#define EEP_MAX_READ_FAST 4096
18+
#endif
19+
20+
#ifndef EEP_MAX_READ_NORM
21+
#define EEP_MAX_READ_NORM 512
22+
#endif
23+
24+
#ifndef EEP_MAX_WRITE_FAST
25+
#define EEP_MAX_WRITE_FAST 4096
26+
#endif
27+
28+
#ifndef EEP_MAX_WRITE_NORM
29+
#define EEP_MAX_WRITE_NORM 512
30+
#endif
31+
32+
#ifndef EEP_MAX_ERASE_FAST
33+
#define EEP_MAX_ERASE_FAST 4096
34+
#endif
35+
36+
#ifndef EEP_MAX_ERASE_NORM
37+
#define EEP_MAX_ERASE_NORM 512
38+
#endif
39+
/* ================================ [ TYPES ] ============================================== */
40+
/* ================================ [ DECLARES ] ============================================== */
41+
/* ================================ [ DATAS ] ============================================== */
42+
static const Eep_SectorType Eep_SectorList[] = {
43+
{
44+
EEP_BASE_ADDRESS,
45+
EEP_BASE_ADDRESS + 4 * 1024,
46+
4,
47+
1,
48+
1,
49+
},
50+
};
51+
52+
const Eep_ConfigType Eep_Config = {
53+
Ea_JobEndNotification, Ea_JobErrorNotification, MEMIF_MODE_FAST,
54+
EEP_MAX_READ_FAST, EEP_MAX_READ_NORM, EEP_MAX_WRITE_FAST,
55+
EEP_MAX_WRITE_NORM, EEP_MAX_ERASE_FAST, EEP_MAX_ERASE_NORM,
56+
Eep_SectorList, ARRAY_SIZE(Eep_SectorList),
57+
};
58+
/* ================================ [ LOCALS ] ============================================== */
59+
/* ================================ [ FUNCTIONS ] ============================================== */

‎app/app/config/Eep_Cfg.h‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/**
2+
* SSAS - Simple Smart Automotive Software
3+
* Copyright (C) 2021 Parai Wang <parai@foxmail.com>
4+
*
5+
* ref: Specification of EEPROM Driver AUTOSAR CP Release 4.4.0
6+
*/
7+
#ifndef _EEP_CFG_H
8+
#define _EEP_CFG_H
9+
/* ================================ [ INCLUDES ] ============================================== */
10+
/* ================================ [ MACROS ] ============================================== */
11+
/* ================================ [ TYPES ] ============================================== */
12+
/* ================================ [ DECLARES ] ============================================== */
13+
/* ================================ [ DATAS ] ============================================== */
14+
/* ================================ [ LOCALS ] ============================================== */
15+
/* ================================ [ FUNCTIONS ] ============================================== */
16+
#endif /* _EEP_CFG_H */

0 commit comments

Comments
 (0)