Merge remote-tracking branch 'upstream/master'

Base class for text entry
This commit is contained in:
furrtek
2017-06-21 03:25:27 +01:00
131 changed files with 19385 additions and 5412 deletions

View File

@@ -25,11 +25,12 @@
import sys
if len(sys.argv) != 2:
print('Usage: <command> <Altera MAX V CPLD SVF file path>')
if len(sys.argv) != 3:
print('Usage: <command> <Altera MAX V CPLD SVF file path> <revision name>')
sys.exit(-1)
f = open(sys.argv[1], 'r')
revision_name = sys.argv[2]
calculate_crc = False
@@ -98,7 +99,8 @@ print("""#include "portapack_cpld_data.hpp"
namespace portapack {
namespace cpld {
""")
namespace %s {
""" % revision_name)
print('const std::array<uint16_t, %d> block_0 { {' % len(block_0))
print_block(block_0)
@@ -111,9 +113,10 @@ print_block(block_1)
print("""} };
} /* namespace %s */
} /* namespace cpld */
} /* namespace portapack */
""")
""" % revision_name)
if calculate_crc:
# Apply post-programming modification to make post-programming CRC correct:

View File

@@ -36,7 +36,7 @@ def crack_variable_path(variable_path):
parser = argparse.ArgumentParser()
parser.add_argument('input_file_path', type=str)
parser.add_argument('variable_path', type=str)
parser.add_argument('header_file_path', type=str)
# parser.add_argument('header_file_path', type=str)
parser.add_argument('data_file_path', type=str)
args = parser.parse_args()
@@ -330,13 +330,14 @@ for block in verify:
if block['id'] == 0x05:
block['tdo'] = program_done[0]['tdi']
header_file_name = os.path.split(args.header_file_path)[1]
# header_file_name = os.path.split(args.header_file_path)[1]
header_file_name = 'hackrf_cpld_data.hpp'
header_includes = ('cpld_xilinx.hpp',)
# header_includes = ('cpld_xilinx.hpp',)
data_includes = (header_file_name,)
type_name = '::cpld::xilinx::XC2C64A::verify_blocks_t'
HeaderGen(header_includes, namespaces, type_name, variable_name).to_file(args.header_file_path)
# HeaderGen(header_includes, namespaces, type_name, variable_name).to_file(args.header_file_path)
DataGen(data_includes, namespaces, type_name, variable_name, verify).to_file(args.data_file_path)