Skip to content

Commit

Permalink
new release to v1.0.7; see Readme.md for release note
Browse files Browse the repository at this point in the history
  • Loading branch information
dwplan committed Oct 19, 2020
1 parent e239822 commit 238449c
Show file tree
Hide file tree
Showing 86 changed files with 13,333 additions and 1,466 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ _ReSharper*/
.vs/
#Nuget packages folder
packages/
.vscode/
2 changes: 1 addition & 1 deletion FreeRTOS/include/FreeRTOS.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ extern "C" {

/* Must be defaulted before configUSE_NEWLIB_REENTRANT is used below. */
#ifndef configUSE_NEWLIB_REENTRANT
#define configUSE_NEWLIB_REENTRANT 0
#define configUSE_NEWLIB_REENTRANT 1
#endif

/* Required if struct _reent is used. */
Expand Down
2 changes: 1 addition & 1 deletion FreeRTOS/include/osapi.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ extern int gIsrDisableCount;

#define getSystemTime() osKernelSysTick()
#define getSystemTimeAsDouble() (double)osKernelSysTick()/configTICK_RATE_HZ;

#define timeElapsed(since) (osKernelSysTick() - since)


#define OS_INFINITE_TIMEOUT portMAX_DELAY
Expand Down
94 changes: 94 additions & 0 deletions INS/ins_interface_API.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
/** ***************************************************************************
* @file int_interface_API.h API functions for Magnitometer functionality
*
* THIS CODE AND INFORMATION ARE PROVIDED "AS IS" WITHOUT WARRANTY OF ANY
* KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
* PARTICULAR PURPOSE.
*
*****************************************************************************/
/*******************************************************************************
Copyright 2018 ACEINNA, INC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*******************************************************************************/
#ifndef INS_INTERFACE_API
#define INS_INTERFACE_API
#include <stdint.h>
#include "gnss_data_api.h"

#ifdef __cplusplus
extern "C" {
#endif

#ifndef WIN32
#define ARM_MCU
#endif


int8_t SetStartGNSSWeek(int32_t week);

int8_t GetKFStatus();
extern int8_t nhcflag;
extern int8_t GNSSOBSFLAG;
extern double lastgnsstime;
extern int KFStatus;


void ins_gnss_time_update();
void ins_fusion();
int copy_gnss_result(gnss_solution_t *gnss_sol);
int get_mGnssInsSystem_mlc_STATUS();

BOOL Fill_std1PacketPayload_ins(uint8_t *payload, uint8_t *payloadLen);
BOOL ins_Fill_posPacketPayload(uint8_t *payload, uint8_t *payloadLen);
BOOL ins_Fill_inspvaPacketPayload(uint8_t *payload, uint8_t *payloadLen);

void set_wheel_tick_update_flag(int state);
int get_wheel_tick_update_flag();
void add_wheel_tick_count();
void set_wheel_tick_fwd(uint8_t fwd_flag);


extern char ggaBuff[];
extern char pashrBuff[];


int32_t get_ins_status();
int32_t get_pos_type();
double get_ins_latitude();
double get_ins_longitude();
double get_ins_height();
double get_ins_north_velocity();
double get_ins_east_velocity();
double get_ins_up_velocity();
double get_ins_roll();
double get_ins_pitch();
double get_ins_azimuth();
float get_ins_latitude_std();
float get_ins_longitude_std();
float get_ins_altitude_std();
float get_ins_north_velocity_std();
float get_ins_east_velocity_std();
float get_ins_up_velocity_std();
float get_ins_roll_std();
float get_ins_pitch_std();
float get_ins_azimuth_std();

BOOL user_car_speed_handler(uint8_t *payload, uint8_t *payloadLen);

/*--------------------------------------------------------------------*/
#ifdef __cplusplus
}
#endif
#endif
Binary file added INS/libINS.a
Binary file not shown.
13 changes: 13 additions & 0 deletions INS/library.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "INS",
"version": "0.0.1",
"description": "GNSS/INS library",
"build": {
"flags": [
"-I include",
"-I ."
],
"libArchive": true,
"platforms": "aceinna_imu"
}
}
16 changes: 9 additions & 7 deletions LWIP/lwip-1.4.1/src/netif/ethernetif.c
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ void HAL_ETH_ErrorCallback(ETH_HandleTypeDef *heth)
******************************************************************************/
static void low_level_init(struct netif *netif)
{
uint8_t* p_mac = get_static_mac();

KSZ8041NL_reset_port_init();

KSZ8041NL_reset();
Expand All @@ -150,7 +152,7 @@ static void low_level_init(struct netif *netif)
EthHandle.Init.Speed = ETH_SPEED_100M;
EthHandle.Init.DuplexMode = ETH_MODE_FULLDUPLEX;
EthHandle.Init.PhyAddress = KSZ8041NL_PHY_ADDRESS;
EthHandle.Init.MACAddr = gUserConfiguration.mac; //gnetif.hwaddr;
EthHandle.Init.MACAddr = p_mac; //gnetif.hwaddr;
EthHandle.Init.RxMode = ETH_RXINTERRUPT_MODE;
EthHandle.Init.ChecksumMode = ETH_CHECKSUM_BY_HARDWARE;
EthHandle.Init.MediaInterface = ETH_MEDIA_INTERFACE_RMII;
Expand All @@ -167,12 +169,12 @@ static void low_level_init(struct netif *netif)
netif->hwaddr_len = ETHARP_HWADDR_LEN;

/* set netif MAC hardware address */
netif->hwaddr[0] = gUserConfiguration.mac[0];
netif->hwaddr[1] = gUserConfiguration.mac[1];
netif->hwaddr[2] = gUserConfiguration.mac[2];
netif->hwaddr[3] = gUserConfiguration.mac[3];
netif->hwaddr[4] = gUserConfiguration.mac[4];
netif->hwaddr[5] = gUserConfiguration.mac[5];
netif->hwaddr[0] = p_mac[0];
netif->hwaddr[1] = p_mac[1];
netif->hwaddr[2] = p_mac[2];
netif->hwaddr[3] = p_mac[3];
netif->hwaddr[4] = p_mac[4];
netif->hwaddr[5] = p_mac[5];

netif->mtu = 1500;

Expand Down
Loading

0 comments on commit 238449c

Please sign in to comment.