Skip to content

B
Beam Positoning Monitor - Software
Commit 695e0ae6 authored by Lucas Russo's avatar Lucas Russo
Browse files
Options

boards/*/epics_mapping.c: fix EPICS start ID to 1 

It's easier to standardize the initial EPICS
BPM ID from 1 to 24 instead of from 0 to 23.

In this way, the reported ID to clients stau consistent
with the FPGA driver, as well.
parent 8885c6e4
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 50 deletions
src/boards/afcv3/epics_mapping.c
View file @ 695e0ae6
......@@ -35,30 +35,30 @@ const board_epics_rev_map_t board_epics_rev_map[NUM_MAX_SLOTS+1][NUM_MAX_BPM_PER
/* board, bpm */ /* bpm_id */
/* 0, 0 (INVALID) */ {{-1},
/* 0, 1 (INVALID) */ {-1}},
/* 1, 0 */ {{0},
/* 1, 1 */ {1}},
/* 2, 0 */ {{2},
/* 2, 1 */ {3}},
/* 3, 0 */ {{4},
/* 3, 1 */ {5}},
/* 4, 0 */ {{6},
/* 4, 1 */ {7}},
/* 5, 0 */ {{8},
/* 5, 1 */ {9}},
/* 6, 0 */ {{10},
/* 6, 1 */ {11}},
/* 7, 0 */ {{12},
/* 7, 1 */ {13}},
/* 8, 0 */ {{14},
/* 8, 1 */ {15}},
/* 9, 0 */ {{16},
/* 9, 1 */ {17}},
/* 10, 0 */ {{18},
/* 10, 1 */ {19}},
/* 11, 0 */ {{20},
/* 11, 1 */ {21}},
/* 12, 0 */ {{22},
/* 12, 1 */ {23}}
/* 1, 0 */ {{1},
/* 1, 1 */ {2}},
/* 2, 0 */ {{3},
/* 2, 1 */ {4}},
/* 3, 0 */ {{5},
/* 3, 1 */ {6}},
/* 4, 0 */ {{7},
/* 4, 1 */ {8}},
/* 5, 0 */ {{9},
/* 5, 1 */ {10}},
/* 6, 0 */ {{11},
/* 6, 1 */ {12}},
/* 7, 0 */ {{13},
/* 7, 1 */ {14}},
/* 8, 0 */ {{15},
/* 8, 1 */ {16}},
/* 9, 0 */ {{17},
/* 9, 1 */ {18}},
/* 10, 0 */ {{19},
/* 10, 1 */ {20}},
/* 11, 0 */ {{21},
/* 11, 1 */ {22}},
/* 12, 0 */ {{23},
/* 12, 1 */ {24}}
};
const board_epics_opts_t board_epics_opts[NUM_MAX_SLOTS+1][NUM_MAX_BPM_PER_SLOT] = {
......
src/boards/afcv3_1/epics_mapping.c
View file @ 695e0ae6
......@@ -35,30 +35,30 @@ const board_epics_rev_map_t board_epics_rev_map[NUM_MAX_SLOTS+1][NUM_MAX_BPM_PER
/* board, bpm */ /* bpm_id */
/* 0, 0 (INVALID) */ {{-1},
/* 0, 1 (INVALID) */ {-1}},
/* 1, 0 */ {{0},
/* 1, 1 */ {1}},
/* 2, 0 */ {{2},
/* 2, 1 */ {3}},
/* 3, 0 */ {{4},
/* 3, 1 */ {5}},
/* 4, 0 */ {{6},
/* 4, 1 */ {7}},
/* 5, 0 */ {{8},
/* 5, 1 */ {9}},
/* 6, 0 */ {{10},
/* 6, 1 */ {11}},
/* 7, 0 */ {{12},
/* 7, 1 */ {13}},
/* 8, 0 */ {{14},
/* 8, 1 */ {15}},
/* 9, 0 */ {{16},
/* 9, 1 */ {17}},
/* 10, 0 */ {{18},
/* 10, 1 */ {19}},
/* 11, 0 */ {{20},
/* 11, 1 */ {21}},
/* 12, 0 */ {{22},
/* 12, 1 */ {23}}
/* 1, 0 */ {{1},
/* 1, 1 */ {2}},
/* 2, 0 */ {{3},
/* 2, 1 */ {4}},
/* 3, 0 */ {{5},
/* 3, 1 */ {6}},
/* 4, 0 */ {{7},
/* 4, 1 */ {8}},
/* 5, 0 */ {{9},
/* 5, 1 */ {10}},
/* 6, 0 */ {{11},
/* 6, 1 */ {12}},
/* 7, 0 */ {{13},
/* 7, 1 */ {14}},
/* 8, 0 */ {{15},
/* 8, 1 */ {16}},
/* 9, 0 */ {{17},
/* 9, 1 */ {18}},
/* 10, 0 */ {{19},
/* 10, 1 */ {20}},
/* 11, 0 */ {{21},
/* 11, 1 */ {22}},
/* 12, 0 */ {{23},
/* 12, 1 */ {24}}
};
const board_epics_opts_t board_epics_opts[NUM_MAX_SLOTS+1][NUM_MAX_BPM_PER_SLOT] = {
......
src/boards/ml605/epics_mapping.c
View file @ 695e0ae6
......@@ -35,8 +35,8 @@ const board_epics_rev_map_t board_epics_rev_map[NUM_MAX_SLOTS+1][NUM_MAX_BPM_PER
/* board, bpm */ /* bpm_id */
/* 0, 0 (INVALID) */ {{-1},
/* 0, 1 (INVALID) */ {-1}},
/* 1, 0 */ {{0},
/* 1, 1 */ {1}}
/* 1, 0 */ {{1},
/* 1, 1 */ {2}}
};
const board_epics_opts_t board_epics_opts[NUM_MAX_SLOTS+1][NUM_MAX_BPM_PER_SLOT] = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment