Merge branch 'dev'
This commit is contained in:
@@ -70,7 +70,7 @@ rail_node_t *ReadConfigFile()
|
||||
}
|
||||
|
||||
// 讲道理,应该只有两位数,所以就这样处理了
|
||||
if (*(p + 1) == '\n')
|
||||
if (*(p + 1) == '\n' || *(p + 1) == '\0')
|
||||
{
|
||||
total_station = *p - 48;
|
||||
}
|
||||
@@ -125,7 +125,7 @@ rail_node_t *ReadConfigFile()
|
||||
p++;
|
||||
}
|
||||
|
||||
if (*(p + 1) == '\n')
|
||||
if (*(p + 1) == '\n' || *(p + 1) == '\0')
|
||||
{
|
||||
distance = *p - 48;
|
||||
}
|
||||
|
@@ -4,4 +4,14 @@
|
||||
#include "controller.h"
|
||||
|
||||
bus_query_t *target_query = NULL;
|
||||
int chosen_strategy = -1;
|
||||
int chosen_strategy = -1;
|
||||
|
||||
int FCFSDirection()
|
||||
{
|
||||
return BUS_STOP;
|
||||
}
|
||||
|
||||
bus_query_t *FCFSQuery()
|
||||
{
|
||||
return NULL;
|
||||
}
|
Reference in New Issue
Block a user